Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
291 commits
Select commit Hold shift + click to select a range
d7fc1e3
Merge branch 'development' into limit-event-names-from-certain-string…
JackHaeg Mar 25, 2025
33470d6
Move old router tests to new directory and skip
dannyprikaz Apr 2, 2025
e6c8dc0
Remove configurations for @shelf/jest-mongodb
dannyprikaz Apr 2, 2025
070ced9
Add setupIntegrationDB method which doesn't clear state
dannyprikaz Apr 2, 2025
ffb5e84
Merge pull request #1901 from dannyprikaz/1898-move-tests
dannyprikaz Apr 10, 2025
70b847c
Merge branch 'development' of https://github.com/hackforla/vrms into …
dannyprikaz Apr 10, 2025
50de322
Fix location of tests after all old tests were moved
dannyprikaz Apr 10, 2025
0c3a147
Add tests for /admins and /projectManagers + add comments
dannyprikaz Apr 10, 2025
d300ffd
Merge branch 'development' into updateMUIinReturnUserForm
JackHaeg Apr 22, 2025
bf83709
created unit tests for checkIns router
jng34 Apr 22, 2025
324a239
wrote unit tests for checkUser router
jng34 Apr 28, 2025
c7ec576
added comment for context in reading code
jng34 Apr 28, 2025
e478950
chore(deps): bump vite from 4.5.6 to 4.5.14 in /client
dependabot[bot] Apr 30, 2025
aba9268
created unit tests for recurring events router
jng34 May 2, 2025
ae82296
wrote unit tests for questions router
jng34 May 3, 2025
15d1cda
Merge branch 'development' of https://github.com/hackforla/vrms into …
dannyprikaz May 6, 2025
21c366d
Merge pull request #1902 from dannyprikaz/1900-reconfig-backend-tests
trillium May 6, 2025
1b80c57
chore(deps): bump vite from 5.4.8 to 5.4.19
dependabot[bot] May 6, 2025
4babb4a
Merge branch 'development' into updateMUIinReturnUserForm
trillium May 7, 2025
978557c
Merge pull request #1875 from jng34/updateMUIinReturnUserForm
JackHaeg May 7, 2025
4fd74ae
Merge branch 'development' into limit-event-names-from-certain-string…
JackHaeg May 7, 2025
6b974a6
Merge pull request #1805 from pluto-bell/limit-event-names-from-certa…
trillium May 7, 2025
08d9703
wrote unit tests for projects router
jng34 May 9, 2025
a0e42c3
Merge branch 'development' into update-to-mui-newuser
JackHaeg May 13, 2025
95eeb24
Merge branch 'development' into update-to-mui-returninguser
JackHaeg May 13, 2025
3959e1e
Merge branch 'development' into dependabot/npm_and_yarn/vite-5.4.19
trillium May 13, 2025
401f2fd
Merge branch 'development' into dependabot/npm_and_yarn/client/vite-4…
trillium May 13, 2025
443cdae
Merge pull request #1914 from hackforla/dependabot/npm_and_yarn/vite-…
trillium May 13, 2025
d9997f4
updated html components to mui components, and adopted css styles
jng34 May 13, 2025
f48ff2d
removed custom CSS and fixed MUI comps
jng34 Feb 11, 2025
cbc3245
Merge branch 'development' into dependabot/npm_and_yarn/client/vite-4…
trillium May 13, 2025
678d49f
Merge pull request #1910 from hackforla/dependabot/npm_and_yarn/clien…
trillium May 13, 2025
4fe084d
chore(deps): bump http-proxy-middleware from 1.3.1 to 2.0.9 in /client
dependabot[bot] May 13, 2025
3163cff
updated node setup config
chipcorncob May 13, 2025
69f0db4
Merge pull request #1921 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
78ac38a
updated checkout action version
chipcorncob May 13, 2025
7b7dddb
Merge pull request #1923 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
4761129
debugging step added to workflow
chipcorncob May 13, 2025
a1372c6
Merge branch '1918-fix-frontend-build-action' of https://github.com/l…
chipcorncob May 13, 2025
f91e923
chore: removed debugging steps
chipcorncob May 13, 2025
ecf849a
changing cahce init to actions/cache@v3
chipcorncob May 13, 2025
3757143
changing cache init action version
chipcorncob May 13, 2025
128a77d
Merge pull request #1924 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
32fbd39
update aws-actions/configure-aws-credentials to v3
chipcorncob May 13, 2025
9e46745
Merge pull request #1925 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
3f1a20c
update aws-actions/configure-aws-credentials to v3
chipcorncob May 13, 2025
9a98e13
Merge pull request #1926 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
767c18b
fix: type on env variable
chipcorncob May 13, 2025
b3ea010
Merge pull request #1928 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
f867e24
updated aws action versions to latest
chipcorncob May 13, 2025
35121ca
Merge pull request #1929 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
15d6395
add force deployment step for missing service
chipcorncob May 13, 2025
3f42bce
Merge pull request #1930 from lcchrty/1918-fix-frontend-build-action
lcchrty May 13, 2025
2df4412
Merge branch 'development' into update-to-mui-returninguser
JackHaeg May 15, 2025
ee25ec8
Merge pull request #1764 from angela-lee1/update-to-mui-returninguser
JackHaeg May 15, 2025
b2895f7
Merge branch 'development' into update-to-mui-newuser
JackHaeg May 15, 2025
2b15591
fix-align-VRMS-logo
bconti123 May 16, 2025
42993c1
Merge branch 'development' into 1881-users-router-unit-tests
JackHaeg May 16, 2025
c4394e6
Merge branch 'development' into 1917-align-VRMS-logo
bconti123 May 17, 2025
6c12c10
solve merge conflict
angela-lee1 May 18, 2025
1c75265
enable enter key submission on login
angela-lee1 May 18, 2025
4764802
Merge pull request #1812 from angela-lee1/add-form-validation-zoom-go…
JackHaeg May 19, 2025
c7b2ab5
Merge branch 'development' into 1917-align-VRMS-logo
JackHaeg May 19, 2025
cdd1a84
Merge branch 'development' into updateHTMLtoMUIforHomeComp
JackHaeg May 19, 2025
98384a1
Merge branch 'development' into unitTestingForRecurringEvents
JackHaeg May 20, 2025
f5dd4db
Added back padding: 0.3em;
sasszz May 20, 2025
8b3a693
Merge branch 'development' into lucie/mui-1711-events-js-update
sasszz May 20, 2025
ae66eb9
Merge branch 'development' into enable-enter-key-submission-on-login-…
trillium May 20, 2025
ae5b57e
Merge pull request #1869 from sasszz/lucie/mui-1711-events-js-update
sasszz May 20, 2025
bb893cd
wrap FormControl with form
angela-lee1 May 20, 2025
2338d09
Merge branch 'development' into enable-enter-key-submission-on-login-…
angela-lee1 May 20, 2025
c640e14
Merge remote-tracking branch 'origin/enable-enter-key-submission-on-l…
angela-lee1 May 20, 2025
fbd2a38
Fixed Align
bconti123 May 20, 2025
0abb09d
updated AWS_APP_NAme to match previous passed test
chipcorncob May 20, 2025
94c699a
Merge pull request #1936 from lcchrty/1918-fix-frontend-build-action
lcchrty May 20, 2025
3f8c6a0
wrong file path for dockerfile
chipcorncob May 20, 2025
2000d5d
Merge pull request #1938 from lcchrty/1918-fix-frontend-build-action
lcchrty May 20, 2025
3f2ffde
updated role and variable access
chipcorncob May 20, 2025
bf63508
Merge pull request #1939 from lcchrty/1918-fix-frontend-build-action
lcchrty May 20, 2025
3a7658e
added permission token per error
chipcorncob May 20, 2025
f5bd9a3
Merge pull request #1940 from lcchrty/1918-fix-frontend-build-action
lcchrty May 20, 2025
ce9677c
Update aws-frontend-deploy.yml
lcchrty May 20, 2025
dbac786
build & push to ECR aws-frontend-deploy.yml
lcchrty May 20, 2025
9ed0eab
fully updated with 1947-incubator code for modernizationa dn security…
chipcorncob May 21, 2025
f9ab787
Merge branch '1918-fix-frontend-build-action' into 1918-fix-frontend-…
lcchrty May 21, 2025
3da5e8a
Merge pull request #1941 from lcchrty/1918-fix-frontend-build-action
lcchrty May 21, 2025
10d2e1f
Update aws-frontend-deploy.yml
lcchrty May 21, 2025
0860e45
pulling updates from remote
chipcorncob May 21, 2025
985a06d
Merge branch 'development' into 1918-fix-frontend-build-action
chipcorncob May 21, 2025
e217eb7
Merge pull request #1942 from lcchrty/1918-fix-frontend-build-action
lcchrty May 21, 2025
5e619a8
Merge branch 'development' into unitTestingForCheckIns
dannyprikaz May 26, 2025
4130e52
Merge branch 'development' into unitTestingForCheckUsers
dannyprikaz May 26, 2025
08f0a2c
Merge pull request #1907 from jng34/unitTestingForCheckUsers
dannyprikaz May 26, 2025
90263c8
Merge branch 'development' into unitTestingForRecurringEvents
dannyprikaz May 26, 2025
00406d0
Expect create to be called with mockUser
May 26, 2025
4718f16
updated changes to unit tests for checkIns router
jng34 May 27, 2025
ab82050
updated test to GET /api/checkins/findEvent/:id
jng34 May 27, 2025
a8fc963
removed temporarily added script for testing checkIns router
jng34 May 27, 2025
8e5ac47
Merge branch 'development' into 1881-users-router-unit-tests
jng34 May 27, 2025
c3e882a
updated changes to tests
jng34 May 27, 2025
d981631
removed temporarily added script for testing router
jng34 May 27, 2025
1998b57
updated changes to tests pertaining to extraction of form data from b…
jng34 May 27, 2025
ec462d6
updated tests to test for specific form data being extracted and call…
jng34 May 27, 2025
5c9d4b1
Merge branch 'development' into updateHTMLtoMUIforHomeComp
bconti123 May 27, 2025
cf47f3c
Merge branch 'development' into enable-enter-key-submission-on-login-…
trillium May 27, 2025
6fc9330
Merge branch 'development' into 1917-align-VRMS-logo
trillium May 28, 2025
ea064ad
Merge pull request #1933 from angela-lee1/enable-enter-key-submission…
angela-lee1 May 28, 2025
d6e6659
Merge branch 'development' into 1881-users-router-unit-tests
dannyprikaz May 28, 2025
4a377e2
Merge pull request #1882 from dannyprikaz/1881-users-router-unit-tests
dannyprikaz May 28, 2025
b049361
Merge branch 'development' into unitTestingForCheckIns
dannyprikaz May 28, 2025
3444e34
Expect Delete and Update to be called with right inputs
May 28, 2025
d2dbea3
Merge branch '1881-users-router-unit-tests' of github.com:dannyprikaz…
May 28, 2025
7832848
Merge branch 'development' into updateHTMLtoMUIforHomeComp
jng34 May 28, 2025
a51533b
Merge branch 'development' into 1917-align-VRMS-logo
JackHaeg May 29, 2025
6ee8104
Add integration tests for User API Endpoints
dannyprikaz Jun 2, 2025
3513217
Add TODO note for desired future behavior
dannyprikaz Jun 2, 2025
5613187
Remove unnecessary references to setupDB
dannyprikaz Jun 2, 2025
3070154
Remove tests that depend on setupDB
dannyprikaz Jun 2, 2025
c6ceffd
Remove setupDB
dannyprikaz Jun 2, 2025
f312da6
Merge pull request #1947 from dannyprikaz/1946-remove-setupDB
trillium Jun 3, 2025
bea2f63
Merge branch 'development' into updateHTMLtoMUIforHomeComp
jng34 Jun 3, 2025
0ab315f
Merge pull request #1840 from jng34/updateHTMLtoMUIforHomeComp
jng34 Jun 3, 2025
136bc1d
Merge branch 'development' into dependabot/npm_and_yarn/client/http-p…
trillium Jun 3, 2025
8b2481a
Merge pull request #1908 from hackforla/dependabot/npm_and_yarn/clien…
trillium Jun 3, 2025
5ac05c4
Merge branch 'development' into 1881-users-router-unit-tests
jng34 Jun 3, 2025
85370ec
Merge pull request #1944 from dannyprikaz/1881-users-router-unit-tests
jng34 Jun 3, 2025
01f8e01
Merge branch 'development' into 1917-align-VRMS-logo
bconti123 Jun 3, 2025
7ae17da
Update aws-frontend-deploy.yml
lcchrty Jun 3, 2025
bb658f8
attempting to remove yarn.lock change
chipcorncob Jun 3, 2025
ad9c673
attempting to remove yarn.lock change
chipcorncob Jun 3, 2025
d6a7beb
Merge branch 'development' into 1918-fix-frontend-build-action
chipcorncob Jun 3, 2025
abefc9d
Merge pull request #1953 from lcchrty/1918-fix-frontend-build-action
lcchrty Jun 3, 2025
d21442b
wrote unit tests for user model
jng34 Jun 4, 2025
57dc495
Change Margin to Padding and vh units to 3em following the issue's de…
bconti123 Jun 6, 2025
f705ad9
Merge branch 'development' into update-to-mui-appjsx
JackHaeg Jun 10, 2025
2007067
chore: Add PR instructions to CONTRIBUTING.md
trillium Jun 10, 2025
38e57c6
fix: Change conditional to show managed projects list in an else block
trillium Jun 10, 2025
7ff04f5
Merge pull request #1959 from trillium/resolve-frontend-project-list-bug
JackHaeg Jun 10, 2025
5f18896
Merge branch 'development' into add-git-pr-to-contributing
JackHaeg Jun 10, 2025
59e346b
Merge pull request #1957 from trillium/add-git-pr-to-contributing
JackHaeg Jun 10, 2025
f4c1f90
Merge branch 'development' into 1918-fix-frontend-build-action
JackHaeg Jun 10, 2025
ebedad0
Merge branch 'development' into unitTestingForCheckIns
jng34 Jun 16, 2025
de9ba36
Merge branch 'development' into unitTestingForRecurringEvents
jng34 Jun 16, 2025
b9fb4ba
Merge branch 'development' into update-to-mui-appjsx
JackHaeg Jun 17, 2025
be96fa3
Merge branch 'development' into 1917-align-VRMS-logo
trillium Jun 17, 2025
12b9ff5
Merge remote-tracking branch 'upstream/development' into pr/1727
trillium Jun 17, 2025
48318d5
Merge pull request #1932 from bconti123/1917-align-VRMS-logo
bconti123 Jun 17, 2025
f80aff1
Test that emails must be unique for users
dannyprikaz Jun 17, 2025
e9ef784
Merge branch 'development' into unitTestingForCheckIns
dannyprikaz Jun 17, 2025
ddcf194
Merge pull request #1906 from jng34/unitTestingForCheckIns
dannyprikaz Jun 17, 2025
b44dbdb
Merge branch 'development' into 1723
trillium Jun 17, 2025
c4d092a
Merge pull request #1727 from ntrehan/1723
trillium Jun 17, 2025
d6357f5
Merge branch 'development' into update-to-mui-newuser
trillium Jun 17, 2025
f5d7a2c
Merge pull request #1744 from angela-lee1/update-to-mui-newuser
trillium Jun 17, 2025
bc5b698
Merge branch 'development' into update-to-mui-appjsx
trillium Jun 17, 2025
e0105e8
Merge pull request #1742 from angela-lee1/update-to-mui-appjsx
trillium Jun 17, 2025
c2e8bed
ci: Change husky to run only on staged files
trillium Jun 17, 2025
6661825
Merge branch 'development' into testy (with --no-verify)
trillium Jun 17, 2025
332b90a
Merge branch 'development' into formatting]
trillium Jun 17, 2025
f04bb15
Merge pull request #1823 from bkmorgan3/formatting]
trillium Jun 17, 2025
affd599
chore(deps): bump brace-expansion from 1.1.11 to 1.1.12
dependabot[bot] Jun 17, 2025
96795f8
docs: Update directions on how to resolve lint errors beofre making f…
trillium Jun 17, 2025
a5e4c0c
Merge pull request #1961 from trillium/update_contributing_resolve_er…
JackHaeg Jun 17, 2025
e902408
removed dependency of tests on mock mongoDb server,
jng34 Jun 17, 2025
c4eb0a3
docs: Update directions on how to resolve lint errors beofre making f…
trillium Jun 17, 2025
9b57b5b
ci: Add 'prepare' to installation script
trillium Jun 17, 2025
c464365
docs: Update CONTRIBUTING with husky directions
trillium Jun 17, 2025
49da080
fix: Resolve spelling errors
trillium Jun 17, 2025
7d482fa
feat: Add tailwind to project, no other visual changes
trillium Jun 17, 2025
6c625e8
chore: Restore Home Component to previous state
trillium Jun 17, 2025
151c139
chore: Restore client/src/index.jsx pre-linting
trillium Jun 17, 2025
6458a52
chore: Restore App.tsx to previous state
trillium Jun 17, 2025
9cd640b
Merge pull request #1964 from trillium/tailwind
trillium Jun 17, 2025
14cd62d
Merge branch 'development' into add_husky_script
trillium Jun 17, 2025
db08901
Merge pull request #1963 from trillium/add_husky_script
trillium Jun 17, 2025
c7eee68
Merge branch 'development' into dependabot/npm_and_yarn/brace-expansi…
trillium Jun 17, 2025
553366b
Merge pull request #1960 from hackforla/dependabot/npm_and_yarn/brace…
trillium Jun 17, 2025
99a9928
Merge branch 'development' into 1935-user-integration-test
JackHaeg Jun 17, 2025
9985c3b
Merge branch 'development' into 1918-fix-frontend-build-action
JackHaeg Jun 17, 2025
20ebfbc
Merge branch 'development' into unitTestingForUserModel
JackHaeg Jun 17, 2025
1d824b2
Merge branch 'development' into unitTestingForProjects
JackHaeg Jun 17, 2025
da63db8
Merge branch 'development' into unitTestingForRecurringEvents
jng34 Jun 17, 2025
acd0621
added testing for fail cases
jng34 Jun 17, 2025
534e1dc
Merge branch 'development' into unitTestingforQuestions
jng34 Jun 17, 2025
7afec3d
chore: Create description doc of what the build action does
trillium Jun 18, 2025
fcfdd57
chore: Inline comments for what the build action does
trillium Jun 18, 2025
f00b14f
chore(deps): Upgrade vite and vite-plugin-svgr to latest
trillium Jun 18, 2025
fa6f006
chore: Change import syntax to new syntax expected by svgr
trillium Jun 18, 2025
60aab59
Merge pull request #1970 from trillium/upgrade-vite
trillium Jun 18, 2025
9d6cabf
Merge branch 'development' into 1918-fix-frontend-build-action
trillium Jun 18, 2025
21a7b9d
chore(deps): bump brace-expansion from 1.1.11 to 1.1.12 in /client
dependabot[bot] Jun 18, 2025
85ff5bc
chore: Add autoprefixer to resolve build error
trillium Jun 18, 2025
8990c1b
Merge pull request #1943 from hackforla/1918-fix-frontend-build-action
trillium Jun 18, 2025
1f1e351
added testing for errors
jng34 Jun 17, 2025
1a759bd
added testing for fail cases, fixed bug in recurringEvents router
jng34 Jun 19, 2025
5d79412
Merge branch 'development' into unitTestingForRecurringEvents
jng34 Jun 19, 2025
71dfa4d
Merge branch 'development' into 1935-user-integration-test
jng34 Jun 19, 2025
8a467d8
fix: Add arg gmail_remove_subaddress to .normalizeEmail
trillium Jun 19, 2025
9ffe739
Merge branch 'development' into unitTestingForProjects
jng34 Jun 20, 2025
57c794b
Merge pull request #1911 from jng34/unitTestingForRecurringEvents
dannyprikaz Jun 24, 2025
24bc69d
Merge branch 'development' into unitTestingforQuestions
dannyprikaz Jun 24, 2025
095b24a
Merge pull request #1913 from jng34/unitTestingforQuestions
dannyprikaz Jun 24, 2025
4bca370
Merge branch 'development' into unitTestingForProjects
dannyprikaz Jun 24, 2025
1e51ae5
Merge pull request #1920 from jng34/unitTestingForProjects
dannyprikaz Jun 24, 2025
134bbc0
Merge branch 'development' into 1935-user-integration-test
jng34 Jun 24, 2025
9fb36bc
Merge branch 'development' into email-fix
dannyprikaz Jun 24, 2025
eb10038
Merge branch 'development' into unitTestingForUserModel
jng34 Jun 25, 2025
43325fa
Merge pull request #1972 from trillium/email-fix
trillium Jun 26, 2025
1146501
Merge branch 'development' into dependabot/npm_and_yarn/client/brace-…
JackHaeg Jun 26, 2025
945a9d1
Merge branch 'development' into 1935-user-integration-test
JackHaeg Jun 26, 2025
083b763
ci: Update backend build action
trillium Jun 26, 2025
1af7354
ci: Add build SHA to health check for deployment verification
trillium Jun 26, 2025
6fa5dbd
fix: Use git command to get build SHA in health check
trillium Jun 26, 2025
ffc3bc6
Merge pull request #1971 from hackforla/dependabot/npm_and_yarn/clien…
trillium Jun 26, 2025
b0f9a6d
chore(deps): bump brace-expansion from 1.1.11 to 1.1.12 in /backend
dependabot[bot] Jun 26, 2025
bbba8ae
fix: Improve BUILD_SHA detection and add debug logging
trillium Jun 26, 2025
e8fbf01
Merge branch 'development' into backendBuild
trillium Jun 26, 2025
790a140
feat: Add built timestamp to health check message
trillium Jun 26, 2025
1ce500e
Merge remote-tracking branch 'upstream/backendBuild' into backendBuild
trillium Jun 26, 2025
a76183b
Apply suggestions from code review
trillium Jun 26, 2025
4ab2c59
Merge branch 'development' into 1935-user-integration-test
JackHaeg Jun 26, 2025
330a0ca
Merge pull request #1975 from hackforla/backendBuild
trillium Jun 26, 2025
c267dfc
Merge branch 'development' into dependabot/npm_and_yarn/backend/brace…
trillium Jun 27, 2025
ed1f146
Merge pull request #1974 from hackforla/dependabot/npm_and_yarn/backe…
trillium Jun 27, 2025
b4dd6a7
Merge branch 'development' into 1935-user-integration-test
dannyprikaz Jul 1, 2025
fbf39f7
Merge pull request #1945 from dannyprikaz/1935-user-integration-test
dannyprikaz Jul 1, 2025
53876f8
fixed bug to now show admins and users in project members search
jng34 Jul 3, 2025
2975599
Enforce that emails can only be stored in lowercase
dannyprikaz Jul 11, 2025
41fe687
Merge branch 'development' of https://github.com/hackforla/vrms into …
dannyprikaz Jul 11, 2025
ea80291
fix: Update missed var rename u -> user
trillium Jul 15, 2025
96478f4
updated projectManagerList query efficiency
jng34 Jul 15, 2025
dac077f
Merge pull request #1977 from jng34/userPermissionFixProjectMembers
jng34 Jul 15, 2025
63fb985
Merge branch 'development' into unitTestingForUserModel
jng34 Jul 15, 2025
df6b766
Revert "Bug Fix to show both Admins and Users in Project Members search"
trillium Jul 15, 2025
54452a0
remove misleading comment
jng34 Jul 15, 2025
f5ff5fa
Merge pull request #1981 from hackforla/revert-1977-userPermissionFix…
trillium Jul 15, 2025
fcd7bb1
Merge branch 'development' into userPermissionFixProjectMembers
trillium Jul 15, 2025
4467c17
remove unnecessary test
jng34 Jul 15, 2025
41f6579
Merge branch 'development' into unitTestingForUserModel
jng34 Jul 15, 2025
c19634c
fix: Add projectManager_list to users.router.js
trillium Jul 17, 2025
3d1b065
feat: Run single query for project IDs to database
trillium Jul 17, 2025
78aca0c
refactor: Add console log statements to resolve lint error
trillium Jul 17, 2025
a5d84ec
Merge pull request #1982 from jng34/userPermissionFixProjectMembers
trillium Jul 17, 2025
56e6c8e
Merge branch 'development' into unitTestingForUserModel
jng34 Jul 18, 2025
bc5f344
chore(deps): bump form-data from 4.0.0 to 4.0.4 in /client
dependabot[bot] Jul 21, 2025
55bb9e6
Merge pull request #1985 from hackforla/dependabot/npm_and_yarn/clien…
trillium Jul 29, 2025
4e793e3
Merge branch 'development' into unitTestingForUserModel
dannyprikaz Jul 29, 2025
de14c9d
Merge pull request #1955 from jng34/unitTestingForUserModel
dannyprikaz Jul 29, 2025
040065a
Merge branch 'development' of https://github.com/hackforla/vrms into …
dannyprikaz Jul 29, 2025
a6ff776
Add test to ensure user model sets emails to lowercase
dannyprikaz Aug 3, 2025
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
177 changes: 95 additions & 82 deletions .github/workflows/aws-backend-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
inputs:
env:
type: choice
description: 'AWS Incubator Env'
options:
- dev
- prod
description: "AWS Incubator Env"
options:
- dev
- prod
ref:
description: 'Branch, Tag, or SHA'
description: "Branch, Tag, or SHA"
required: true
env:
AWS_SHARED_CLUSTER: incubator-prod
Expand All @@ -19,95 +19,108 @@ env:
DOCKER_PATH: backend
jobs:
setup_env:
name: Set-up environment
name: Set-up environment
runs-on: ubuntu-latest
steps:
- name: Debug Action
uses: hmarr/[email protected]
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
- name: Set AWS Env & Image Tag per workflow
run: |
SHORT_SHA=$(git rev-parse --short HEAD)
if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then
INPUT_ENV=${{ github.event.inputs.env }}; INPUT_REF=${{ github.event.inputs.ref }}
echo AWS_APPENV="$AWS_APP_NAME"-$INPUT_ENV >> $GITHUB_ENV
echo IMAGE_TAG=$SHORT_SHA >> $GITHUB_ENV
fi
- name: Debug Action
uses: hmarr/[email protected]
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
- name: Set AWS Env & Image Tag per workflow
run: |
if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then
INPUT_ENV=${{ github.event.inputs.env }}; INPUT_REF=${{ github.event.inputs.ref }}
echo AWS_APPENV="$AWS_APP_NAME"-$INPUT_ENV >> $GITHUB_ENV
echo IMAGE_TAG=$(git rev-parse --short HEAD) >> $GITHUB_ENV
echo BUILD_SHA=$(git rev-parse --short HEAD) >> $GITHUB_ENV
fi
outputs:
AWS_APPENV: ${{ env.AWS_APPENV }}
IMAGE_TAG: ${{ env.IMAGE_TAG }}
BUILD_SHA: ${{ env.BUILD_SHA }}
build:
name: Build & Push Docker Image
runs-on: ubuntu-latest
needs: [setup_env]
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.INCUBATOR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.INCUBATOR_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
- name: Init Docker Cache
uses: jpribyl/[email protected]
with:
key: ${{ github.workflow }}-2-{hash}
restore-keys: |
${{ github.workflow }}-2-
- name: Build & Push Image to ECR
uses: kciter/aws-ecr-action@v3
with:
access_key_id: ${{ secrets.INCUBATOR_AWS_ACCESS_KEY_ID }}
secret_access_key: ${{ secrets.INCUBATOR_AWS_SECRET_ACCESS_KEY }}
account_id: ${{ secrets.INCUBATOR_AWS_ACCOUNT_ID }}
repo: ${{ needs.setup_env.outputs.AWS_APPENV }}
region: ${{ env.AWS_REGION }}
tags: latest,${{ needs.setup_env.outputs.IMAGE_TAG }}
dockerfile: ${{ env.DOCKERFILE }}
path: ${{ env.DOCKER_PATH }}
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.INCUBATOR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.INCUBATOR_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Debug Build Variables
env:
BUILD_SHA: ${{ needs.setup_env.outputs.BUILD_SHA }}
IMAGE_TAG: ${{ needs.setup_env.outputs.IMAGE_TAG }}
run: |
echo "=== Build Debug Information ==="
echo "BUILD_SHA: $BUILD_SHA"
echo "IMAGE_TAG: $IMAGE_TAG"
echo "DOCKERFILE: ${{ env.DOCKERFILE }}"
echo "DOCKER_PATH: ${{ env.DOCKER_PATH }}"
echo "================================"
- name: Build & Push Image to ECR
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
ECR_REPOSITORY: ${{ needs.setup_env.outputs.AWS_APPENV }}
IMAGE_TAG: ${{ needs.setup_env.outputs.IMAGE_TAG }}
BUILD_SHA: ${{ needs.setup_env.outputs.BUILD_SHA }}
run: |
docker buildx build \
--platform linux/amd64 \
--cache-from type=gha \
--cache-to type=gha,mode=max \
--push \
--build-arg BUILD_SHA=$BUILD_SHA \
-f ${{ env.DOCKERFILE }} \
-t $ECR_REGISTRY/$ECR_REPOSITORY:latest \
-t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
${{ env.DOCKER_PATH }}
deploy:
name: Deploy to AWS ECS
runs-on: ubuntu-latest
needs: [setup_env, build]
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.INCUBATOR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.INCUBATOR_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
- name: Pull Task Definition & write to file
id: aws-task-definition
run: |
aws ecs describe-task-definition \
--task-definition ${{ needs.setup_env.outputs.AWS_APPENV }} \
--query taskDefinition | \
jq 'del(.taskDefinitionArn,.revision,.status,.registeredBy,.registeredAt,.compatibilities,.requiresAttributes)' > task-def.json
- name: Interpolate new Docker Image into Task Definition
id: task-definition
uses: aws-actions/amazon-ecs-render-task-definition@v1
with:
task-definition: task-def.json
container-name: ${{ needs.setup_env.outputs.AWS_APPENV }}
image: ${{ steps.login-ecr.outputs.registry }}/${{ needs.setup_env.outputs.AWS_APPENV }}:${{ needs.setup_env.outputs.IMAGE_TAG }}
- name: Deploy Amazon ECS
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-definition.outputs.task-definition }}
service: ${{ needs.setup_env.outputs.AWS_APPENV }}
cluster: ${{ env.AWS_SHARED_CLUSTER }}
wait-for-service-stability: true
wait-for-minutes: 5 minutes

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.INCUBATOR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.INCUBATOR_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
- name: Pull Task Definition & write to file
id: aws-task-definition
run: |
aws ecs describe-task-definition \
--task-definition ${{ needs.setup_env.outputs.AWS_APPENV }} \
--query taskDefinition | \
jq 'del(.taskDefinitionArn,.revision,.status,.registeredBy,.registeredAt,.compatibilities,.requiresAttributes)' > task-def.json
- name: Interpolate new Docker Image into Task Definition
id: task-definition
uses: aws-actions/amazon-ecs-render-task-definition@v1
with:
task-definition: task-def.json
container-name: ${{ needs.setup_env.outputs.AWS_APPENV }}
image: ${{ steps.login-ecr.outputs.registry }}/${{ needs.setup_env.outputs.AWS_APPENV }}:${{ needs.setup_env.outputs.IMAGE_TAG }}
- name: Deploy Amazon ECS
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-definition.outputs.task-definition }}
service: ${{ needs.setup_env.outputs.AWS_APPENV }}
cluster: ${{ env.AWS_SHARED_CLUSTER }}
wait-for-service-stability: true
wait-for-minutes: 5
182 changes: 182 additions & 0 deletions .github/workflows/aws-frontend-deploy.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
---
title: AWS Frontend Deploy Workflow
---

