From ba096629225ee461b90ed470e869e1f3b8850342 Mon Sep 17 00:00:00 2001
From: Eduard Tamsa <eduard.ioan.tamsa@gmail.com>
Date: Mon, 6 Nov 2023 03:30:44 +0200
Subject: [PATCH] Test new config

---
 helm/service/templates/sammwise.yaml |  7 +--
 helm/service/values.yaml             |  3 +-
 index.js                             | 40 -----------------
 next.config.js                       | 64 +++++++++++++++++++++++++---
 package.json                         |  2 +-
 5 files changed, 63 insertions(+), 53 deletions(-)
 delete mode 100644 index.js

diff --git a/helm/service/templates/sammwise.yaml b/helm/service/templates/sammwise.yaml
index a9211f7..540e4d4 100644
--- a/helm/service/templates/sammwise.yaml
+++ b/helm/service/templates/sammwise.yaml
@@ -17,11 +17,8 @@ spec:
           image: {{ .Values.sammwise.image | quote }}
           # {{- if .Values.sammwise.NEXT_PUBLIC_BASE_PATH }}
           env:
-            # - name: NEXT_PUBLIC_BASE_PATH
-            #   value: {{ .Values.sammwise.NEXT_PUBLIC_BASE_PATH | quote }}
-            - name: RANCHER_SERVER
-              value: {{ .Values.sammwise.RANCHER_SERVER | quote }}
-
+            - name: NEXT_PUBLIC_BASE_PATH
+              value: {{ .Values.sammwise.NEXT_PUBLIC_BASE_PATH | quote }}
           # {{- end }}
 ---
 apiVersion: v1
diff --git a/helm/service/values.yaml b/helm/service/values.yaml
index b8b13a0..7211a59 100644
--- a/helm/service/values.yaml
+++ b/helm/service/values.yaml
@@ -5,8 +5,7 @@ ingressHost: https://kubernetes.default.svc
 sammwise:
   image: sjultra/sammwise:latest
   # port: 80
-  # NEXT_PUBLIC_BASE_PATH: "rancher.vzxy.net/k8s/clusters/c-m-26nk9h9f/api/v1/namespaces/sammwise/services/http:sammwise:80/proxy"
-  RANCHER_SERVER: "rancher.vzxy.net/k8s/clusters/c-m-26nk9h9f/api/v1/namespaces/sammwise/services/http:sammwise:80/proxy"
+  NEXT_PUBLIC_BASE_PATH: "/k8s/clusters/c-m-26nk9h9f/api/v1/namespaces/sammwise/services/http:sammwise:80/proxy"
 
 # issuer:
 #   issuerEmail: ops@sjultra.com
diff --git a/index.js b/index.js
deleted file mode 100644
index dc681bb..0000000
--- a/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const { createServer } = require('http')
-const { parse } = require('url')
-const next = require('next')
- 
-const dev = process.env.NODE_ENV !== 'production'
-const hostname = process.env.RANCHER_SERVER ||'localhost'
-const port = 3000
-// when using middleware `hostname` and `port` must be provided below
-const app = next({ dev, hostname, port })
-const handle = app.getRequestHandler()
- 
-app.prepare().then(() => {
-  createServer(async (req, res) => {
-    try {
-      // Be sure to pass `true` as the second argument to `url.parse`.
-      // This tells it to parse the query portion of the URL.
-      const parsedUrl = parse(req.url, true)
-      const { pathname, query } = parsedUrl
- 
-      if (pathname === '/a') {
-        await app.render(req, res, '/a', query)
-      } else if (pathname === '/b') {
-        await app.render(req, res, '/b', query)
-      } else {
-        await handle(req, res, parsedUrl)
-      }
-    } catch (err) {
-      console.error('Error occurred handling', req.url, err)
-      res.statusCode = 500
-      res.end('internal server error')
-    }
-  })
-    .once('error', (err) => {
-      console.error(err)
-      process.exit(1)
-    })
-    .listen(port, () => {
-      console.log(`> Ready on http://${hostname}:${port}`)
-    })
-})
\ No newline at end of file
diff --git a/next.config.js b/next.config.js
index 16a0ede..9344a57 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,13 +1,67 @@
 module.exports = {
   basePath: process.env.NEXT_BASE_PATH || '',
+  assetPrefix: process.env.NEXT_BASE_PATH || '',
+
   // assetPrefix: process.env.RANCHER_SERVER || '',
-  hostname: process.env.RANCHER_SERVER,
+  // hostname: process.env.RANCHER_SERVER,
   // images: {
   //   path: process.env.NEXT_PUBLIC_BASE_PATH || '',
   // },
 
-  publicRuntimeConfig: {
-    hmrEndpoint: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
-    webSocketBasePath: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
+  // publicRuntimeConfig: {
+  //   hmrEndpoint: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
+  //   webSocketBasePath: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
+  // }
+
+
+  async rewrites() {
+    return [
+      {
+        source: '/',
+        destination: process.env.NEXT_BASE_PATH // Proxy to Backend
+      },
+      {
+        has: [
+          {
+            type: 'host',
+            value: 'rancher.vzxy.net',
+          },
+        ],
+        source: '/',
+        destination: process.env.NEXT_BASE_PATH // Proxy to Backend
+      },
+      {
+        has: [
+          {
+            type: 'host',
+            value: 'rancher.vzxy.net',
+          },
+        ],
+        source: '/about',
+        destination: process.env.NEXT_BASE_PATH + '/about' // Proxy to Backend
+      },
+      {
+        has: [
+          {
+            type: 'host',
+            value: 'rancher.vzxy.net',
+          },
+        ],
+        source: '/assessment',
+        destination: process.env.NEXT_BASE_PATH + '/assessment' // Proxy to Backend
+      },
+      {
+        has: [
+          {
+            type: 'host',
+            value: 'rancher.vzxy.net',
+          },
+        ],
+        source: '/results',
+        destination: process.env.NEXT_BASE_PATH + '/results' // Proxy to Backend
+      }
+    ]
   }
-};
+}
+
+
diff --git a/package.json b/package.json
index 00cbefa..b4eed3b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "node index.js",
+    "dev": "next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"