From 854c5d5bae81c7e16f1695b5fcd1f9cc28ab1ed5 Mon Sep 17 00:00:00 2001
From: Shahan Neda <snedadah@csclub.uwaterloo.ca>
Date: Thu, 7 Jul 2022 19:52:43 -0400
Subject: [PATCH 1/2] Fix Staging server 404 error (#22)

---
 Dockerfile         |  3 +++
 next.config.js     |  1 +
 staging-nginx.conf | 10 ++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 staging-nginx.conf

diff --git a/Dockerfile b/Dockerfile
index dfb0893..e0c32c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,5 @@
 FROM nginx
 COPY ./out /usr/share/nginx/html
+
+COPY staging-nginx.conf /etc/nginx/conf.d
+RUN rm /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/next.config.js b/next.config.js
index a843cbe..0128f08 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  trailingSlash: true,
 }
 
 module.exports = nextConfig
diff --git a/staging-nginx.conf b/staging-nginx.conf
new file mode 100644
index 0000000..4e05092
--- /dev/null
+++ b/staging-nginx.conf
@@ -0,0 +1,10 @@
+server {
+    listen 80;
+    location / {
+      root   /usr/share/nginx/html;
+      index  index.html index.htm;
+      try_files $uri $uri/ $uri.html $uri.html/ /index.html;
+    } 
+    error_page 404 /index.html;
+  }
+  
\ No newline at end of file

From 5ce2efdc3102fbe6531349755bd668150804c041 Mon Sep 17 00:00:00 2001
From: Amy <a258wang@csclub.uwaterloo.ca>
Date: Mon, 11 Jul 2022 02:28:47 -0400
Subject: [PATCH 2/2] Fix Inconsolata font (#24)

Fixes #23

Kudos to @j285he for noticing that we had commas in `pages/font.css` when we should've had semicolons.

Co-authored-by: Amy Wang <a258wang@csclub.uwaterloo.ca>
Reviewed-on: https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile/pulls/24
Reviewed-by: Shahan Neda <snedadah@csclub.uwaterloo.ca>
---
 pages/font.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/font.css b/pages/font.css
index 07147f0..c6ea327 100644
--- a/pages/font.css
+++ b/pages/font.css
@@ -5,7 +5,7 @@
   font-weight: 200;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-200.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-200.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-200.woff') format('woff');
 }
 
 /* inconsolata-300 - latin */
@@ -15,7 +15,7 @@
   font-weight: 300;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-300.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-300.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-300.woff') format('woff');
 }
 
 /* inconsolata-regular - latin */
@@ -25,7 +25,7 @@
   font-weight: 400;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-regular.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-regular.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-regular.woff') format('woff');
 }
 
 /* inconsolata-500 - latin */
@@ -35,7 +35,7 @@
   font-weight: 500;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-500.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-500.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-500.woff') format('woff');
 }
 
 /* inconsolata-600 - latin */
@@ -46,7 +46,7 @@
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-600.woff2') format('woff2'),
     /* Super Modern Browsers */
-    url('../public/fonts/inconsolata-v30-latin-600.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-600.woff') format('woff');
 }
 
 /* inconsolata-700 - latin */
@@ -56,7 +56,7 @@
   font-weight: 700;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-700.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-700.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-700.woff') format('woff');
 }
 
 /* inconsolata-800 - latin */
@@ -66,7 +66,7 @@
   font-weight: 800;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-800.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-800.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-800.woff') format('woff');
 }
 
 /* inconsolata-900 - latin */
@@ -76,5 +76,5 @@
   font-weight: 900;
   src: local(''),
     url('../public/fonts/inconsolata-v30-latin-900.woff2') format('woff2'),
-    url('../public/fonts/inconsolata-v30-latin-900.woff') format('woff'),
+    url('../public/fonts/inconsolata-v30-latin-900.woff') format('woff');
 }