+
diff --git a/client-solid/src/GlobalState.tsx b/client-solid/src/Context/GlobalState.tsx
similarity index 84%
rename from client-solid/src/GlobalState.tsx
rename to client-solid/src/Context/GlobalState.tsx
index b70596b..57b8e45 100644
--- a/client-solid/src/GlobalState.tsx
+++ b/client-solid/src/Context/GlobalState.tsx
@@ -47,7 +47,7 @@ export function GlobalStateProvider(props: {
return token() != "" && username() != "";
}
- function logIn (username: string, token: string): void {
+ function logIn(username: string, token: string): void {
setUsername(username);
setToken(token);
localStorage.setItem("token", token);
@@ -63,9 +63,19 @@ export function GlobalStateProvider(props: {
return (
<>
-
+
{props.children}
diff --git a/client-solid/src/Icons.tsx b/client-solid/src/Util/Icons.tsx
similarity index 100%
rename from client-solid/src/Icons.tsx
rename to client-solid/src/Util/Icons.tsx
diff --git a/client-solid/src/api.ts b/client-solid/src/Util/api.ts
similarity index 99%
rename from client-solid/src/api.ts
rename to client-solid/src/Util/api.ts
index 34aca91..03c759d 100644
--- a/client-solid/src/api.ts
+++ b/client-solid/src/Util/api.ts
@@ -72,4 +72,4 @@ export async function submitLogin(
});
if (response.ok) return await response.json();
-}
\ No newline at end of file
+}
diff --git a/client-solid/src/index.tsx b/client-solid/src/index.tsx
index 30109db..685ff03 100644
--- a/client-solid/src/index.tsx
+++ b/client-solid/src/index.tsx
@@ -1,7 +1,7 @@
import { Router } from "@solidjs/router";
import { render } from "solid-js/web";
-import Root from "./Root";
+import Root from "./Containers/Root";
import "./index.css";
const root = document.getElementById("root");
diff --git a/client-solid/tailwind.config.js b/client-solid/tailwind.config.js
index d6a7c8f..50332cf 100644
--- a/client-solid/tailwind.config.js
+++ b/client-solid/tailwind.config.js
@@ -1,32 +1,27 @@
/** @type {import('tailwindcss').Config} */
export default {
- content: [
- "./index.html",
- "./src/**/*.{js,ts,jsx,tsx}",
- ],
+ content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
daisyui: {
themes: [
{
mytheme: {
- "primary": "#64279e",
- "secondary": "#9454af",
- "accent": "#6ff7c5",
- "neutral": "#1f2329",
+ primary: "#64279e",
+ secondary: "#9454af",
+ accent: "#6ff7c5",
+ neutral: "#1f2329",
"base-100": "#2a3a47",
- "info": "#8b9be5",
- "success": "#79e2b4",
- "warning": "#efb261",
- "error": "#e1604c",
+ info: "#8b9be5",
+ success: "#79e2b4",
+ warning: "#efb261",
+ error: "#e1604c",
},
},
],
},
-
theme: {
extend: {},
},
// eslint-disable-next-line no-undef
plugins: [require("daisyui")],
-}
-
+};
diff --git a/client-solid/tsconfig.json b/client-solid/tsconfig.json
index fb72312..6a22ab0 100644
--- a/client-solid/tsconfig.json
+++ b/client-solid/tsconfig.json
@@ -3,11 +3,7 @@
"target": "ES2020",
"useDefineForClassFields": true,
"module": "ESNext",
- "lib": [
- "ES2020",
- "DOM",
- "DOM.Iterable"
- ],
+ "lib": ["ES2020", "DOM", "DOM.Iterable"],
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
@@ -23,12 +19,10 @@
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
- "include": [
- "src"
- ],
+ "include": ["src"],
"references": [
{
"path": "./tsconfig.node.json"
}
]
-}
\ No newline at end of file
+}
diff --git a/client-solid/vite.config.ts b/client-solid/vite.config.ts
index 5594547..97bbb49 100644
--- a/client-solid/vite.config.ts
+++ b/client-solid/vite.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
-import { qrcode } from 'vite-plugin-qrcode'
+import { defineConfig } from "vite";
+import { qrcode } from "vite-plugin-qrcode";
+import solid from "vite-plugin-solid";
// https://vitejs.dev/config/
export default defineConfig({
@@ -12,12 +12,12 @@ export default defineConfig({
port: 3000,
open: true,
proxy: {
- '/api': {
- target: 'http://localhost:8080/api',
+ "/api": {
+ target: "http://localhost:8080/api",
changeOrigin: true,
secure: false,
- rewrite: (path): string => path.replace(/^\/api/, '')
- }
- }
- }
-})
+ rewrite: (path): string => path.replace(/^\/api/, ""),
+ },
+ },
+ },
+});
diff --git a/justfile b/justfile
index 4ac4f73..20a3fa9 100644
--- a/justfile
+++ b/justfile
@@ -32,8 +32,7 @@ build-container-release:
podman build -t fb-server -f container/Containerfile .
# Builds a release container and runs it
-start-release: start-postgres-dev clean-podman init-sqlx build-container-release
- podman network create {{network}} --ignore
+start-release: start-postgres-dev clean-podman init-sqlx build-container-release create-network
podman run -d --network {{network}} -e {{env_string}} -p 8080:8080 --name frostbyte fb-server
# Initializes the database, runs migrations and then prepares sqlx
@@ -45,10 +44,14 @@ init-sqlx:
# Starts a postgres container for development
[private]
-start-postgres-dev:
+start-postgres-dev: create-network
podman rm -f {{pg_container}}
podman run --network {{network}} --name {{pg_container}} -e POSTGRES_PASSWORD={{pg_pass}} -d -p {{pg_port}}:5432 docker.io/postgres:16.1-alpine
+[private]
+create-network:
+ podman network create {{network}} --ignore
+
# Forcefully stops and removes the frostbyte container
[private]
clean-podman:
diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs
index c5e7f02..60cfc4f 100755
--- a/server/src/routes/users.rs
+++ b/server/src/routes/users.rs
@@ -84,13 +84,14 @@ pub struct CaptchaResponse {
}
/// Request a captcha from the captcha service
+#[allow(unreachable_code, unused_variables)]
#[post("/captcha")]
pub async fn captcha_request(cstate: Data) -> Result {
unimplemented!("Captcha is currently disabled");
return Ok(HttpResponse::InternalServerError().json("Error"));
// This might block the thread a bit too long
- // let (answer, svg) = get_captcha();
+ let (answer, svg) = get_captcha();
// let id = rand_core::OsRng.next_u32() as i32;
diff --git a/server/src/util/util.rs b/server/src/util/util.rs
index b50a703..62754a1 100644
--- a/server/src/util/util.rs
+++ b/server/src/util/util.rs
@@ -1,4 +1,4 @@
-use rand::{Rng, RngCore};
+use rand::Rng;
// This will do for now
pub fn hex_string(length: usize) -> String {
@@ -9,11 +9,9 @@ pub fn hex_string(length: usize) -> String {
}
mod tests {
- use super::*;
-
#[test]
fn test_random_hex_string() {
- let s = hex_string(16);
+ let s = super::hex_string(16);
assert_eq!(s.len(), 16);
}
}