Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove git flow, merge to main #205

Merged
merged 43 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
78bd05b
Pavi ticket 324
Jul 20, 2023
ce07990
Added versions to the api
Jul 25, 2023
4319b10
Changed to address test fail
Jul 25, 2023
6159160
App to implement latest version
Jul 27, 2023
60c1a97
Example env update
Jul 27, 2023
02577ce
Updates for readme and removed redundant code
Jul 28, 2023
b4c401d
Added Git Flow instructions (#189)
DougieWougie Jul 30, 2023
af13f15
Feature/SVA-354-my-experience-profile-screen (#186)
DJMF2015 Jul 31, 2023
99d8996
add logic to handle toggling of button state and to hide skip button …
DJMF2015 Aug 3, 2023
12406f2
SVA-390 | Add to AirTable when someone registers interest in a projec…
joefhall Aug 3, 2023
9ace9a2
update APP_DEVELOPMENTreadme and added screenshots to assets
DJMF2015 Aug 3, 2023
e7838ac
fix: search container re-added ChoicesList props
PammyLo Aug 3, 2023
1612a09
SVA-382 | Fix API tunnelling bug on some Windows machines (#185)
joefhall Jul 3, 2023
1ea2fc4
SVA-390 | Add to AirTable when someone registers interest in a projec…
joefhall Aug 3, 2023
077c0a7
Update API version number
joefhall Aug 4, 2023
6645574
Merge pull request #195 from Scottish-Tech-Army/feature/fix-search-co…
PammyLo Aug 4, 2023
6a5e989
Merge branch 'release/mvp-0.1'
joefhall Aug 5, 2023
96cb5be
Merge tag 'mvp-0.1' into develop
joefhall Aug 5, 2023
790ce81
Merge branch 'develop' of github.com:Scottish-Tech-Army/Volunteer-app…
joefhall Aug 5, 2023
e34a89e
comment out progress bar and changed button label text
DJMF2015 Aug 14, 2023
fe58262
updated with amendments to component descriptions
DJMF2015 Aug 14, 2023
a11d89a
moved images to screenshots folder
DJMF2015 Sep 1, 2023
002f052
Revert "moved images to screenshots folder"
DJMF2015 Sep 1, 2023
4867f9b
moved images to screenshots folder
DJMF2015 Sep 1, 2023
80b70bb
Merge pull request #194 from Scottish-Tech-Army/feature/sva-354-my-ex…
DJMF2015 Sep 4, 2023
cffa97a
Merge branch 'develop' of https://github.com/Scottish-Tech-Army/Volun…
Sep 6, 2023
1e208c7
Merge branch 'develop' of https://github.com/Scottish-Tech-Army/Volun…
Sep 6, 2023
fdfd18b
Merge branch 'Pavi_SVA_324' of https://github.com/Scottish-Tech-Army/…
Sep 7, 2023
9922b5d
Merge branch 'Pavi_SVA_324' of https://github.com/Scottish-Tech-Army/…
Sep 7, 2023
4406a55
Merge branch 'Pavi_SVA_324' of https://github.com/Scottish-Tech-Army/…
Sep 14, 2023
d5c8fa0
Merge pull request #188 from Scottish-Tech-Army/Pavi_SVA_324
pavithiranShanmugakani Sep 15, 2023
2d241e5
update theme components and margins
PammyLo Sep 29, 2023
da03091
Merge pull request #197 from Scottish-Tech-Army/feature/SVA-387-stand…
PammyLo Oct 4, 2023
7c910e6
First pass at auth api
roryf Oct 16, 2023
2f48036
Adds logic and tests for new user
roryf Oct 16, 2023
5711c9b
Verify email after successful login
roryf Oct 18, 2023
13dbb39
Adds tests and input validation for refresh auth
roryf Oct 18, 2023
ca1d9a8
Adds tests and input validation to logout
roryf Oct 18, 2023
c29c397
Merge pull request #200 from Scottish-Tech-Army/sva-403-auth-api
roryf Oct 25, 2023
bba0ac2
SVA-409 Adds authentication services to app (#203)
roryf Oct 27, 2023
8ee7c76
Move app directory to root, delete api (#204)
roryf Nov 8, 2023
918b91f
Remove git flow from readme
roryf Nov 8, 2023
7130a47
Merge remote-tracking branch 'origin/main' into remove-git-flow
roryf Nov 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
1 change: 1 addition & 0 deletions app/.env.example → .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ EXPO_APPLICATION_SERVICES_PROJECT_ID=""

STA_API_BASE_URL=""
STA_API_VERSION="v1"
STA_API_KEY=""
3 changes: 2 additions & 1 deletion app/.eslintrc.ci.js → .eslintrc.ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
{
Expand Down
File renamed without changes.
8 changes: 8 additions & 0 deletions .expo/README.md
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions .expo/devices.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"devices": []
}
3 changes: 3 additions & 0 deletions .expo/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"urlRandomness": "ZIWJWVY"
}
File renamed without changes.
39 changes: 0 additions & 39 deletions .github/workflows/cd_api.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/ci_api.yml

This file was deleted.

46 changes: 9 additions & 37 deletions .github/workflows/ci_app.yml
Original file line number Diff line number Diff line change
@@ -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
56 changes: 54 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .husky/pre-commit
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd app && npm run lint-app
npm run lint-app
File renamed without changes.
92 changes: 0 additions & 92 deletions API_DEVELOPMENT.md

This file was deleted.

Loading