# AWS Frontend Deploy Workflow

This document describes the purpose and structure of the GitHub Actions workflow defined in `.github/workflows/aws-frontend-deploy.yml`.

## Overview

This workflow automates the process of building, pushing, and deploying the frontend application to AWS. It is triggered manually via the GitHub Actions UI using `workflow_dispatch`:

```yaml
on:
workflow_dispatch: # Manual trigger from GitHub Actions UI
inputs:
env:
type: choice
description: "AWS Incubator Env"
options: # Selectable environment options
- dev
- prod
ref:
description: "Branch, Tag, or SHA" # Code reference to deploy
required: true
```

Users can select the environment (`dev` or `prod`) and specify a branch, tag, or SHA to deploy.

## Environment Variables

The workflow sets several environment variables for use throughout the jobs:

```yaml
env:
AWS_SHARED_CLUSTER: incubator-prod # Target ECS cluster name
AWS_APP_NAME: vrms-frontend # Application name for tagging and service
AWS_REGION: us-west-2 # AWS region for deployment
DOCKERFILE: Dockerfile.prod # Dockerfile used for build
DOCKER_PATH: client # Path to frontend source and Dockerfile
```

Each of these environment variables is set at the top level of the workflow and is available to all jobs and steps. Here is a description of each:

- `AWS_SHARED_CLUSTER`: The name of the AWS ECS cluster to which the frontend will be deployed. In this workflow, it is set to `incubator-prod`. _Might be sourced from your AWS infrastructure naming conventions or deployment environment._
- `AWS_APP_NAME`: The application name used for tagging Docker images and identifying the service in AWS. Here, it is set to `vrms-frontend`. _Might be sourced from your project or repository name._
- `AWS_REGION`: The AWS region where resources are deployed. Set to `us-west-2` (Oregon). _Might be sourced from your AWS account's preferred deployment region._
- `DOCKERFILE`: The Dockerfile used for building the frontend image. Set to `Dockerfile.prod`, indicating a production-ready build. _Might be sourced from your repository's Docker configuration._
- `DOCKER_PATH`: The path to the directory containing the Dockerfile and frontend source code. Set to `client`. _Might be sourced from your repository structure._

