Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
60beb3c
Initial changes
dburkhart07 Nov 9, 2025
3e6fdeb
Initial testing changes
dburkhart07 Nov 11, 2025
9e62a9a
Commit
dburkhart07 Nov 11, 2025
0971ca1
added dummy data for testing
dburkhart07 Nov 15, 2025
80ce71f
Resolved merge conflicts
dburkhart07 Nov 21, 2025
92686b6
Resolved merge conflicts
dburkhart07 Nov 21, 2025
4d3d693
Completed proper pipeline for dummy testing data
dburkhart07 Nov 21, 2025
ec2fb63
Testing the action CI workflow
dburkhart07 Nov 21, 2025
c5c7b9b
Simplified workflow
dburkhart07 Nov 21, 2025
294e85e
Testing workflow with securing-safe-food-test deleted
dburkhart07 Nov 21, 2025
a474507
Updated README
dburkhart07 Nov 21, 2025
3cc1010
Restored theme.ts
dburkhart07 Nov 21, 2025
dc6aa8c
Final commit
dburkhart07 Nov 21, 2025
2f575a3
Moved migrations to constant file for easy refactoring
dburkhart07 Jan 30, 2026
85ff2df
prettier
dburkhart07 Jan 30, 2026
e7f9c02
Merged main
dburkhart07 Jan 30, 2026
5bd6ce2
Final commit
dburkhart07 Jan 30, 2026
4f0642c
prettier
dburkhart07 Jan 30, 2026
bfcb073
Changes, still working on getting testing working
dburkhart07 Feb 1, 2026
d09f888
prettier
dburkhart07 Feb 1, 2026
050c9aa
Readjusted testing approach
dburkhart07 Feb 2, 2026
365a6d3
final commit
dburkhart07 Feb 2, 2026
509a5dd
Fixed schema migrations
dburkhart07 Feb 2, 2026
64fcf76
added prettier
swarkewalia Feb 4, 2026
83edbbd
ran prettier write and committing prettier fixes
swarkewalia Feb 4, 2026
989fca2
Merge branch 'main' into sk/SSF-132-verify-prettier-check
swarkewalia Feb 4, 2026
39cf0e6
ran prettier write again
swarkewalia Feb 4, 2026
ec495cb
Merge branch 'main' into sk/SSF-132-verify-prettier-check
swarkewalia Feb 5, 2026
22aaa1b
merge
swarkewalia Feb 15, 2026
e9d840f
fixed yml
swarkewalia Feb 15, 2026
535a691
prettier fixes
swarkewalia Feb 15, 2026
731d759
fix
swarkewalia Feb 15, 2026
ad23be3
Merge branch 'main' into sk/SSF-132-verify-prettier-check
swarkewalia Feb 16, 2026
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ What steps did you take to verify your changes work? These should be clear enoug

Describe any new unit tests you added.

Provide screenshots of any new components, styling changes, or pages.
Provide screenshots of any new components, styling changes, or pages.

### 🏕️ (Optional) Future Work / Notes

Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/backend-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
on: [push, pull_request]

jobs:
prettier-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- run: yarn install
- run: yarn prettier:check

backend-tests:
runs-on: ubuntu-latest
services:
Expand Down Expand Up @@ -30,7 +40,6 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20

- run: yarn install --frozen-lockfile
- run: yarn list strip-ansi string-width string-length
- run: yarn test
- run: npx jest
Comment on lines 43 to 45
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think these things should be moved to jobs from services

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ yarn install

To set up your backend, follow the backend-specific instructions [here](apps/backend/README.md).

*Note: you may need to prefix your `nx` commands with `npx`. For example, to serve the frontend, if:
\*Note: you may need to prefix your `nx` commands with `npx`. For example, to serve the frontend, if:

```
nx serve frontend
```
Expand All @@ -24,6 +25,7 @@ npx nx serve frontend
## Start the app

To start the development server, run one of the following commands:

- To run the frontend at http://localhost:4200/: `nx serve frontend`
- To run the backend at http://localhost:3000/: `nx serve backend`
- The homepage includes the Swagger API documentation.
Expand Down
20 changes: 11 additions & 9 deletions apps/backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ You'll need to download:
Then, set up a database called `securing-safe-food`. If you're not familiar with how to do so, it's easy to do through PgAdmin

1. Open PgAdmin and configure your credentials (if necessary). Then, right click on the `Databases` dropdown (under `Servers` > `PostgreSQL [version]`)

![alt text](resources/pg-setup-1.png)

2. Enter "securing-safe-food" as the database name

![alt text](resources/pg-setup-2.png)

