Migrate to NextJS

- Update `.env` file to convert VITE to NEXT_PUBLIC - IMPORTANT: `.env` files will need to be updated to reflect this, please check the .env.example for more information. Referencing variables will not work for anything used in NextJS as it is loaded through `dotenv` (so we can use `.env` in parent directory), which does not seem to work with variable references (such as jddAqAqAq`A=$B`)q - Restructured code to work with NextJS - Fixed bug with tailwind: vercel/next.js#34448 (comment) - Added dependencies (`dotenv`, `eslint-config-next`, `next`)
jacob-horton · Jun 15, 2023 · 2450a1d · 2450a1d
1 parent 93b7b4d
commit 2450a1d
Show file tree

Hide file tree

Showing 25 changed files with 6,152 additions and 2,094 deletions.
diff --git a/.env.example b/.env.example
@@ -8,16 +8,19 @@ DATABASE_URL=postgres://$DBUSER:$DBPASSWORD@$DBADDR:5433/$DBNAME
 
 
 #### AUTHENTICATION ####
-AUTHURL=http://localhost:8180/auth/realms/flipster
-JWKS_URL=$AUTHURL/protocol/openid-connect/certs
-VITE_AUTH_SERVER_URL=$AUTHURL
+JWKS_URL=http://localhost:8180/auth/realms/flipsterprotocol/openid-connect/certs
+NEXT_PUBLIC_AUTH_URL=http://localhost:8180/auth/realms/flipster
 
 # Needs to be configured in keycloak
-VITE_AUTH_CLIENT_ID="react-auth"
+NEXT_PUBLIC_AUTH_CLIENT_ID="react-auth"
+
+
+#### Next JS ####
+NEXT_PUBLIC_URL=http://localhost:5173
 
 
 #### API ####
-VITE_API_URL=http://localhost:8080
+NEXT_PUBLIC_API_URL=http://localhost:8080
 
 
 #### KEYCLOAK ####

diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,4 @@ sketch
 
 **/*.env
 data
+.next
diff --git a/api/src/auth.rs b/api/src/auth.rs
@@ -63,7 +63,7 @@ async fn get_sub(token: &str) -> Result<String, Box<dyn Error>> {
     let decoding_key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e)?;
     let token = decode::<Claims>(token, &decoding_key, &Validation::new(Algorithm::RS256))?;
 
-    if token.claims.iss != env::var("VITE_AUTH_SERVER_URL").expect("No auth server URL provided") {
+    if token.claims.iss != env::var("NEXT_PUBLIC_AUTH_URL").expect("No auth server URL provided") {
         return Err(Box::new(InvalidIssuer));
     }
 

diff --git a/web/app/layout.tsx b/web/app/layout.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
diff --git a/web/index.html b/web/index.html
diff --git a/web/next-env.d.ts b/web/next-env.d.ts
@@ -0,0 +1,6 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/web/next.config.js b/web/next.config.js
@@ -0,0 +1,3 @@
+import { config } from "dotenv";
+
+config({ path: "../.env" });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { config } from "dotenv";

		config({ path: "../.env" });