fic/server
2
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

ui: Fix errors after migration

Browse Source
This commit is contained in:
nemunaire 2022-10-24 10:36:38 +02:00
parent 47776eeeb4
commit d791e74a2a
10 changed files with 110 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/ui/src/lib/stores/issues.js
View File

@ -30,22 +30,24 @@ function createIssuesStore() {
}
}
async function refreshFunc(cb=null, interval=null) {
if (refresh_interval_issues)
clearInterval(refresh_interval_issues);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_issues = setInterval(refreshFunc, interval);
updateFunc(await fetch('issues.json', {headers: {'Accept': 'application/json'}}), cb);
}
return {
subscribe,
refresh: async (cb=null, interval=null) => {
if (refresh_interval_issues)
clearInterval(refresh_interval_issues);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_issues = setInterval(refresh_issues, interval);
updateFunc(await fetch('issues.json', {headers: {'Accept': 'application/json'}}), cb);
},
refresh: refreshFunc,
update: updateFunc,
};

28
frontend/ui/src/lib/stores/my.js
View File

@ -40,22 +40,24 @@ function createMyStore() {
}
}
async function refreshFunc(cb=null, interval=null) {
if (refresh_interval_my)
clearInterval(refresh_interval_my);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 24000;
}
if (stop_refresh) {
return;
}
refresh_interval_my = setInterval(refreshFunc, interval);
updateFunc(await fetch('my.json', {headers: {'Accept': 'application/json'}}), cb);
}
return {
subscribe,
refresh: async (cb=null, interval=null) => {
if (refresh_interval_my)
clearInterval(refresh_interval_my);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 24000;
}
if (stop_refresh) {
return;
}
refresh_interval_my = setInterval(refresh_my, interval);
updateFunc(await fetch('my.json', {headers: {'Accept': 'application/json'}}), cb);
},
refresh: refreshFunc,
update: updateFunc,
};

67
frontend/ui/src/lib/stores/settings.js
View File

@ -1,6 +1,7 @@
import { readable, writable } from 'svelte/store';
import { stop_refresh } from './common';
import { my } from './my';
let refresh_interval_settings = null;
@ -40,41 +41,43 @@ function createSettingsStore() {
}
}
async function refreshFunc(cb=null, interval=null) {
if (refresh_interval_settings)
clearInterval(refresh_interval_settings);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_settings = setInterval(refreshFunc, interval);
if (!cb) {
// Before we start, update settings more frequently.
cb = function(stgs) {
const srv_cur = new Date(Date.now() + (stgs.currentTime - stgs.recvTime));
if (settings.start > srv_cur) {
const startIn = settings.start - srv_cur;
if (startIn > 15000) {
setTimeout(refreshFunc, Math.floor(Math.random() * 10000) + 2400)
} else if (startIn > 1500) {
setTimeout(refreshFunc, startIn - 1000 - Math.floor(Math.random() * 500))
} else {
// On scheduled start time, refresh my.json file
setTimeout(my.refresh, startIn + Math.floor(Math.random() * 200))
}
}
};
}
updateFunc(await fetch('settings.json', {headers: {'Accept': 'application/json'}}), cb);
};
return {
subscribe,
refresh: async (cb=null, interval=null) => {
if (refresh_interval_settings)
clearInterval(refresh_interval_settings);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_settings = setInterval(refresh_settings, interval);
if (!cb) {
// Before we start, update settings more frequently.
cb = function(stgs) {
const srv_cur = new Date(Date.now() + (stgs.currentTime - stgs.recvTime));
if (settings.start > srv_cur) {
const startIn = settings.start - srv_cur;
if (startIn > 15000) {
setTimeout(refresh_settings, Math.floor(Math.random() * 10000) + 2400)
} else if (startIn > 1500) {
setTimeout(refresh_settings, startIn - 1000 - Math.floor(Math.random() * 500))
} else {
// On scheduled start time, refresh my.json file
setTimeout(refresh_my, startIn + Math.floor(Math.random() * 200))
}
}
};
}
updateFunc(await fetch('settings.json', {headers: {'Accept': 'application/json'}}), cb);
},
refresh: refreshFunc,
update: updateFunc,
}

28
frontend/ui/src/lib/stores/teams.js
View File