Next, create a file called `.env` in the **root directory** (under `ssf/`) and copy over the contents from `.env.example`. Replace `DATABASE_PASSWORD` with the password you entered for the `postgres` user (NOT necessarily your PgAdmin master password!)
Expand All @@ -25,29 +25,31 @@ You can check that your database connection details are correct by running `nx s
"LOG 🚀 Application is running on: http://localhost:3000/api"
```

Finally, run `yarn run typeorm:migrate` to load all the tables into your database. If everything is set up correctly, you should see "Migration ... has been executed successfully." in the terminal.
Finally, run `yarn run typeorm:migrate` to load all the tables into your database. If everything is set up correctly, you should see "Migration ... has been executed successfully." in the terminal.

# AWS Setup

We have a few environment variables that we utilize to access several AWS services throughout the application. Below is a list of each of them and how to access each after logging in to AWS

1. `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`:

- Click on your username in the top right corner, and navigate to Security Credentials
- Scroll down to access keys, and create a new key
- Select "Local code" as the purpose for the key, and add an optional description
- Replace both the public and secret keys in the .env file to those values. Note that the secret key will not be accessible after you leave this page
- Click done

2. `AWS_REGION`:
This can be found next to your profile name when you login to the main page. Some accounts may be different, but we generally use us-east-1 or us-east-2.
This is the region that you find on the right side after clicking on the location dropdown, usually saying "United States (*some region*)".
For example, if we want to use Ohio as the region, we would put `AWS_REGION="us-east2"`
This can be found next to your profile name when you login to the main page. Some accounts may be different, but we generally use us-east-1 or us-east-2.
This is the region that you find on the right side after clicking on the location dropdown, usually saying "United States (_some region_)".
For example, if we want to use Ohio as the region, we would put `AWS_REGION="us-east2"`

3. `AWS_BUCKET_NAME`:
This one is already given to you. As of right now, we only use one bucket, confirm-delivery-photos to store photos in a public S3 Bucket. This may be subject to change as we use S3 more in the project.
This one is already given to you. As of right now, we only use one bucket, confirm-delivery-photos to store photos in a public S3 Bucket. This may be subject to change as we use S3 more in the project.

4. `COGNITO_CLIENT_SECRET`:
This is used to help authenticate you with AWS Cognito and allow you to properly sign in using proper credential. To find this:
This is used to help authenticate you with AWS Cognito and allow you to properly sign in using proper credential. To find this:

- Navigate to AWS Cognito
- Make sure you are on "United States (N. Virginia) as your region
- Go into User pools and click on the one that says "ssf" (NOTE: You can also validate the User pool id in the `auth/aws_exports.ts` file)
Expand All @@ -64,7 +66,7 @@ This is used to help authenticate you with AWS Cognito and allow you to properly
- Click 'Create User'
- Load up the app, and go to the landing page
- Verify you are able to login with these new credentials you created

### Running backend tests

1. Create a **separate** Postgres database (for example `securing-safe-food-test`).
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@public/*": ["../public/*"],
"@shared/*": ["../../../shared/*"],
"@utils/*": ["utils/*"],
"@loaders/*": ["loaders/*"],
},
"@loaders/*": ["loaders/*"]
}
},
"files": [],
"include": [],
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default defineConfig({
'@public': path.resolve(__dirname, './public'),
'@shared': path.resolve(__dirname, '../../shared'),
'@utils': path.resolve(__dirname, './src/utils'),
'@loaders': path.resolve(__dirname, './src/loaders')
'@loaders': path.resolve(__dirname, './src/loaders'),
},
},
});
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
"prepare": "husky install",
"typeorm:migrate": "ts-node --project apps/backend/tsconfig.app.json -r dotenv/config ./node_modules/typeorm/cli.js migration:run -d apps/backend/src/config/typeorm.ts",
"typeorm:revert": "ts-node --project apps/backend/tsconfig.app.json -r dotenv/config ./node_modules/typeorm/cli.js migration:revert -d apps/backend/src/config/typeorm.ts",
"typeorm:create": "ts-node --project apps/backend/tsconfig.app.json -r dotenv/config ./node_modules/typeorm/cli.js migration:create"
"typeorm:create": "ts-node --project apps/backend/tsconfig.app.json -r dotenv/config ./node_modules/typeorm/cli.js migration:create",
"prettier:check": "prettier --check \"apps/**/*.{ts,tsx,js,jsx,json,md}\"",
"prettier:write": "prettier --write \"apps/**/*.{ts,tsx,js,jsx,json,md}\""
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -119,4 +121,4 @@
"strip-ansi": "6.0.1",
"string-width": "4.2.3"
}
}
}