Merge branch 'master' into development

3 years ago · 3d74d824b8
5 changed files with 12 additions and 15 deletions
--- a/README.md
+++ b/README.md
@ -1,17 +1,14 @@
 # SSR Contact Tracing App
 # Our Sejahtera Contact Tracing App
 This app was created to serve the need for easy to use contact tracing.
 This app was created to serve the need for easy to use contact tracing. The app aims to collect the minimum amount of information while still having robust contact tracing.
 ## Usage
 The app should work as such:
 1. Group/Organization leaders will be created an account on the app.
 2. Upon logging in, they will see a QR code that they can display
 3. Their members can scan this QR code, in order to create their own accounts. This way, there each member has a "parent" member, and all memberships can be traced.
 4. Upon creating their account, new members will also have a QR Code they can display.
 5. Other members can scan each other QR codes in order to register a _Contact_ in the backend.
 6. All _Contacts_ between members can be retrievable from the backend at a later time.
 1. Anyone can log into the app using their Telegram account
 2. They may present their QR code to be scanned by others, and they may scan other QR codes as well. These will be registered as _Contacts_
 3. Users may report being tested positive with COVID19, and the app will inform all their _Contacts_
 ## Development
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
  "name": "ssr-tracing",
  "name": "our-sejahtera",
  "version": "0.1.0",
  "private": true,
  "dependencies": {
--- a/public/index.html
+++ b/public/index.html
@ -7,7 +7,7 @@
    <meta name="theme-color" content="#000000" />
    <meta
      name="description"
      content="Web site created using create-react-app"
      content="Autonomous and independent contact tracing."
    />
    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
    <!--
@ -24,7 +24,7 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
    <title>SSR Contact Tracing</title>
    <title>OurSejahtera</title>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/public/manifest.json
+++ b/public/manifest.json
@ -1,6 +1,6 @@
 {
  "short_name": "SSR Contact Tracing",
  "name": "SSR Contact Tracing",
  "short_name": "OurSejahtera",
  "name": "OurSejahtera",
  "icons": [
    {
      "src": "favicon.ico",
--- a/src/screens/LoginScreen.js
+++ b/src/screens/LoginScreen.js
@ -95,7 +95,7 @@ function Login() {
        id="contentFlex"
      >
        <Heading size="xl" mb={6}>
          SSR Covid Tracing
          OurSejahtera Contact Tracing
        </Heading>
        <Heading size="lg" mb={4}>
          Login
@ -117,7 +117,7 @@ function Login() {
          All the code for this project is{' '}
          <Link
            color="teal.500"
            href="https://github.com/naresh97/ssr-tracing"
            href="https://github.com/naresh97/our-sejahtera"
            isExternal
          >
            Open Source