Skip to content

Commit

Permalink
Merge pull request #176 from JumboCode/main
Browse files Browse the repository at this point in the history
Sync Upstream
  • Loading branch information
nickbar01234 committed Apr 30, 2024
2 parents 295f5c4 + bd280a5 commit 5f29aaf
Show file tree
Hide file tree
Showing 48 changed files with 810 additions and 320 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/unit-testing.yml
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

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
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.12.1",
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
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

0 comments on commit 5f29aaf

Please sign in to comment.