Merge branch 'main' of https://github.com/rit-sse/WebsiteTheSSEquel

rit-sse · Sep 8, 2024 · 7073b94 · 7073b94
2 parents 2d3ce32 + b54d1c0
commit 7073b94
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 5 deletions.
diff --git a/documentation/EnvironmentSetup.md b/documentation/EnvironmentSetup.md
@@ -64,6 +64,6 @@ The `GOOGLE_CLIENT_ID` and `GOOGLE_CLIENT_SECRET` can be found again later by go
 ## Building the Local Database
 If you run the project now, you'll encounter schema errors. This is because the local database hasn't been built. We use Prisma for managing the Postgres database, so we'll use [Prisma's migrate command](https://www.prisma.io/docs/concepts/components/prisma-migrate/migrate-development-production) to build the db tables using the schema defined in the [schema.prisma](../next/prisma/schema.prisma) file.
 
-In the /next/ directory, run `npx prisma migrate dev`.  
+In the /next/ directory, run `npx prisma migrate dev`. Then run `npx prisma db seed` to populate the database with test data.
 
 That's it! You should now be able to run `npm run dev` and view the website at `localhost:3000` with authentication and access to your local database instance. Try logging in with your RIT email.
diff --git a/next/package.json b/next/package.json
@@ -21,20 +21,21 @@
     "clsx": "^2.1.0",
     "eslint": "8.48.0",
     "eslint-config-next": "13.4.19",
-    "next": "^13.5.6",
+    "next": "^14.2.8",
     "next-auth": "^4.24.7",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.33",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "rehype-sanitize": "^6.0.0",
     "rehype-stringify": "^10.0.0",
     "remark": "^15.0.1",
     "remark-gfm": "^4.0.0",
     "remark-rehype": "^11.0.0",
     "remark-stringify": "^11.0.0",
     "sass": "^1.67.0",
-    "tailwindcss": "3.3.3"
+    "tailwindcss": "3.3.3",
+    "website-the-ssequel": "file:"
   },
   "devDependencies": {
     "@tailwindcss/aspect-ratio": "^0.4.2",

diff --git a/next/public/kitty_cat_1.jpg b/next/public/kitty_cat_1.jpg
diff --git a/next/public/kitty_cat_2.jpg b/next/public/kitty_cat_2.jpg
diff --git a/next/public/kitty_cat_3.jpg b/next/public/kitty_cat_3.jpg
diff --git a/next/public/kitty_cat_4.jpg b/next/public/kitty_cat_4.jpg
diff --git a/next/public/kitty_cat_5.jpg b/next/public/kitty_cat_5.jpg
diff --git a/next/public/kitty_cat_6.jpg b/next/public/kitty_cat_6.jpg
diff --git a/next/public/pupper_1.jpg b/next/public/pupper_1.jpg
diff --git a/next/public/pupper_2.jpg b/next/public/pupper_2.jpg