## Jobs

### 1. `setup_env`

This job checks out the code and sets up environment-specific variables for the deployment:

```yaml
jobs:
setup_env:
name: Set-up environment
runs-on: ubuntu-latest
steps:
- name: Debug Action
uses: hmarr/debug-action@v2 # Prints debug info to logs
- name: Checkout
uses: actions/checkout@v3 # Checks out code at specified ref
with:
ref: ${{ github.event.inputs.ref }} # Uses user-specified ref
- name: Set AWS Env & Image Tag per workflow
# Get short SHA of current commit
# if -- action is triggered manually
# Get environment input from workflow dispatch
# Get ref input from workflow dispatch
# Set AWS_APPENV for later steps
# Set IMAGE_TAG for later steps
# fi
run: |
SHORT_SHA=$(git rev-parse --short HEAD)
if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then
INPUT_ENV=${{ github.event.inputs.env }}
INPUT_REF=${{ github.event.inputs.ref }}
echo AWS_APPENV="$AWS_APP_NAME"-$INPUT_ENV >> $GITHUB_ENV
echo IMAGE_TAG=$SHORT_SHA >> $GITHUB_ENV
fi
```

This job outputs the application environment and image tag for use in subsequent jobs.

### 2. `build`

This job builds the Docker image for the frontend and pushes it to Amazon ECR:

```yaml
build:
name: Build & Push Docker Image
runs-on: ubuntu-latest
permissions:
id-token: write # Needed for OIDC authentication to AWS
needs: [setup_env] # Waits for environment setup
steps:
- name: Checkout
uses: actions/checkout@v3 # Checks out code at specified ref
with:
ref: ${{ github.event.inputs.ref }}
- name: Setup Node.js
uses: actions/setup-node@v3 # Sets up Node.js for build
with:
node-version: 18 # Uses Node.js v18
cache: "npm" # Enables npm caching
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v3 # Sets AWS credentials for CLI
with:
role-to-assume: arn:aws:iam::035866691871:role/incubator-cicd-vrms # IAM role for deploy
role-session-name: incubator-cicd-vrms-gha # Session name for audit
aws-region: us-west-2 # AWS region
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1 # Authenticates Docker to ECR
- name: Build, tag, and push the image to Amazon ECR
id: build-push-image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ECR registry URL
ECR_REPOSITORY: ${{ env.AWS_APP_NAME }} # ECR repo name
run: |
ls # List files for debug
cd ./${{ env.DOCKER_PATH }} # Enter frontend directory
docker build \
-f ${{ env.DOCKERFILE }} \ # Use production Dockerfile
-t ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ needs.setup_env.outputs.IMAGE_TAG }} \ # Tag with image SHA
-t ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ github.event.inputs.env }} \ # Tag with environment
.
docker image push --all-tags ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }} # Push all tags
```