@ -28,22 +28,24 @@ function createTeamsStore() {
}
}
async function refreshFunc(cb=null, interval=null) {
if (refresh_interval_teams)
clearInterval(refresh_interval_teams);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_teams = setInterval(refreshFunc, interval);
updateFunc(await fetch('teams.json', {headers: {'Accept': 'application/json'}}), cb);
}
return {
subscribe,
refresh: async (cb=null, interval=null) => {
if (refresh_interval_teams)
clearInterval(refresh_interval_teams);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_teams = setInterval(refresh_teams, interval);
updateFunc(await fetch('teams.json', {headers: {'Accept': 'application/json'}}), cb);
},
refresh: refreshFunc,
update: updateFunc,
};

28
frontend/ui/src/lib/stores/themes.js
View File

@ -50,22 +50,24 @@ function createThemesStore() {
}
}
async function refreshFunc(cb=null, interval=null) {
if (refresh_interval_themes)
clearInterval(refresh_interval_themes);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_themes = setInterval(refreshFunc, interval);
await updateFunc(await fetch('themes.json', {headers: {'Accept': 'application/json'}}), cb);
}
return {
subscribe,
refresh: async (cb=null, interval=null) => {
if (refresh_interval_themes)
clearInterval(refresh_interval_themes);
if (interval === null) {
interval = Math.floor(Math.random() * 24000) + 32000;
}
if (stop_refresh) {
return;
}
refresh_interval_themes = setInterval(refresh_themes, interval);
await updateFunc(await fetch('themes.json', {headers: {'Accept': 'application/json'}}), cb);
},
refresh: refreshFunc,
update: updateFunc,
};

6
frontend/ui/src/routes/+layout.js
View File

@ -10,12 +10,12 @@ export const ssr = false;
export async function load() {
await challengeInfo.refresh();
await settings.refresh();
await themes.refresh();
teams.refresh();
await themesStore.refresh();
teamsStore.refresh();
my.refresh((my) => {
if (my && my.team_id === 0) {
stop_refresh = true;
}
});
issues.refresh();
issuesStore.refresh();
}

3
frontend/ui/src/routes/+layout.svelte
View File

@ -8,6 +8,9 @@
} from 'sveltestrap';
import Header from '$lib/components/Header.svelte';
import { challengeInfo } from '$lib/stores/challengeinfo';
import { settings } from '$lib/stores/settings';
</script>
<svelte:head>

12
frontend/ui/src/routes/[theme]/+layout.svelte
View File

@ -5,20 +5,20 @@
import { challengeInfo } from '$lib/stores/challengeinfo.js';
export let theme;
export let data;
</script>
<svelte:head>
<title>{theme?theme.name:""} - {$challengeInfo.title}</title>
<title>{data.theme?data.theme.name:""} - {$challengeInfo.title}</title>
</svelte:head>
{#if theme}
<div style="background-image: url({theme.image})" class="page-header">
{#if data.theme}
<div style="background-image: url({data.theme.image})" class="page-header">
<Container class="text-primary">
<h1 class="display-2">
<a href="{theme.urlid}">{theme.name}</a>
<a href="{data.theme.urlid}">{data.theme.name}</a>
</h1>
<h2>{@html theme.authors}</h2>
<h2>{@html data.theme.authors}</h2>
</Container>
<div class="headerfade"></div>
</div>

4
frontend/ui/src/routes/[theme]/+page.svelte
View File

@ -18,7 +18,7 @@
export let data;
</script>
{#if data.theme && data.theme.exercices}
{#if data && data.theme && data.theme.exercices}
<Card class="niceborder text-indent mt-2 mb-4">
<CardBody class="bg-dark text-light">
@ -65,7 +65,7 @@
<div style="position: absolute; margin-left: calc(var(--bs-gutter-x) * -.5 - 15px); margin-top: -0.5rem;">
<svg style="height: 50px; width: 23px;">
<rect
style="fill:#{$my && $my.exercices[k] && (index < 1 || ($my.exercices[Object.keys(data.data.theme.exercices)[index-1]] && $my.exercices[Object.keys(data.theme.exercices)[index-1]].solved_rank)) ? '62c462' : 'bbb'}"
style="fill:#{$my && $my.exercices[k] && (index < 1 || ($my.exercices[Object.keys(data.theme.exercices)[index-1]] && $my.exercices[Object.keys(data.theme.exercices)[index-1]].solved_rank)) ? '62c462' : 'bbb'}"
width="5"
height="30"
x="10"

2
frontend/ui/src/routes/[theme]/[exercice]/+page.js
View File

@ -2,7 +2,7 @@ import { get_store_value } from 'svelte/internal';
import { themes } from '$lib/stores/themes.js';
export async function load({ parent }) {
export async function load({ params, parent }) {
const stuff = await parent();
let exercice = null;