Timerix/paradox-save-parser-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bugs

Browse Source
This commit is contained in:
Altair-sh 2025-05-23 01:51:50 +05:00
parent 8e4ce66cc4
commit 8c270fc4ea
14 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

8
src/app/api/proxy/proxyFunctions.ts → src/app/api/proxy/functions.ts
View File

@ -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&foo=bar
const reqUrl = req.url // full URL e.g. http://localhost:3000/api/proxy?id=123
// 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://your-backend-server/extra/path?id=123'
// e.g. '/api/proxy/extra/path?id=123' -> 'http://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,

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

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

1
src/app/layout.tsx
View File

@ -1,6 +1,5 @@
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'

1
src/app/login/page.tsx
View File

@ -23,6 +23,7 @@ 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)

2
src/app/register/page.tsx
View File

@ -26,6 +26,7 @@ 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.')
@ -34,7 +35,6 @@ 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)

2
src/components/Navbar.tsx
View File

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

80
src/components/SaveFileUploadingDialog.tsx
View File

@ -1,6 +1,6 @@
'use client'
import { saveParserBackendService, UploadSaveResponse } from '@/services/SaveParserBackendService'
import { saveParserBackendService, SaveStatusResponse, UploadSaveResponse } from '@/services/SaveParserBackendService'
import { useState } from 'react'
import FormError from './FormError'
@ -13,8 +13,14 @@ 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])
@ -22,58 +28,78 @@ export default function SaveFileUploadingDialog() {
}
const handleUpload = async () => {
setError(null)
setUploadDisabled(true)
try {
if (!selectedFile) return
console.log('Uploading file:', selectedFile.name)
const result = await saveParserBackendService.uploadSave(game, selectedFile)
console.log('Got response:', result)
setUploadResult(result)
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)
} 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="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>
))}
<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}
</select>
</div>
<input type="file" className="form-control mb-3" onChange={handleFileChange} />
<button className="btn btn-primary" onClick={handleUpload} disabled={!selectedFile}>
<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}>
Upload File
</button>
{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>
)}
</div>
)
}

1
src/config/.gitignore vendored
View File

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

0
src/config/defaultConfig.ts → src/config/AppConfig.ts
View File

5
src/instrumentation.ts Normal file
View File

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

4
src/lib/configLoader.ts
View File

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

11
src/lib/customConsoleLog.ts
View File

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

4
src/services/SaveParserBackendService.ts
View File

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