Remove git flow, merge to main #205
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- [Description](#description) - [Type of change](#type-of-change) - [Testing locally](#testing-locally) - [Checklist](#checklist) # Description Added instructions on Git Flow. - Git Flow configuration steps ## Type of change Please delete options that are not relevant - [] Bug fix (non-breaking change which fixes an issue) - [X] New Feature (non-breaking change which adds functionality) - [] Breaking change(fix or feature that would cause existing functionality to not work as expected) - [X] This change requires a documentation update # Testing locally If you're unsure, feel free to create your own Git Hub repository and play around with the commands and configuration! # Checklist - [X] My code follows the style guidelines of this project - [X] I have performed a self-review of my own code - [X] I have made corresponding changes to the documentation (if required) - [X] I have followed best practices, e.g. NativeBase approaches and theming - [X] My changes generate no new warnings
- [Description](#description) - [Type of change](#type-of-change) - [Testing locally](#testing-locally) - [Checklist](#checklist) # Description ## Testing Locally ## Type of change - [X] New Feature (non-breaking change which adds functionality) # Checklist - [X] My code follows the style guidelines of this project - [X] I have performed a self-review of my own code - [X] I have commented my code, particularly in hard-to-understand areas - [X] I have removed any unnecessary comments or console logging - [] I have made corresponding changes to the documentation (if required) - [X] I have addressed accessibility, if needed - [X] I have followed best practices, e.g. NativeBase approaches and theming - [X] I have checked the app in dark mode, if making front-end design changes - [X] My changes generate no new warnings - [] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [] I have updated the version numbers in `package.json` files in the [app](DEPLOYMENT.md#app-deployment) and/or [api](DEPLOYMENT.md#api-deployment-on-aws) directories as needed --------- Co-authored-by: PammyLo <[email protected]>
#193) - Joanna and the STA team are getting a lot of people using the app to register interest in projects. They need a way to keep track of these, so this extra functionality saves entries need into an AirTable table (in addition to existing functionality that sends a message to Slack).
* @vglampard had been having problems getting the API tunnelling command to work on Windows. This could affect other devs too and we want to make getting set up as simple and pain-free as possible. * Updated the API tunnelling command to probably be more reliable generally, by using `cross-var` and `dotenv-cli` packages, so we can have a single command that works across different machines.
#193) - Joanna and the STA team are getting a lot of people using the app to register interest in projects. They need a way to keep track of these, so this extra functionality saves entries need into an AirTable table (in addition to existing functionality that sends a message to Slack).
…ntainer fix: search container restored
This reverts commit a11d89a.
…perience-buttons feature/sva-354-my-experience-profile-buttons
Pavi ticket 324
…ardise-margins-padding SVA-387 Update theme components and refactor code to match
SVA-403 Adds authentication API
# Description Authentication services within app. Adds `AuthProvider` which is configured at app level and can be consumed in any component via `useAuth` hook. Added a placeholder example of detecting auth state in `ProfileContainer` There is an underlying `AuthClient` class which handles specific API interaction and storage of auth credentials, which uses [`expo-secure-store`](https://docs.expo.dev/versions/latest/sdk/securestore/). This also manages automatically refreshing auth tokens when access token expires, and handling transient network errors (which will happen a lot). Also configured jest correctly so we can add tests, and removed unused `app/__tests__` directory (I strongly prefer test files to sit with the file under test). Rejigged the app CI build too so it runs the tests, and lints all files not just changed (not convinced this worked correctly tbh). I would very much like to revisit the different eslintrc configs at some point, and the need for questionably useful (IMHO) file comments. Depends on backend in #200 ## Type of change Please delete options that are not relevant - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New Feature (non-breaking change which adds functionality) - [ ] Breaking change(fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update # Testing locally No user-facing features added, run the app, check nothing breaks and there are no new console warnings. # Checklist - [] My code follows the style guidelines of this project - [] I have performed a self-review of my own code - [] I have commented my code, particularly in hard-to-understand areas - [] I have removed any unnecessary comments or console logging - [] I have made corresponding changes to the documentation (if required) - [] I have addressed accessibility, if needed - [] I have followed best practices, e.g. NativeBase approaches and theming - [] I have checked the app in dark mode, if making front-end design changes - [] My changes generate no new warnings - [] I have added tests that prove my fix is effective or that my feature works - [] New and existing unit tests pass locally with my changes - [] I have updated the version numbers in `package.json` files in the [app](DEPLOYMENT.md#app-deployment) and/or [api](DEPLOYMENT.md#api-deployment-on-aws) directories as needed
# Description Having created new repo [`Volunteer-api`](https://github.com/Scottish-Tech-Army/Volunteer-api), this change removes the `api` directory and moves `app` directory up to root, so the repo only contains code for app front-end. There should be no changes to behaviour or how the app itself is developed, except that you no longer need to `cd` into the app directory and the api should be run from other repo. I tried to update readmes as best I could to remove api-specific docs and anywhere that mentioned the `app` directory. Other than those, all the changes here are deletions of api files or renames of app files. This will cause major conflicts with #203 and any currently active branches, suggest we prioritise getting this merged asap so make those easier. # Testing locally Checkout the branch, `npm install` from root and follow your usual dev process for running the app, check everything works the same. This will require cloning the api repo and running it locally from there. # Checklist - [] My code follows the style guidelines of this project - [] I have performed a self-review of my own code - [] I have commented my code, particularly in hard-to-understand areas - [] I have removed any unnecessary comments or console logging - [] I have made corresponding changes to the documentation (if required) - [] I have addressed accessibility, if needed - [] I have followed best practices, e.g. NativeBase approaches and theming - [] I have checked the app in dark mode, if making front-end design changes - [] My changes generate no new warnings - [] I have added tests that prove my fix is effective or that my feature works - [] New and existing unit tests pass locally with my changes - [] I have updated the version numbers in `package.json` files in the [app](DEPLOYMENT.md#app-deployment) and/or [api](DEPLOYMENT.md#api-deployment-on-aws) directories as needed
roryf
requested review from
DJMF2015,
PammyLo,
M4RC1N76,
CatMac228 and
pavithiranShanmugakani
DougieWougie
approved these changes
Dec 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges
developbranch intomainand removes Git Flow instructions from readmes.After merging, the repository default branch will be changed to
mainanddevelopdeleted. From then on, all pull requests will be made tomain, and in future automatically built and uploaded to app stores for release.This is the first step towards Continuous Delivery to app stores
Any urgent hotfixes required before that happens (very unlikely!) can use the 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
developis 918b91f i.e. there's really nothing to test here, it just bringsmaininto the same state as currentdevelop.