Remove git flow, merge to main (#205)

This merges `develop` branch into `main` and removes Git Flow
instructions from readmes.

After merging, the repository default branch will be changed to `main`
and `develop` deleted. From then on, all pull requests will be made to
`main`, and in future automatically built and uploaded to app stores for
release.

This is the first step towards [Continuous Delivery to app
stores](https://www.notion.so/Continuous-Delivery-to-app-stores-c108af63c9664fc78cefc29ed264e172?pvs=4)

Any urgent hotfixes required before that happens (very unlikely!) can
use the
[v1.0.3](https://github.com/Scottish-Tech-Army/Volunteer-app/releases/tag/v1.0.3)
tag and be release manually.

The changeset looks big as a release hasn't been done for ages, and the
branches have diverged, the only actual change from current `develop` is
918b91f i.e. there's really nothing to
test here, it just brings `main` into the same state as current
`develop`.

---------

Co-authored-by: P Shanmugakani <[email protected]>
Co-authored-by: Dougie Richardson <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: PammyLo <[email protected]>
Co-authored-by: Joe Derry Hall <[email protected]>
Co-authored-by: Pamela Looper <[email protected]>
Co-authored-by: pavithiranShanmugakani <[email protected]>

app/.env.example → .env.example

@@ -2,3 +2,4 @@ EXPO_APPLICATION_SERVICES_PROJECT_ID=""
 
 STA_API_BASE_URL=""
 STA_API_VERSION="v1"
+STA_API_KEY=""

app/.eslintrc.ci.js → .eslintrc.ci.js

@@ -4,10 +4,11 @@
 
 module.exports = {
   extends: ['.eslintrc.js', 'plugin:jsdoc/recommended'],
+  ignorePatterns: ['**/*.test.ts'],
   rules: {
     'jsdoc/check-alignment': ['off'], // leave this to prettier to handle
     'jsdoc/newline-after-description': ['off'],
-    'jsdoc/require-file-overview': 'error',
+    'jsdoc/require-file-overview': 'warn',
     'jsdoc/require-jsdoc': [
       'warn',
       {

.expo/README.md

@@ -0,0 +1,8 @@
+> Why do I have a folder named ".expo" in my project?
+The ".expo" folder is created when an Expo project is started using "expo start" command.
+> What do the files contain?
+- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
+- "settings.json": contains the server configuration that is used to serve the application manifest.
+> Should I commit the ".expo" folder?
+No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
+Upon project creation, the ".expo" folder is already added to your ".gitignore" file.

.expo/devices.json

@@ -0,0 +1,3 @@
+{
+  "devices": []
+}

.expo/settings.json

@@ -0,0 +1,3 @@
+{
+  "urlRandomness": "ZIWJWVY"
+}

.github/workflows/ci_app.yml

@@ -1,45 +1,17 @@
 name: Continuous Integration - App
 
-# Triggers execute all tests workflow on pull request events
 on:
   pull_request:
     types: [opened, synchronize, reopened, edited]
-    paths:
-      - "app/**"
 jobs:
-  # test:
-  #   name: Tests
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Create config file
-  #       working-directory: ./app
-  #       run: ./scripts/createConfig.sh
-  #     - name: Setup Node.js
-  #       uses: actions/setup-node@v2
-  #       with:
-  #         node-version: '16'
-  #     - name: Run Tests
-  #       run: |
-  #         cd app
-  #         npm install --legacy-peer-deps
-  #         npm test
-  lint:
-    name: ESLint + JSDoc checks
+  test-and-lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        # This needs to be v1 in order for it to pick up main correctly so that we can diff against it; see https://github.com/actions/checkout/issues/296
-        uses: actions/checkout@v1
-      - name: Install deps
-        working-directory: ./app
-        run: npm install --legacy-peer-deps
-      - name: Run ESLint with extended checks
-        working-directory: ./app
-        # Run ESLint only on files that
-        # - have changed in this branch vs the current tip of the main branch, and have not been deleted in this branch (--diff-filter)
-        # - are in the current working directory (./app)
-        # - have extensions .js, .jsx, .ts, .tsx
-        # The file paths need to be supplied relative to the ./app directory because that's where ESLint runs. By default, the git diff command gives them relative to the repo root; --relative makes them relative to the current working directory.
-        run: npx eslint $(git diff --name-only --relative --diff-filter=ACMRTUXB origin/main HEAD . | grep -E '\.(js|jsx|ts|tsx)$'| xargs) -c .eslintrc.ci.js
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.14
+          cache: 'npm'
+      - run: npm ci
+      - run: npm run lint-ci
+      - run: npm run test

.gitignore

@@ -1,3 +1,55 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist
+tmp
+/out-tsc
+
+# dependencies
 node_modules
-.vscode
-.idea
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.env
+.env.local
+
+# Next.js
+.next
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# Old Android and iOS directories - no longer in use
+android/
+ios/
+
+# Old config file - no longer in use, but included here to make sure it isn't accidentally committed to the repo
+src/Config/index.ts

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-cd app && npm run lint-app
+npm run lint-app