Merge remote-tracking branch 'origin/nginx-initial-setup' into n9-api-gateway

Author: alvinlim277

nginx/README.md

@@ -0,0 +1,11 @@
+### So far local testing completed:
+
+1. Run frontend/backend services (front 3000, qn 9090, user 3001)
+2. copy nginx.conf into ur local install location
+3. start nginx
+4. go to localhost and should hopefully see the site
+
+### TODO:
+
+- dockerize nginx
+- change config to work with dockerised services

nginx/nginx.conf

@@ -0,0 +1,74 @@
+# current sorry state of my nginx.conf file
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    # for caching of cookie
+    proxy_cache_path cache/  keys_zone=auth_cache:1m;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        # frontend (i guess login page)
+        location / {
+            proxy_pass http://localhost:3000/; # frontend running on...similar for other services 
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $host;
+            proxy_cache_bypass $http_upgrade;    
+        }
+
+        # question
+        location /api/ {
+            proxy_pass http://localhost:9090/;  
+        }
+
+        # # user (pure conjecture, just referencing gaylord article)
+        # location /users/ {
+        #     auth_request auth;
+        #     auth_request_set $userid $upstream_http_x_auth_user;
+            
+        #     # if fail go back to landing
+        #     if ($http_accept ~* "text/html" ) {
+        #         error_page 401 403 =200 /;
+        #     }
+        #     proxy_set_header X-Auth-User $userid;
+        #     proxy_set_header Host $host;
+        #     proxy_set_header X-Forwarded-For $remote_addr;
+        #     proxy_pass http://localhost:3001/;  
+
+        # }
+
+        # location = auth {
+        #     internal;
+        #     # proxy_pass to authenticator service
+        #     proxy_set_header Content-Length "";
+        #     proxy_set_header X-Dbg $cookie_AUTH;
+
+        #     proxy_cache auth_cache;
+        #     proxy_cache_valid 200 204 1m;
+        #     proxy_cache_key "$http_authorization"; # jwt?
+        # }
+    }
+}

peerprep/.env.sample

@@ -0,0 +1,7 @@
+# THIS CANNOT BE RIGHT, TEMP FIX
+NEXT_PUBLIC_BASE_URL=http://localhost
+# location of question service
+NEXT_PUBLIC_QUESTION_SERVICE=api
+NEXT_PUBLIC_USER_SERVICE=users
+# dev flag, originally used when services were not up
+DEV_ENV=not

peerprep/components/questionpage/QuestionCard.tsx

@@ -16,7 +16,7 @@ const QuestionCard: React.FC<QuestionCardProps> = ({ question }) => {
   const handleDelete = async () => {
     if (
       confirm(
-        `Are you sure you want to delete ${question.title}? (ID: ${question.id}) `,
+        `Are you sure you want to delete ${question.title}? (ID: ${question.id}) `
       )
     ) {
       const status = await deleteQuestion(question.id);
@@ -58,7 +58,7 @@ const QuestionCard: React.FC<QuestionCardProps> = ({ question }) => {
           Difficulty:{" "}
           <span
             className={`capitalize font-bold ${getDifficultyColor(
-              question.difficulty,
+              question.difficulty
             )}`}
           >
             {Difficulty[question.difficulty]}
@@ -82,7 +82,9 @@ const QuestionCard: React.FC<QuestionCardProps> = ({ question }) => {
       </div>
 
       <div className={styles.buttonContainer}>
-        <PeerprepButton onClick={() => router.push(`questions/${question.id}`)}>
+        <PeerprepButton
+          onClick={() => router.push(`/questions/${question.id}`)}
+        >
           View
         </PeerprepButton>
         <PeerprepButton onClick={handleDelete}>Delete</PeerprepButton>