eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Update to the newest version of Omorphia

Browse Source
This commit is contained in:
Wuzado
2022-08-01 22:45:24 +02:00
parent 855604c9e0
commit eeb2dc7fd8
20 changed files with 9420 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "theseus_gui/locales"]
path = theseus_gui/locales
url = https://github.com/modrinth/translations

1
theseus_gui/generated/gameVersions.json Normal file
View File

File diff suppressed because one or more lines are too long

7876
theseus_gui/generated/openapi.ts Normal file
View File

File diff suppressed because it is too large Load Diff

7
theseus_gui/generated/state.json Normal file
View File

@@ -0,0 +1,7 @@
{
"lastGenerated": "2022-08-01T14:34:27.819Z",
"options": {
"gameVersions": true,
"openapi": true
}
}

10
theseus_gui/package.json
View File

@@ -24,6 +24,7 @@
"prettier-plugin-svelte": "^2.5.0", "prettier-plugin-svelte": "^2.5.0",
"svelte": "^3.46.0", "svelte": "^3.46.0",
"svelte-check": "^2.2.6", "svelte-check": "^2.2.6",
"svelte-intl-precompile": "^0.11.1",
"tslib": "^2.3.1", "tslib": "^2.3.1",
"typescript": "~4.5.4", "typescript": "~4.5.4",
"vite": "^3.0.0" "vite": "^3.0.0"
@@ -35,9 +36,10 @@
"@iconify-json/heroicons-outline": "^1.1.1", "@iconify-json/heroicons-outline": "^1.1.1",
"@iconify-json/heroicons-solid": "^1.1.1", "@iconify-json/heroicons-solid": "^1.1.1",
"@iconify-json/lucide": "^1.1.5", "@iconify-json/lucide": "^1.1.5",
"@tauri-apps/api": "^1.0.0-rc.1", "@tauri-apps/api": "^1.0.2",
"omorphia": "0.0.17", "omorphia": "0.0.67",
"svrollbar": "^0.10.4", "svrollbar": "^0.12.0",
"unplugin-icons": "^0.14.7" "unplugin-icons": "^0.14.7",
"highlight.js": "11.5.1"
} }
} }

1812
theseus_gui/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

2
theseus_gui/postcss.config.cjs
View File

@@ -1 +1 @@
module.exports = require('omorphia/config/postcss.config.cjs') module.exports = require('omorphia/config/postcss.cjs')

2
theseus_gui/src-tauri/src/main.rs
View File

