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.

Sign up for GitHub

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

Jump to bottom

Sync Upstream #176

Merged
merged 16 commits into from
Apr 30, 2024
Merged

Sync Upstream #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e235eb5
Created the mailchimp connection for adding emails
sburchfield33 Apr 15, 2024
4c4b0c9
Changed the API for Mailchimp
sburchfield33 Apr 18, 2024
4e50caa
Prettified Code!
sburchfield33 Apr 18, 2024
8c9b9dd
mailchimp server config from API key
johnny-t06 Apr 19, 2024
9f329a4
Updated github actions yaml file
sburchfield33 Apr 25, 2024
c8bf6f7
Merge branch 'sburchfield33-johnny-t06-mailchimp' of github.com:Jumbo…
sburchfield33 Apr 25, 2024
c66c226
Merge pull request #167 from JumboCode/sburchfield33-johnny-t06-mailc…
johnny-t06 Apr 25, 2024
ae65778
fa/won/style-landing
ffft1215 Apr 26, 2024
d2c9454
Make add file popup more consistent to add senior pop-up (#171)
cledi01 Apr 26, 2024
4a3fe98
Merge pull request #175 from JumboCode/fa/won/style-landing
ffft1215 Apr 27, 2024
cde0fb2
deleted seniors, request, and chapter (#173)
nathan-j-edwards Apr 28, 2024
06e5c8a
Display chapter request metadata (#174)
nickbar01234 Apr 28, 2024
31eba0b
Error Boundary (#177)
nickbar01234 Apr 29, 2024
8c9a81d
Fix shadow
nickbar01234 Apr 29, 2024
5c6fd77
Johnny/won/nick/photo carousel 2 (#178)
johnny-t06 Apr 29, 2024
bd280a5
Delete senior folder from drive (#176)
nickbar01234 Apr 29, 2024
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: 2 additions & 0 deletions .github/workflows/unit-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ jobs:
GOOGLE_BASEFOLDER: ${{ secrets.GOOGLE_BASEFOLDER }}
GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
MAILCHIMP_AUDIENCE_ID: ${{ secrets.MAILCHIMP_AUDIENCE_ID }}
189 changes: 187 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^3.3.2",
"@mailchimp/mailchimp_marketing": "^3.0.80",
"@material-tailwind/react": "^2.0.5",
"@next-auth/prisma-adapter": "^1.0.4",
"@prisma/client": "^5.5.2",
Expand All @@ -35,15 +36,19 @@
"react-datepicker": "^6.1.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.48.2",
"react-loading-skeleton": "^3.4.0",
"react-multi-carousel": "^2.8.5",
"uuidv4": "^6.2.13",
"yarn": "^1.22.19",
"zod": "^3.22.4"
},
"devDependencies": {
"@types/mailchimp__mailchimp_marketing": "^3.0.20",
"@types/node": "18.0.0",
"@types/react": "18.0.14",
"@types/react-datepicker": "^6.0.1",
"@types/react-dom": "18.0.5",
"@types/react-image-gallery": "^1.2.4",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"autoprefixer": "^10.4.7",
Expand Down
2 changes: 2 additions & 0 deletions postcss.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module.exports = {
plugins: {
"postcss-import": {},
"tailwindcss/nesting": {},
tailwindcss: {},
autoprefixer: {},
},
Expand Down
Loading
Loading