### 3. `deploy`

This job deploys the new Docker image to AWS ECS by forcing a new deployment of the ECS service:

```yaml
deploy:
name: Deploy to AWS ECS
runs-on: ubuntu-latest
needs: [setup_env, build] # Waits for setup and build jobs
permissions:
id-token: write # Needed for OIDC authentication to AWS
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v3 # Sets AWS credentials for CLI
with:
role-to-assume: arn:aws:iam::035866691871:role/incubator-cicd-vrms # IAM role for deploy
role-session-name: incubator-cicd-vrms-gha # Session name for audit
aws-region: us-west-2 # AWS region
- name: Restart ECS Service
id: redeploy-service
env:
SERVICE_NAME: ${{env.AWS_APP_NAME}}-${{ github.event.inputs.env }} # ECS service name
run: |
aws ecs update-service --force-new-deployment --service $SERVICE_NAME --cluster $AWS_SHARED_CLUSTER # Triggers ECS redeploy
```

## Repository Checkout and Working Directory

When this workflow runs, it uses the `actions/checkout@v3` action to clone the entire repository. The initial working directory for all steps is the root of the repository.

Before building the Docker image, the workflow explicitly changes into the `client` directory using:

```bash
cd ./${{ env.DOCKER_PATH }}
```

This means that for the Docker build step, the working directory is `client/`, and the Dockerfile path `Dockerfile.prod` refers to `client/Dockerfile.prod`.

**Summary:**

- The workflow clones the entire repository.
- The working directory starts at the repo root.
- The workflow changes into the `client` directory before building the Docker image.
- The Docker build context and Dockerfile are both relative to the `client` directory.

## Summary

This workflow provides a manual, environment-aware deployment pipeline for the frontend application, leveraging Docker, Amazon ECR, and ECS. It ensures that only the specified code reference is built and deployed, and that deployments are traceable and auditable via GitHub Actions.
Loading