@@ -9,7 +9,7 @@ use tauri::{
}; };
fn main() { fn main() {
let ctx = tauri::generate_context!(); let ctx = tauri::generate_context!(); // Run `pnpm build:web` (builds the web app) to get rid of the error.
tauri::Builder::default() tauri::Builder::default()
.invoke_handler(tauri::generate_handler![]) .invoke_handler(tauri::generate_handler![])

5
theseus_gui/src/app.html
View File

@@ -3,9 +3,12 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="preload" href="/fonts/InterRegular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/InterBold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/InterSemiBold.woff2" as="font" type="font/woff2" crossorigin>
%sveltekit.head% %sveltekit.head%
</head> </head>
<body style="background-color: hsl(220, 13%, 15%)"> <body class="base theme-dark" style="background-color: hsl(220, 13%, 15%)">
%sveltekit.body% %sveltekit.body%
</body> </body>
</html> </html>

38
theseus_gui/src/components/GlobalSettings.svelte
View File

@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { FormField, Slider, TextInput, Button } from "omorphia" import { Field, Slider, TextInput, Button } from "omorphia"
import TitledSection from "$components/TitledSection.svelte" import TitledSection from "$components/TitledSection.svelte"
import WindowSettings from "$components/WindowSettings.svelte" import WindowSettings from "$components/WindowSettings.svelte"
@@ -8,50 +8,50 @@
<div class="section"> <div class="section">
<TitledSection title="Downloads"> <TitledSection title="Downloads">
<FormField label="Max concurrent downloads"> <Field label="Max concurrent downloads">
<Slider min=1 max=64 bind:value={maxConcurrentDownloads} /> <Slider min=1 max=64 bind:value={maxConcurrentDownloads} />
</FormField> </Field>
</TitledSection> </TitledSection>
<TitledSection title="Override game resolution" toggleable=true> <TitledSection title="Override game resolution" toggleable=true>
<WindowSettings /> <WindowSettings />
</TitledSection> </TitledSection>
<TitledSection title="Profile hooks"> <TitledSection title="Profile hooks">
<FormField label="Pre-launch"> <Field label="Pre-launch">
<TextInput /> <TextInput />
</FormField> </Field>
<FormField label="Wrapper"> <Field label="Wrapper">
<TextInput /> <TextInput />
</FormField> </Field>
<FormField label="Post-exit"> <Field label="Post-exit">
<TextInput /> <TextInput />
</FormField> </Field>
</TitledSection> </TitledSection>
<TitledSection title="Java"> <TitledSection title="Java">
<FormField label="Java 8 installation"> <Field label="Java 8 installation">
<TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home" /> <TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home" />
<div class="button-group"> <div class="button-group">
<Button>Auto-detect</Button> <Button>Auto-detect</Button>
<Button>Browse installations</Button> <Button>Browse installations</Button>
<Button>Test</Button> <Button>Test</Button>
</div> </div>
</FormField> </Field>
<FormField label="Java 17 installation"> <Field label="Java 17 installation">
<TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home" /> <TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home" />
<div class="button-group"> <div class="button-group">
<Button>Auto-detect</Button> <Button>Auto-detect</Button>
<Button>Browse installations</Button> <Button>Browse installations</Button>
<Button>Test</Button> <Button>Test</Button>
</div> </div>
</FormField> </Field>
<FormField label="Minimum memory allocatted (in MB)"> <Field label="Minimum memory allocatted (in MB)">
<TextInput /> <TextInput />
</FormField> </Field>
<FormField label="Maximum memory allocatted (in MB)"> <Field label="Maximum memory allocatted (in MB)">
<TextInput value="2048" /> <TextInput value="2048" />
</FormField> </Field>
<FormField label="Arguments"> <Field label="Arguments">
<TextInput/> <TextInput/>
</FormField> </Field>
</TitledSection> </TitledSection>
</div> </div>

10
theseus_gui/src/components/WindowSettings.svelte
View File

@@ -1,14 +1,14 @@
<script lang="ts"> <script lang="ts">
import { FormField, TextInput } from "omorphia" import { Field, TextInput } from "omorphia"
</script> </script>
<div class="section"> <div class="section">
<FormField label="Window width"> <Field label="Window width">
<TextInput /> <TextInput />
</FormField> </Field>
<FormField label="Window height"> <Field label="Window height">
<TextInput /> <TextInput />
</FormField> </Field>
</div> </div>
<style lang="postcss"> <style lang="postcss">

17
theseus_gui/src/routes/__layout.svelte
View File

@@ -7,6 +7,23 @@
import Page from "$layout/Page.svelte"; import Page from "$layout/Page.svelte";
</script> </script>
<script context="module" lang="ts">
import { init, waitLocale, t, getLocaleFromAcceptLanguageHeader } from 'svelte-intl-precompile'
import { registerAll, availableLocales } from '$locales'
registerAll()
export const load: import('@sveltejs/kit').Load = async ({ session }) => {
init({
fallbackLocale: 'en',
initialLocale: getLocaleFromAcceptLanguageHeader(session.acceptLanguage, availableLocales),
})
await waitLocale()
return {}
}
</script>
<div class="app base theme-dark"> <div class="app base theme-dark">
<Sidebar /> <Sidebar />
<StatusBar /> <StatusBar />

1
theseus_gui/src/routes/library/instance/[id]/settings.svelte
View File

@@ -3,7 +3,6 @@
</script> </script>
<script lang="ts"> <script lang="ts">
import { Checkbox, FormField, TextInput, Button } from "omorphia"
import GlobalSettings from "$components/GlobalSettings.svelte" import GlobalSettings from "$components/GlobalSettings.svelte"
import TitledSection from "$components/TitledSection.svelte" import TitledSection from "$components/TitledSection.svelte"

1
theseus_gui/src/routes/settings.svelte
View File

@@ -3,7 +3,6 @@
</script> </script>
<script lang="ts"> <script lang="ts">
import { Checkbox, FormField, TextInput, Button } from "omorphia"
import GlobalSettings from "$components/GlobalSettings.svelte" import GlobalSettings from "$components/GlobalSettings.svelte"
</script> </script>

3
theseus_gui/src/stores/account.ts Normal file
View File

@@ -0,0 +1,3 @@
import { writable } from 'svelte/store'
export const token = writable('')

BIN
theseus_gui/static/fonts/InterBold.woff2 Normal file
View File

Binary file not shown.

BIN
theseus_gui/static/fonts/InterRegular.woff2 Normal file
View File

Binary file not shown.

BIN
theseus_gui/static/fonts/InterSemiBold.woff2 Normal file
View File

Binary file not shown.

12
theseus_gui/svelte.config.js
View File

@@ -1,13 +1,19 @@
import adapter from '@sveltejs/adapter-static'; import adapter from '@sveltejs/adapter-static';
import { preprocess } from 'omorphia/config/svelte.config' import { preprocess } from 'omorphia/config/svelte';
import path from 'path';
/** @type {import('@sveltejs/kit').Config} */ /** @type {import('@sveltejs/kit').Config} */
const config = { const config = {
preprocess, preprocess: [ preprocess ],
kit: { kit: {
adapter: adapter({ adapter: adapter({
fallback: '200.html', fallback: '200.html',
}) }),
alias: {
$generated: path.resolve('./generated'),
$stores: path.resolve('./src/stores'),
}
} }
}; };

19
theseus_gui/vite.config.js
View File

@@ -1,13 +1,23 @@
import { sveltekit } from '@sveltejs/kit/vite'; import { sveltekit } from '@sveltejs/kit/vite';
import path from "path"; import path from "path";
import { plugins } from 'omorphia/config/svelte.config' import { plugins } from 'omorphia/config/vite';
import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin';
import { Generator } from 'omorphia/plugins';
/** @type {import('vite').UserConfig} */ /** @type {import('vite').UserConfig} */
const config = { const config = {
plugins: [ plugins: [
sveltekit(), sveltekit(),
...plugins ...plugins,
precompileIntl('locales'),
Generator({
gameVersions: true,
openapi: true,
}),
], ],
optimizeDeps: {
include: ["highlight.js/lib/core"],
},
resolve: { resolve: {
alias: { alias: {
$assets: path.resolve('./src/assets'), $assets: path.resolve('./src/assets'),
@@ -19,6 +29,11 @@ const config = {
$generated: path.resolve('./src/generated'), $generated: path.resolve('./src/generated'),
}, },
}, },
server: {
fs: {
allow: ['generated'],
},
},
}; };
export default config; export default config;