.gitignore

@@ -32,7 +32,6 @@ yarn-error.log*
 
 # env files (can opt-in for committing if needed)
 .env*
-/runtimeConfig.json
 
 # vercel
 .vercel

src/app/api/proxy/proxyFunctions.ts

@@ -8,7 +8,7 @@ export async function redirectRequest(
     proxyUrl: string,
     backendBaseUrl: string
 ): Promise<NextResponse> {
-    const reqUrl = req.url // full URL e.g. http://localhost:3000/api/proxy?id=123
+    const reqUrl = req.url // full URL e.g. http://localhost:3000/api/proxy?id=123&foo=bar
 
     // Find position of proxyPath in reqUrl
     const proxyIndex = reqUrl.indexOf(proxyUrl)
@@ -17,9 +17,9 @@ export async function redirectRequest(
     }
 
     // Replace '/api/proxy/parserBackend' with backend URL, preserve everything after
-    // e.g. '/api/proxy/extra/path?id=123' -> 'http://backend-server/extra/path?id=123'
+    // e.g. '/api/proxy/extra/path?id=123' -> 'http://your-backend-server/extra/path?id=123'
     const backendUrl = backendBaseUrl + reqUrl.substring(proxyIndex + proxyUrl.length)
-    // console.log('redirecting', req.url, 'to', backendUrl)
+    console.log('redirecting', req.url, 'to', backendUrl)
 
     const backendRes = await fetch(backendUrl, {
         method: req.method,
@@ -41,7 +41,7 @@ export async function redirectRequest(
 /// Browsers send OPTIONS request sometimes to check webserver allowed headers and methods.
 /// My backend doesn't support such requests so use proxy to answer to it that all headers and methods are allowed
 export async function responseToOPTIONS(req: NextRequest): Promise<NextResponse> {
-    // console.log('proxy responding to CORS OPTIONS', req.url)
+    console.log('proxy responding to CORS OPTIONS', req.url)
 
     return new NextResponse(null, {
         status: 200,

src/app/api/proxy/saveParserBackend/[[...path]]/route.ts

@@ -1,8 +1,8 @@
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
-import { redirectRequest, responseToOPTIONS as respondToOPTIONS } from '@/app/api/proxy/functions'
-import { PROXY_PATHS } from '@/app/api/proxy/paths'
-import { appConfig } from '@/lib/configLoader'
+import { redirectRequest, responseToOPTIONS as respondToOPTIONS } from '@/app/api/proxy/proxyFunctions'
+import { appConfig } from '@/app/lib/configLoader'
+import { PROXY_PATHS } from '../../paths'
 
 async function redirect(req: NextRequest): Promise<NextResponse> {
     return await redirectRequest(req, PROXY_PATHS.saveParserBackend, appConfig.services.saveParserBackend.url)

src/app/browse/page.tsx

@@ -5,8 +5,6 @@ import { AllCommunityModule, themeQuartz } from 'ag-grid-community'
 import { useState, useEffect } from 'react'
 import { colorSchemeDark } from 'ag-grid-community'
 
-// TODO: create tabs with general info, tables, plots
-
 export default function BrowsePage() {
     const [agTheme, setAgTheme] = useState(themeQuartz)
 

src/app/layout.tsx

@@ -1,5 +1,6 @@
 import 'bootstrap/dist/css/bootstrap.min.css'
 import './globals.css'
+import '@/app/lib/customConsoleLog'
 import type { Metadata } from 'next'
 import { ModuleRegistry, AllCommunityModule } from 'ag-grid-community'
 import Navbar from '@/components/Navbar'

src/app/login/page.tsx

@@ -23,7 +23,6 @@ export default function LoginPage() {
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault()
-        setError(null)
         try {
             console.log('Log in:', formData)
             const result = await authService.login(formData.email, formData.password)

src/app/register/page.tsx

@@ -26,7 +26,6 @@ export default function RegisterPage() {
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault()
-        setError(null)
         try {
             if (formData.password !== formData.confirmPassword) {
                 throw new Error('Passwords do not match.')
@@ -35,6 +34,7 @@ export default function RegisterPage() {
             console.log('Register', formData)
             const result = await authService.register(formData.name, formData.email, formData.password)
             console.log('Registered:', result)
+
             router.push('/login') // Redirect after success
         } catch (err: any) {
             console.error(err.message)

src/components/Navbar.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import Link from 'next/link'
-import { font_Hack } from '@/lib/myFonts'
+import { font_Hack } from '@/app/lib/myFonts'
 
 export default function Navbar() {
     return (

src/components/SaveFileUploadingDialog.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { saveParserBackendService, SaveStatusResponse, UploadSaveResponse } from '@/services/SaveParserBackendService'
+import { saveParserBackendService, UploadSaveResponse } from '@/services/SaveParserBackendService'
 import { useState } from 'react'
 import FormError from './FormError'
 
@@ -13,14 +13,8 @@ export default function SaveFileUploadingDialog() {
     const [error, setError] = useState<string | null>(null)
     const [selectedFile, setSelectedFile] = useState<File | null>(null)
     const [game, setGame] = useState<GameEnum>(GameEnum.EU4)
-    const [uploadDisabled, setUploadDisabled] = useState(false)
-    const [saveStatus, setSaveStatus] = useState<SaveStatusResponse | null>(null)
     const [uploadResult, setUploadResult] = useState<UploadSaveResponse | null>(null)
 
-    const handleGameSelect = (e: React.ChangeEvent<HTMLSelectElement>) => {
-        setGame(e.target.value as GameEnum)
-    }
-
     const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         if (e.target.files && e.target.files[0]) {
             setSelectedFile(e.target.files[0])
@@ -28,82 +22,58 @@ export default function SaveFileUploadingDialog() {
     }
 
     const handleUpload = async () => {
-        setError(null)
-        setUploadDisabled(true)
         try {
             if (!selectedFile) return
 
             console.log('Uploading file:', selectedFile.name)
-            const uploadResponse = await saveParserBackendService.uploadSave(game, selectedFile)
-            console.log('Upload response:', uploadResponse)
-            setUploadResult(uploadResponse)
-
-            const pollInterval = 1000 // ms
-            const intervalId = setInterval(async () => {
-                try {
-                    const statusResponse = await saveParserBackendService.getSaveStatus(uploadResponse.id)
-                    console.log('Save status:', statusResponse.status)
-                    setSaveStatus(statusResponse)
-                    if (statusResponse.status.toLowerCase() === 'done') {
-                        clearInterval(intervalId)
-                        setUploadDisabled(false)
-                    }
-                } catch (err: any) {
-                    console.error('Error while polling status:', err)
-                    clearInterval(intervalId)
-                    setError(err.message)
-                    setUploadDisabled(false)
-                }
-            }, pollInterval)
+            const result = await saveParserBackendService.uploadSave(game, selectedFile)
+            console.log('Got response:', result)
+            setUploadResult(result)
         } catch (err: any) {
             console.error(err.message)
             setError(err.message)
-            setUploadDisabled(false)
         }
     }
 
-    const gameEnumOptions = Object.values(GameEnum).map((value) => (
-        <option key={value} value={value}>
-            {value}
-        </option>
-    ))
-
     return (
         <div className="container mt-5" style={{ maxWidth: '500px' }}>
             <h3 className="mb-2 fw-semibold">Select game save file</h3>
             <FormError message={error} />
 
-            <div className="row align-items-center mb-3">
-                <div className="col-auto">Select Game</div>
-                <select id="gameSelect" className="col-auto" value={game} onChange={handleGameSelect}>
-                    {gameEnumOptions}
+            <div className="mb-3">
+                <label htmlFor="gameSelect" className="form-label">
+                    Select Game
+                </label>
+                <select
+                    id="gameSelect"
+                    className="form-select"
+                    value={game}
+                    onChange={(e) => setGame(e.target.value as GameEnum)}
+                >
+                    {Object.values(GameEnum).map((value) => (
+                        <option key={value} value={value}>
+                            {value}
+                        </option>
+                    ))}
                 </select>
             </div>
 
-            <div className="row align-items-center mb-3">
-                <div className="col-auto">File</div>
-                <input id="fileInput" type="file" className="col-auto" onChange={handleFileChange} />
-            </div>
-
-            <button className="btn btn-primary" onClick={handleUpload} disabled={!selectedFile || uploadDisabled}>
+            <input type="file" className="form-control mb-3" onChange={handleFileChange} />
+            <button className="btn btn-primary" onClick={handleUpload} disabled={!selectedFile}>
                 Upload File
             </button>
 
-            {/* TODO: extract this to a component 
-                <ConditionalView cond={uploadResult}> <LabeledValue val={}/> </ConditionalView> */}
+            {selectedFile && (
+                <div className="mt-3">
+                    File: <strong>{selectedFile.name}</strong>
+                </div>
+            )}
+
             {uploadResult && (
                 <div className="mt-3">
                     Save Id: <strong>{uploadResult.id}</strong>
                 </div>
             )}
-
-            {saveStatus && (
-                <div className="mt-3">
-                    Status: <strong>{saveStatus.status}</strong>
-                </div>
-            )}
-
-            {/* add link to <ConditionalView cond={done}> /browse?id=${saveStatus.id} */}
         </div>
     )
 }

src/config/.gitignore

@@ -0,0 +1 @@
+/runtimeConfig.json

src/config/defaultConfig.ts

@@ -4,7 +4,6 @@ export const defaultConfig = {
         saveParserBackend: {
             url: 'http://127.0.0.1:5226',
         },
-        // TODO: implement auth api
         auth: {},
     },
 }

src/instrumentation.ts

@@ -1,5 +0,0 @@
-import '@/lib/customConsoleLog'
-
-export function register() {
-    console.log('hello from instrumentation.ts!')
-}

src/lib/configLoader.ts

@@ -1,9 +1,9 @@
 'server'
 import fs from 'fs'
 import path from 'path'
-import { AppConfig, defaultConfig } from '@/config/AppConfig'
+import { AppConfig, defaultConfig } from '@/config/defaultConfig'
 
-const configFilePath = path.join(process.cwd(), 'runtimeConfig.json')
+const configFilePath = path.join(process.cwd(), 'config', 'runtimeConfig.json')
 
 function loadConfig(): AppConfig {
     let config = defaultConfig

src/lib/customConsoleLog.ts

@@ -1,13 +1,8 @@
-let _custom_console_log_injected = false
-if (!_custom_console_log_injected) {
-    _custom_console_log_injected = true
+'server'
 const originalLog = console.log
 
-    function customLog(message?: any, ...optionalParams: any[]) {
+console.log = (message?: any, ...optionalParams: any[]) => {
     const now = new Date()
     const timestamp = now.toTimeString().split(' ')[0] // hh:mm:ss
-        originalLog(`[${timestamp}] ${message}`, ...optionalParams, ':3')
-    }
-
-    console.log = customLog
+    originalLog(`[${timestamp}] ${message}`, ...optionalParams)
 }

src/services/SaveParserBackendService.ts

@@ -1,5 +1,3 @@
-import { PROXY_PATHS } from '@/app/api/proxy/paths'
-
 export interface UploadSaveResponse {
     id: string
 }
@@ -12,7 +10,7 @@ export interface SaveStatusResponse {
 }
 
 export class SaveParserBackendService {
-    private API_BASE = PROXY_PATHS.saveParserBackend
+    private API_BASE = '/api/proxy/parserBackend'
 
     private async tryGetResponseJson(res: Response): Promise<string> {
         try {