Skip to content

Commit 591b681

Browse files
committed
Merge branch 'master' into code/remove-unused-is-ua-webview
# Conflicts: # package.json
2 parents d0d9237 + 3642da2 commit 591b681

520 files changed

Lines changed: 24036 additions & 7410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
This Code of Conduct is adapted from the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
44

5-
Instances of abusive, harassing, or otherwise unacceptable behavior across GitHub [ProteGO Safe](https://github.com/ProteGO-Safe) organization may be reported by contacting the ProteGO-Safe Code of Conduct Committee via community@safesafe.app. For other projects, please contact apropriate project maintainer or our mediator - Mateusz Romanów mr@safesafe.app.
5+
Instances of abusive, harassing, or otherwise unacceptable behavior across GitHub [STOP COVID - ProteGO Safe](https://github.com/ProteGO-Safe) organization may be reported by contacting the ProteGO-Safe Code of Conduct Committee via community@safesafe.app. For other projects, please contact apropriate project maintainer or our mediator - Mateusz Romanów mr@safesafe.app.

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
Zapraszamy wszystkich do współpracy nad projektem:
44

5-
1. [Zasady ogólne.](.github/CODE_OF_CONDUCT.md)
6-
2. [Chcę zgłosić pomysł dotyczący aplikacji.](.github/SUPPORT.md)
7-
3. [Chcę zgłosić błąd dotyczący bezpieczeństwa.](.github/SECURITY.md)
5+
1. [Zasady ogólne.](CODE_OF_CONDUCT.md)
6+
2. [Chcę zgłosić pomysł dotyczący aplikacji.](SUPPORT.md)
7+
3. [Chcę zgłosić błąd dotyczący bezpieczeństwa.](SECURITY.md)
88
4. [Programuję, jak mogę pomóc?](#Programuję-jak-mogę-pomóc)
99

1010
## Programuję, jak mogę pomóc?
@@ -15,4 +15,4 @@ Jest mnóstwo sposobów w jaki możesz nam pomóc:
1515
* Przeglądaj istniejące `Pull Request`y.
1616
* Pomagaj innym użytkownikom.
1717
Komunikuj się z nami przez GitHub i Stackoverflow.
18-
Więcej informacji w temacie komunikacji znajdziesz [tutaj](.github/SUPPORT.md)
18+
Więcej informacji w temacie komunikacji znajdziesz [tutaj](SUPPORT.md)

.github/PULL_REQUEST_TEMPLATE/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Use apropriate template and don't forget about [DISCLAIMER](#DISCLAIMER)
55

66
## DISCLAIMER
77
We require Digitally Signed Personal Agreement for Contributors collaborating on the project to accept their Pull Requests - it's Public Health so We need Public Trust thus introducing digital two-factor authentication for The Makers - also Apple doesn't go well with GNU so We make them do so manually by following these steps:
8-
1. Remember ProteGO-Safe software is being released on [GNU GENERAL PUBLIC LICENSE](../../LICENSE)
8+
1. Remember STOP COVID - ProteGO Safe software is being released on [GNU GENERAL PUBLIC LICENSE](../../LICENSE)
99
2. If You would like to contribute any changes to our project repositories You are the author and the owner of these changes, by the law of [GitHub Terms of Use](https://help.github.com/en/github/site-policy/github-terms-of-service#6-contributions-under-repository-license) You automatically grant license for these changes .
1010
3. Mitigating any kind of misunderstanding around copyrights as well as lack of trust for unknown entities in public sector we ask that every Pull Request author verify aforementioned license grants for proposed changes through :
1111
* [Downloading personal license disclaimer form](/DISCLAIMER.pdf) which states that the author:

.github/workflows/nodejs.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
name: build and deploy
3+
name: test, build and deploy
44
on:
55
release:
66
types:
@@ -12,6 +12,16 @@ on:
1212
- '**'
1313

1414
jobs:
15+
test:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
node-version: [13.x]
20+
steps:
21+
- name: Checkout Repo
22+
uses: actions/checkout@v2
23+
- run: yarn install
24+
- run: yarn test
1525
build:
1626
runs-on: ubuntu-latest
1727
strategy:

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 4.3.0
8+
9+
### Added
10+
- multi language support
11+
- possibility to edit the entry of the health diary
12+
- possibility to set and edit the date of entry in the health diary
13+
- temperature unit in the health diary
14+
- clickable application logotype
15+
16+
### Changed
17+
- date format of the last triage result
18+
- nick validation
19+
- text of the privacy policy for iOS EN funcionality
20+
- copies in few screens
21+
- faq view logic
22+
- refactor of buttons components
23+
- refactor of the on boarding logic
24+
25+
### Fixed
26+
- FAQ search with special characters
27+
- problem with triage view on small screens
28+
- UI bugs
29+
730
## 4.2.4
831

932
### Changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
![ProteGo Safe](./doc/img/baner.jpg "ProtegoSafe")
1+
![STOP COVID - ProteGO Safe](./doc/img/baner.jpg "STOP COVID - ProteGO Safe")
22

33
## General info
4-
In ProteGO Safe you will find reliable, official and current information on the current situation related to the coronavirus pandemic. You will learn how to use actions and what to do if you suspect you or your loved ones have an infection. All published information is confirmed by the Ministry of Health or the Chief Sanitary Inspectorate, prepared on the basis of data on the Center for Disease Prevention and Control (ECDC) and the World Health Organization (WHO).
4+
In STOP COVID - ProteGO Safe you will find reliable, official and current information on the current situation related to the coronavirus pandemic. You will learn how to use actions and what to do if you suspect you or your loved ones have an infection. All published information is confirmed by the Ministry of Health or the Chief Sanitary Inspectorate, prepared on the basis of data on the Center for Disease Prevention and Control (ECDC) and the World Health Organization (WHO).
55

66
## Screenshots
7-
![ProteGo Safe](./doc/img/protego-safe.png "ProtegoSafe")
7+
![STOP COVID - ProteGO Safe](./doc/img/protego-safe.png "STOP COVID - ProteGO Safe")
88

99
## Application installation and configuration
1010

@@ -20,6 +20,8 @@ yarn test a
2020

2121
### Run application locally
2222
```shell script
23+
git update-index --skip-worktree src/locales/resources.j (once)
24+
yarn prepare-tranlations
2325
yarn install
2426
yarn start
2527
```

doc/img/baner.jpg

40.8 KB
Loading

doc/img/protego-safe.png

3.13 KB
Loading

docker/docker-compose.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: "3"
2+
services:
3+
node:
4+
image: node:13-alpine
5+
container_name: protego-safe-react
6+
volumes:
7+
- ../:/app
8+
network_mode: host
9+
working_dir: "/app"
10+
command: "tail /dev/null -f"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const fs = require('fs');
2+
3+
const resourcesFileContent = `export const resources = {};\n// Don't change this file\n`;
4+
fs.writeFile('./src/locales/resources.js', resourcesFileContent, err => {
5+
if (err) throw err;
6+
});

0 commit comments

Comments
 (0)