lukas/server-admin-panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first commit to move to svelte

Browse Source
This commit is contained in:
Lukas Forsberg 2025-11-21 16:47:50 +01:00
parent d1c95d2b8b
commit e4289ee1ac
31 changed files with 2155 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,3 +9,7 @@ pkg
!.idea/runConfigurations/
!.idea/inspectionProfiles/
*.iml
.cache/
compile_commands.json
*.db

2
.vscode/launch.json vendored
View File

@ -3,7 +3,7 @@
"configurations": [
{
"name": "Debug Server Admin Panel",
"type": "cppdbg",
"type": "lldb",
"request": "launch",
"program": "${workspaceFolder}/build/lf-server-admin-panel",
"args": [],

3
.vscode/settings.json vendored
View File

@ -99,5 +99,6 @@
"typeinfo": "cpp",
"valarray": "cpp",
"variant": "cpp"
}
},
"C_Cpp.errorSquiggles": "disabled"
}

20
README.md
View File

@ -15,6 +15,19 @@ run : F5 or Run → Start Debugging
cmake -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
```
## Svelte
Inside the fronend directory
### Install
```
npm install -D @sveltejs/adapter-static
```
### Build
```
npm run build
```
## Make Package
1. tar the source files to make it cleaner
@ -27,3 +40,10 @@ tar czf pkg/lf-server-admin-panel-0.1.1.tar.gz src/ static/ templates/ lf-server
```
makepkg -f
```
## Database
### Attributes
| Character Id | Attribute | Value |
###

23
frontend/.gitignore vendored Normal file
View File

@ -0,0 +1,23 @@
node_modules
# Output
.output
.vercel
.netlify
.wrangler
/.svelte-kit
/build
# OS
.DS_Store
Thumbs.db
# Env
.env
.env.*
!.env.example
!.env.test
# Vite
vite.config.js.timestamp-*
vite.config.ts.timestamp-*

1
frontend/.npmrc Normal file
View File

@ -0,0 +1 @@
engine-strict=true

38
frontend/README.md Normal file
View File

@ -0,0 +1,38 @@
# sv
Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
## Creating a project
If you're seeing this, you've probably already done this step. Congrats!
```sh
# create a new project in the current directory
npx sv create
# create a new project in my-app
npx sv create my-app
```
## Developing
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
```sh
npm run dev
# or start the server and open the app in a new browser tab
npm run dev -- --open
```
## Building
To create a production version of your app:
```sh
npm run build
```
You can preview the production build with `npm run preview`.
> To deploy your app, you may need to install an [adapter](https://svelte.dev/docs/kit/adapters) for your target environment.

1587
frontend/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
frontend/package.json Normal file
View File

@ -0,0 +1,24 @@
{
"name": "frontend",
"private": true,
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"prepare": "svelte-kit sync || echo ''",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"@sveltejs/adapter-auto": "^7.0.0",
"@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.47.1",
"@sveltejs/vite-plugin-svelte": "^6.2.1",
"svelte": "^5.41.0",
"svelte-check": "^4.3.3",
"typescript": "^5.9.3",
"vite": "^7.1.10"
}
}

13
frontend/src/app.d.ts vendored Normal file
View File

@ -0,0 +1,13 @@
// See https://svelte.dev/docs/kit/types#app.d.ts
// for information about these interfaces
declare global {
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface PageState {}
// interface Platform {}
}
}
export {};

11
frontend/src/app.html Normal file
View File

@ -0,0 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>

99
frontend/src/lib/ShadowrunCharacter.svelte Normal file
View File

@ -0,0 +1,99 @@
<script lang="ts">
import { API_BASE } from '$lib/config';
export let currentCharacter: any;
// Use character data if provided
let characterInfo = currentCharacter?.characterInfo || {
//{ name: "Name", value: "", type: ""},
Metatype : "",
Age : 30,
Sex : "Man",
Nuyen: 0,
Lifestyle: "",
"Total Karma": 0,
"C. Karma": 0,
"Street Cred": 0,
Notoriety : 0,
Fame : 0
};
const characterInfoTypes = {
Metatype: "text",
Age: "number",
Sex: "text",
Nuyen: "number",
Lifestyle: "text",
"Total Karma": "number",
"C. Karma": "number",
"Street Cred": "number",
Notoriety: "number",
Fame: "number"
};
// Use character data if provided
let attributes = currentCharacter?.attributes || [
{ name: 'Body', value: 1 },
{ name: 'Agility', value: 1 },
{ name: 'Reaction', value: 1 },
{ name: 'Strength', value: 1 },
{ name: 'Charisma', value: 1 },
{ name: 'Intuition', value: 1 },
{ name: 'Logic', value: 1 },
{ name: 'Willpower', value: 1 },
{ name: 'Edge', value: 1 },
{ name: 'Essence', value: 0 },
{ name: 'Initiative', value: 0}
];
let skills = currentCharacter?.skills || [
{ name: 'Pistols', rating: 0, linked: 'Agility' },
{ name: 'Perception', rating: 0, linked: 'Intuition' },
{ name: 'Unarmed Combat', rating: 0, linked: 'Agility' }
];
async function saveCharacterData() {
const res = await fetch(`${API_BASE}/api/shadowrun/characters_data`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ characterInfo })
});
}
// Inventory
let inventory = currentCharacter?.inventory || [];
</script>
<h2>Character Info</h2>
{#each Object.entries(characterInfo) as [key, value], i}
<div class="input-row">
<label for={"field-" + i}>{key}</label>
<input
id={"field-" + i}
type={characterInfoTypes[key]}
bind:value={value}
min={characterInfoTypes[key] === "number" ? 0 : null} />
</div>
{/each}
<h2>Attributes</h2>
{#each attributes as field, i}
<label>
{field.name}:
<input type="number" min="1" bind:value={field.value} />
</label>
{/each}
<h2>Skills</h2>
{#each skills as skill, i}
<div>
<input placeholder="Skill Name" bind:value={skill.name} />
<input type="number" min="0" bind:value={skill.rating} />
<select bind:value={skill.linked}>
{#each Object.keys(attributes) as attr}
<option value={attr}>{attr}</option>
{/each}
</select>
<span>Dice Pool: {skill.rating + attributes[skill.linked]}</span>
</div>
{/each}

1
frontend/src/lib/assets/favicon.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="107" height="128" viewBox="0 0 107 128"><title>svelte-logo</title><path d="M94.157 22.819c-10.4-14.885-30.94-19.297-45.792-9.835L22.282 29.608A29.92 29.92 0 0 0 8.764 49.65a31.5 31.5 0 0 0 3.108 20.231 30 30 0 0 0-4.477 11.183 31.9 31.9 0 0 0 5.448 24.116c10.402 14.887 30.942 19.297 45.791 9.835l26.083-16.624A29.92 29.92 0 0 0 98.235 78.35a31.53 31.53 0 0 0-3.105-20.232 30 30 0 0 0 4.474-11.182 31.88 31.88 0 0 0-5.447-24.116" style="fill:#ff3e00"/><path d="M45.817 106.582a20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.503 18 18 0 0 1 .624-2.435l.49-1.498 1.337.981a33.6 33.6 0 0 0 10.203 5.098l.97.294-.09.968a5.85 5.85 0 0 0 1.052 3.878 6.24 6.24 0 0 0 6.695 2.485 5.8 5.8 0 0 0 1.603-.704L69.27 76.28a5.43 5.43 0 0 0 2.45-3.631 5.8 5.8 0 0 0-.987-4.371 6.24 6.24 0 0 0-6.698-2.487 5.7 5.7 0 0 0-1.6.704l-9.953 6.345a19 19 0 0 1-5.296 2.326 20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.502 17.99 17.99 0 0 1 8.13-12.052l26.081-16.623a19 19 0 0 1 5.3-2.329 20.72 20.72 0 0 1 22.237 8.243 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-.624 2.435l-.49 1.498-1.337-.98a33.6 33.6 0 0 0-10.203-5.1l-.97-.294.09-.968a5.86 5.86 0 0 0-1.052-3.878 6.24 6.24 0 0 0-6.696-2.485 5.8 5.8 0 0 0-1.602.704L37.73 51.72a5.42 5.42 0 0 0-2.449 3.63 5.79 5.79 0 0 0 .986 4.372 6.24 6.24 0 0 0 6.698 2.486 5.8 5.8 0 0 0 1.602-.704l9.952-6.342a19 19 0 0 1 5.295-2.328 20.72 20.72 0 0 1 22.237 8.242 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-8.13 12.053l-26.081 16.622a19 19 0 0 1-5.3 2.328" style="fill:#fff"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
frontend/src/lib/config.ts Normal file
View File

@ -0,0 +1 @@
export const API_BASE = "http://127.0.0.1:3010";

1
frontend/src/lib/index.ts Normal file
View File

@ -0,0 +1 @@
// place files you want to import through the `$lib` alias in this folder.

2
frontend/src/routes/+layout.js Normal file
View File

@ -0,0 +1,2 @@
export const ssr = false;
export const prerender = true;

12
frontend/src/routes/+layout.svelte Normal file
View File

@ -0,0 +1,12 @@
<script lang="ts">
import favicon from '$lib/assets/favicon.svg';
let { children } = $props();
</script>
<svelte:head>
<link rel="icon" href={favicon} />
</svelte:head>
{@render children()}

2
frontend/src/routes/+page.svelte Normal file
View File

@ -0,0 +1,2 @@
<h1>Welcome to SvelteKit</h1>
<p>Visit <a href="https://svelte.dev/docs/kit">svelte.dev/docs/kit</a> to read the documentation</p>

80
frontend/src/routes/shadowrun/+page.svelte Normal file
View File

@ -0,0 +1,80 @@
<script lang="ts">
import { onMount } from 'svelte';
import { API_BASE } from '$lib/config';
import CharacterSheet from '$lib/ShadowrunCharacter.svelte';
type Character = {
id: number;
name: string;
};
let characters: Character[] = [];
let selectedCharId: number | null = null;
let creatingNew = false;
let newCharName = '';
// Load previous characters from your Crow backend
async function loadCharacters() {
const res = await fetch(`${API_BASE}/api/shadowrun/characters`);
if (res.ok)
characters = await res.json();
}
onMount(loadCharacters);
async function loadCharacter() {
if (selectedCharId == null)
return;
const res = await fetch(`${API_BASE}/api/shadowrun/characters/${selectedCharId}`);
if (res.ok) {
const data = await res.json();
currentCharacter = data;
creatingNew = false;
}
}
async function createCharacter() {
if (!newCharName)
return;
const res = await fetch(`${API_BASE}/api/shadowrun/characters`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ name: newCharName })
});
if (res.ok) {
const data = await res.json();
currentCharacter = data;
creatingNew = false;
characters.push(data);
}
}
let currentCharacter: any = null;
</script>
{#if !currentCharacter}
<h1>Shadowrun Character Manager</h1>
<div style="margin-bottom: 2rem;">
<h2>Load Existing Character</h2>
{#if characters.length === 0}
<p>No characters found.</p>
{:else}
<select bind:value={selectedCharId}>
<option value={null} disabled selected>Select character</option>
{#each characters as c}
<option value={c.id}>{c.name}</option>
{/each}
</select>
<button on:click={loadCharacter} disabled={selectedCharId === null}>Load</button>
{/if}
</div>
<div>
<h2>Create New Character</h2>
<input type="text" placeholder="Character Name" bind:value={newCharName} />
<button on:click={createCharacter}>Create</button>
</div>
{:else}
<CharacterSheet {currentCharacter} />
{/if}

3
frontend/static/robots.txt Normal file
View File

@ -0,0 +1,3 @@
# allow crawling everything by default
User-agent: *
Disallow:

8
frontend/svelte.config.js Normal file
View File

@ -0,0 +1,8 @@
import adapter from '@sveltejs/adapter-static';
export default {
kit: {
adapter: adapter(),
paths: { base: '', assets: '' }
}
};

20
frontend/tsconfig.json Normal file
View File

@ -0,0 +1,20 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowImportingTsExtensions": true,
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
}
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
//
// To make changes to top-level options such as include and exclude, we recommend extending
// the generated config; see https://svelte.dev/docs/kit/configuration#typescript
}

6
frontend/vite.config.ts Normal file
View File

@ -0,0 +1,6 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';
export default defineConfig({
plugins: [sveltekit()]
});

8
src/database/database.cpp
View File

@ -12,14 +12,6 @@ Database::~Database() {
sqlite3_close(m_db);
}
string Database::currentTime(){
auto now = std::chrono::system_clock::now();
std::time_t t = std::chrono::system_clock::to_time_t(now);
std::stringstream ss;
ss << std::put_time(std::gmtime(&t), "%Y-%m-%d %H:%M:%S");
return ss.str();
}
sqlite3_stmt* Database::prepareStmt(const string& sql){
sqlite3_stmt* stmt = nullptr;
if (sqlite3_prepare_v2(m_db, sql.c_str(), -1, &stmt, nullptr) != SQLITE_OK) {

21
src/database/database.hpp
View File

@ -30,8 +30,6 @@ public:
std::set<std::string> getStrSet(const std::string& sql);
static std::string currentTime();
template <typename T>
std::optional<T> getSqlData(sqlite3_stmt* stmt, int i)
{
@ -85,21 +83,22 @@ private:
inline auto make_database() {
return sqlite_orm::make_storage(Database::dbFile,
auto storage = sqlite_orm::make_storage(Database::dbFile,
sqlite_orm::make_table("shadowrun_characters",
sqlite_orm::make_column("id", &shadowrun::ShadowrunCharacter::id, sqlite_orm::primary_key()),
sqlite_orm::make_column("name", &shadowrun::ShadowrunCharacter::name, sqlite_orm::not_null()),
sqlite_orm::make_column("created_at", &shadowrun::ShadowrunCharacter::created_at, sqlite_orm::default_value("CURRENT_TIMESTAMP"))
),
sqlite_orm::make_table("shadowrun_data",
sqlite_orm::make_column("id", &shadowrun::ShadowrunData::id, sqlite_orm::primary_key()),
sqlite_orm::make_column("character_id", &shadowrun::ShadowrunData::character_id, sqlite_orm::not_null()),
sqlite_orm::make_column("name", &shadowrun::ShadowrunData::name, sqlite_orm::not_null()),
sqlite_orm::make_column("value", &shadowrun::ShadowrunData::value),
sqlite_orm::make_column("created_at", &shadowrun::ShadowrunData::created_at, sqlite_orm::default_value("CURRENT_TIMESTAMP")),
sqlite_orm::make_column("updated_at", &shadowrun::ShadowrunData::updated_at, sqlite_orm::default_value("CURRENT_TIMESTAMP")),
sqlite_orm::foreign_key(&shadowrun::ShadowrunData::character_id).references(&shadowrun::ShadowrunCharacter::id).on_delete.cascade()
sqlite_orm::make_table("shadowrun_characters_data",
sqlite_orm::make_column("id", &shadowrun::ShadowrunCharacterData::id, sqlite_orm::primary_key()),
sqlite_orm::make_column("character_id", &shadowrun::ShadowrunCharacterData::character_id, sqlite_orm::not_null()),
sqlite_orm::make_column("type", &shadowrun::ShadowrunCharacterData::type, sqlite_orm::not_null()),
sqlite_orm::make_column("json", &shadowrun::ShadowrunCharacterData::json),
sqlite_orm::make_column("created_at", &shadowrun::ShadowrunCharacterData::created_at, sqlite_orm::default_value("CURRENT_TIMESTAMP")),
sqlite_orm::make_column("updated_at", &shadowrun::ShadowrunCharacterData::updated_at, sqlite_orm::default_value("CURRENT_TIMESTAMP")),
sqlite_orm::foreign_key(&shadowrun::ShadowrunCharacterData::character_id).references(&shadowrun::ShadowrunCharacter::id).on_delete.cascade()
));
return storage;
}
#endif // __DATABASE_H__

61
src/main.cpp
View File

@ -10,9 +10,33 @@
using namespace std;
std::string read_file(const std::string& path) {
std::ifstream file(path, std::ios::binary);
if (!file) {
throw std::runtime_error("Cannot open file: " + path);
}
std::ostringstream ss;
ss << file.rdbuf();
return ss.str();
}
// Simple MIME type detection
std::string get_mime_type(const std::string& path) {
if (path.ends_with(".html")) return "text/html";
if (path.ends_with(".js")) return "text/javascript";
if (path.ends_with(".css")) return "text/css";
if (path.ends_with(".json")) return "application/json";
if (path.ends_with(".svg")) return "image/svg+xml";
if (path.ends_with(".png")) return "image/png";
if (path.ends_with(".jpg") || path.ends_with(".jpeg")) return "image/jpeg";
if (path.ends_with(".woff")) return "font/woff";
if (path.ends_with(".woff2")) return "font/woff2";
return "application/octet-stream";
}
int main() {
crow::SimpleApp app;
/*
CROW_ROUTE(app, "/")([] {
auto data = utils::loadFile("templates/index.html");
if (data.empty())
@ -79,6 +103,14 @@ int main() {
}
return crow::response{row.htmx()};
}));
*/
const filesystem::path build_dir = "frontend/build/"; // <-- set your build folder
// Root route
CROW_ROUTE(app, "/")([&]() {
auto data = read_file(build_dir / "index.html");
return crow::response(200, "text/html", data);
});
const uint16_t defaultPort = 3010;
uint16_t httpPort = defaultPort;
@ -103,11 +135,34 @@ int main() {
}
shadowrun::initApi(app);
if(!login::initLogin(app))
// Catch-all route for static files and SPA fallback
CROW_ROUTE(app, "/<path>")
([&](const std::string& p) {
filesystem::path file_path = build_dir / p;
// If path is a directory, serve index.html inside it
if (filesystem::is_directory(file_path))
file_path /= "index.html";
// If file exists, serve it
if (filesystem::exists(file_path)) {
auto data = read_file(file_path);
auto mime = get_mime_type(file_path.string());
return crow::response(200, mime.c_str(), data);
}
// SPA fallback: serve root index.html for unknown routes
filesystem::path fallback = build_dir / "index.html";
auto data = read_file(fallback);
return crow::response(404, "text/html", data);
});
/* if(!login::initLogin(app))
{
CROW_LOG_ERROR << "Failed to init Login API";
}
*/
app.loglevel(crow::LogLevel::INFO);
app.port(httpPort).multithreaded().run();
}

40
src/shadowrun/ShadowrunApi.cpp
View File

@ -25,7 +25,6 @@ static std::unordered_map<std::string, std::string> parse_query_string(const std
params[key] = value; // You may want to URL-decode here
}
}
return params;
}
@ -37,6 +36,7 @@ static crow::response rsp(const std::string& msg){
void initApi(crow::SimpleApp& app)
{
/*
CROW_ROUTE(app, "/api/shadowrun/submit-character").methods("POST"_method)
(login::login_required([](const crow::request& req) {
auto params = parse_query_string(req.body);
@ -88,7 +88,7 @@ void initApi(crow::SimpleApp& app)
return crow::response{ShadowrunCharacterForm(data).htmx()};
}));
*/
CROW_ROUTE(app, "/api/shadowrun/character-list")
(login::login_required([](const crow::request& req) {
std::ostringstream html;
@ -110,6 +110,42 @@ void initApi(crow::SimpleApp& app)
return crow::response{html.str()};
}));
CROW_ROUTE(app, "/api/shadowrun/characters")
([&]() {
auto characters = getCharacters();
return utils::toJsonArray(characters);
});
CROW_ROUTE(app, "/api/shadowrun/characters").methods("POST"_method)
([](const crow::request& req) {
nlohmann::json data = nlohmann::json::parse(req.body); // parse JSON from HTTP body
auto name = data["name"];
int id = createCharacter(name);
if(id > 0){
auto character = getChracter(id);
if (character.has_value()){
return crow::response(200, nlohmann::json(character.value()).dump());
}
}
return crow::response(405, "Failed to create character");
});
CROW_ROUTE(app, "/api/shadowrun/characters/<int>")
([&](int id) {
auto optCharacter = getChracter(id);
if (!optCharacter.has_value())
return crow::response(404, "Character not found");
return crow::response(200, nlohmann::json(optCharacter.value()).dump());
});
CROW_ROUTE(app, "/api/shadowrun/characters_data/<int>")
([&](int id) {
auto character_data = getChracterData(id);
if (!character_data.empty())
return crow::response(405, "No character data found");
return crow::response(200, utils::toJsonArray(character_data));
});
}
}

62
src/shadowrun/ShadowrunDb.cpp
View File

@ -2,9 +2,11 @@
#include <format>
#include <functional>
#include <map>
#include <optional>
#include "database.hpp"
#include "databasepool.h"
#include "crow.h"
#include "utils.hpp"
#include "sqlite_orm.h"
using namespace std;
@ -12,7 +14,10 @@ using namespace sqlite_orm;
namespace shadowrun {
int64_t getKeyOfCharacter(const string& name){
int64_t createCharacter(const string& name){
if (name.empty())
return -1;
auto db = dbpool.acquire();
auto character = db->get_all<ShadowrunCharacter>(
@ -23,13 +28,15 @@ int64_t getKeyOfCharacter(const string& name){
if (!character.empty()) {
return character[0].id;
} else {
return db->insert(ShadowrunCharacter{-1, name, Database::currentTime()});
auto c = createShadowrunCharacter(name);
return db->insert(c);
}
}
/*
bool storeCharacterData(int64_t characterKey, vector<pair<const string, const string>>& idValues){
auto characterData = getCharacterData(characterKey);
std::map<string, ShadowrunData*> dataMap;
std::map<string, ShadowrunCharacterData*> dataMap;
for(auto& data : characterData) {
dataMap[data.name] = &data;
}
@ -45,7 +52,7 @@ bool storeCharacterData(int64_t characterKey, vector<pair<const string, const st
db->update_all(
sqlite_orm::set(
assign(&ShadowrunData::value, idValue.second),
assign(&ShadowrunData::updated_at, Database::currentTime())
assign(&ShadowrunData::updated_at, utils::currentTime())
),
where(
c(&ShadowrunData::name) == name and
@ -58,7 +65,7 @@ bool storeCharacterData(int64_t characterKey, vector<pair<const string, const st
.character_id = static_cast<int>(characterKey),
.name = name,
.value = value,
.created_at = Database::currentTime(),
.created_at = utils::currentTime(),
.updated_at = "",
};
db->insert(entry);
@ -66,26 +73,59 @@ bool storeCharacterData(int64_t characterKey, vector<pair<const string, const st
}
return true;
}
*/
std::vector<ShadowrunCharacter> getCharacters(){
auto db = dbpool.acquire();
return db->get_all<ShadowrunCharacter>();
}
std::map<string, string> getCharacterDataMap(int64_t characterKey){
auto characterData = getCharacterData(characterKey);
std::map<string, string> dataMap;
for(auto& data : characterData) {
dataMap[data.name] = data.value;
optional<ShadowrunCharacter> getChracter(int id)
{
auto db = dbpool.acquire();
auto character = db->get_all<ShadowrunCharacter>(
where(c(&ShadowrunCharacter::id) == id),
limit(1)
);
if (character.empty())
{
return {};
}
else {
return character[0];
}
return dataMap;
}
vector<ShadowrunCharacterData> getChracterData(int character_id)
{
auto db = dbpool.acquire();
auto characterData = db->get_all<ShadowrunCharacterData>(
where(c(&ShadowrunCharacterData::character_id) == character_id)
);
return characterData;
}
int storeCharacterData(const ShadowrunCharacterData& data)
{
auto db = dbpool.acquire();
auto characterData = db->get_optional<ShadowrunCharacterData>(data.id);
if(!characterData.has_value()){
return db->insert(data);
}
else {
db->update(data);
return data.id;
}
}
/*
vector<ShadowrunData> getCharacterData(int64_t characterKey) {
auto db = dbpool.acquire();
return db->get_all<ShadowrunData>(
where(c(&ShadowrunData::character_id) == characterKey)
);
}
*/
}

23
src/shadowrun/ShadowrunDb.hpp
View File

@ -4,8 +4,10 @@
#include <cstdint>
#include <string>
#include <vector>
#include <map>
#include <optional>
#include "json.hpp"
#include "utils.hpp"
namespace shadowrun {
struct ShadowrunCharacter {
int id;
@ -13,21 +15,28 @@ namespace shadowrun {
std::string created_at; // SQLite stores DATETIME as TEXT
};
struct ShadowrunData {
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ShadowrunCharacter, id, name, created_at)
inline ShadowrunCharacter createShadowrunCharacter(const std::string& name){
return ShadowrunCharacter {-1, name, utils::currentTime()};
}
struct ShadowrunCharacterData {
int id;
int character_id;
std::string name;
std::string value;
std::string type;
std::string json;
std::string created_at;
std::string updated_at;
};
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ShadowrunCharacterData, id, character_id, type, json, created_at, updated_at);
int64_t getKeyOfCharacter(const std::string& name);
int64_t createCharacter(const std::string& name);
bool storeCharacterData(int64_t characterKey, std::vector<std::pair<const std::string, const std::string>>& idValues);
std::vector<ShadowrunCharacter> getCharacters();
std::optional<ShadowrunCharacter> getChracter(int id);
std::vector<ShadowrunData> getCharacterData(int64_t characterKey);
std::map<std::string, std::string> getCharacterDataMap(int64_t characterKey);
std::vector<ShadowrunCharacterData> getChracterData(int character_id);
int storeCharacterData(const ShadowrunCharacterData& data);
}
#endif // __SHADOWRUNDB_H__

9
src/utils.cpp
View File

@ -134,4 +134,13 @@ std::string urlDecode(const std::string& str) {
return decoded.str();
}
string currentTime(){
auto now = std::chrono::system_clock::now();
std::time_t t = std::chrono::system_clock::to_time_t(now);
std::stringstream ss;
ss << std::put_time(std::gmtime(&t), "%Y-%m-%d %H:%M:%S");
return ss.str();
}
}

12
src/utils.hpp
View File

@ -6,6 +6,7 @@
#include <cstdint>
#include <filesystem>
#include <map>
#include "json.hpp"
namespace utils {
std::map<std::string, std::string> parseBody(const std::string& body);
@ -21,6 +22,17 @@ namespace utils {
std::filesystem::path getDataDir();
std::string urlDecode(const std::string& str);
std::string currentTime();
template<typename T>
std::string toJsonArray(const std::vector<T>& data){
nlohmann::json arr = nlohmann::json::array();
for (auto& c : data) {
arr.push_back(nlohmann::json(c));
}
return arr.dump();
}
}
#endif