From 3a6daa3d04e7879f54a8df81db0444730fec8880 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 24 Oct 2022 09:48:45 +0200 Subject: [PATCH] ui: Use $lib instead of ../../../../ mess --- .../src/{ => lib}/components/CardTheme.svelte | 6 +++--- .../src/{ => lib}/components/DateFormat.svelte | 0 .../components/ExerciceDownloads.svelte | 0 .../{ => lib}/components/ExerciceFlags.svelte | 6 +++--- .../{ => lib}/components/ExerciceHints.svelte | 2 +- .../{ => lib}/components/ExerciceSolved.svelte | 0 .../{ => lib}/components/ExerciceVideo.svelte | 0 .../src/{ => lib}/components/FileSize.svelte | 0 .../ui/src/{ => lib}/components/FlagKey.svelte | 4 ++-- .../ui/src/{ => lib}/components/FlagMCQ.svelte | 0 .../src/{ => lib}/components/FormIssue.svelte | 4 ++-- .../ui/src/{ => lib}/components/Header.svelte | 8 ++++---- .../{ => lib}/components/HeaderClock.svelte | 4 ++-- .../{ => lib}/components/HeaderIssues.svelte | 4 ++-- .../{ => lib}/components/HeaderPartners.svelte | 2 +- .../ui/src/{ => lib}/components/NavTags.svelte | 4 ++-- .../src/{ => lib}/components/NavThemes.svelte | 6 +++--- .../RegistrationFormCreateTeam.svelte | 2 +- .../components/RegistrationFormJoinTeam.svelte | 4 ++-- .../components/RegistrationRowMember.svelte | 0 .../src/{ => lib}/components/ScoreGrid.svelte | 6 +++--- .../{ => lib}/components/TeamChangeName.svelte | 4 ++-- .../{ => lib}/components/TeamMembers.svelte | 0 .../src/{ => lib}/components/ThemeNav.svelte | 2 +- .../ui/src/{ => lib}/stores/challengeinfo.js | 0 frontend/ui/src/{ => lib}/stores/common.js | 0 frontend/ui/src/{ => lib}/stores/issues.js | 0 frontend/ui/src/{ => lib}/stores/my.js | 0 .../ui/src/{ => lib}/stores/myresponses.js | 0 frontend/ui/src/{ => lib}/stores/mythemes.js | 0 frontend/ui/src/{ => lib}/stores/settings.js | 0 frontend/ui/src/{ => lib}/stores/teams.js | 0 frontend/ui/src/{ => lib}/stores/themes.js | 0 frontend/ui/src/routes/+layout.js | 12 ++++++------ frontend/ui/src/routes/+layout.svelte | 2 +- frontend/ui/src/routes/+page.svelte | 10 +++++----- frontend/ui/src/routes/[theme]/+layout.js | 2 +- frontend/ui/src/routes/[theme]/+layout.svelte | 2 +- frontend/ui/src/routes/[theme]/+page.svelte | 2 +- .../ui/src/routes/[theme]/[exercice]/+page.js | 2 +- .../src/routes/[theme]/[exercice]/+page.svelte | 18 +++++++++--------- frontend/ui/src/routes/edit/+page.svelte | 10 +++++----- frontend/ui/src/routes/issues/+page.js | 2 +- frontend/ui/src/routes/issues/+page.svelte | 8 ++++---- frontend/ui/src/routes/rank/+page.svelte | 8 ++++---- frontend/ui/src/routes/register/+page.svelte | 8 ++++---- frontend/ui/src/routes/rules/+page.svelte | 4 ++-- frontend/ui/src/routes/tags/[tag]/+page.svelte | 4 ++-- 48 files changed, 81 insertions(+), 81 deletions(-) rename frontend/ui/src/{ => lib}/components/CardTheme.svelte (94%) rename frontend/ui/src/{ => lib}/components/DateFormat.svelte (100%) rename frontend/ui/src/{ => lib}/components/ExerciceDownloads.svelte (100%) rename frontend/ui/src/{ => lib}/components/ExerciceFlags.svelte (98%) rename frontend/ui/src/{ => lib}/components/ExerciceHints.svelte (98%) rename frontend/ui/src/{ => lib}/components/ExerciceSolved.svelte (100%) rename frontend/ui/src/{ => lib}/components/ExerciceVideo.svelte (100%) rename frontend/ui/src/{ => lib}/components/FileSize.svelte (100%) rename frontend/ui/src/{ => lib}/components/FlagKey.svelte (98%) rename frontend/ui/src/{ => lib}/components/FlagMCQ.svelte (100%) rename frontend/ui/src/{ => lib}/components/FormIssue.svelte (93%) rename frontend/ui/src/{ => lib}/components/Header.svelte (94%) rename frontend/ui/src/{ => lib}/components/HeaderClock.svelte (96%) rename frontend/ui/src/{ => lib}/components/HeaderIssues.svelte (87%) rename frontend/ui/src/{ => lib}/components/HeaderPartners.svelte (94%) rename frontend/ui/src/{ => lib}/components/NavTags.svelte (92%) rename frontend/ui/src/{ => lib}/components/NavThemes.svelte (89%) rename frontend/ui/src/{ => lib}/components/RegistrationFormCreateTeam.svelte (98%) rename frontend/ui/src/{ => lib}/components/RegistrationFormJoinTeam.svelte (96%) rename frontend/ui/src/{ => lib}/components/RegistrationRowMember.svelte (100%) rename frontend/ui/src/{ => lib}/components/ScoreGrid.svelte (95%) rename frontend/ui/src/{ => lib}/components/TeamChangeName.svelte (96%) rename frontend/ui/src/{ => lib}/components/TeamMembers.svelte (100%) rename frontend/ui/src/{ => lib}/components/ThemeNav.svelte (97%) rename frontend/ui/src/{ => lib}/stores/challengeinfo.js (100%) rename frontend/ui/src/{ => lib}/stores/common.js (100%) rename frontend/ui/src/{ => lib}/stores/issues.js (100%) rename frontend/ui/src/{ => lib}/stores/my.js (100%) rename frontend/ui/src/{ => lib}/stores/myresponses.js (100%) rename frontend/ui/src/{ => lib}/stores/mythemes.js (100%) rename frontend/ui/src/{ => lib}/stores/settings.js (100%) rename frontend/ui/src/{ => lib}/stores/teams.js (100%) rename frontend/ui/src/{ => lib}/stores/themes.js (100%) diff --git a/frontend/ui/src/components/CardTheme.svelte b/frontend/ui/src/lib/components/CardTheme.svelte similarity index 94% rename from frontend/ui/src/components/CardTheme.svelte rename to frontend/ui/src/lib/components/CardTheme.svelte index 9dac41b6..fb4249de 100644 --- a/frontend/ui/src/components/CardTheme.svelte +++ b/frontend/ui/src/lib/components/CardTheme.svelte @@ -10,9 +10,9 @@ Row, } from 'sveltestrap'; - import { my } from '../stores/my.js'; - import { max_solved } from '../stores/themes.js'; - import { myThemes } from '../stores/mythemes.js'; + import { my } from '$lib/stores/my.js'; + import { max_solved } from '$lib/stores/themes.js'; + import { myThemes } from '$lib/stores/mythemes.js'; export { className as class }; export let theme = {}; diff --git a/frontend/ui/src/components/DateFormat.svelte b/frontend/ui/src/lib/components/DateFormat.svelte similarity index 100% rename from frontend/ui/src/components/DateFormat.svelte rename to frontend/ui/src/lib/components/DateFormat.svelte diff --git a/frontend/ui/src/components/ExerciceDownloads.svelte b/frontend/ui/src/lib/components/ExerciceDownloads.svelte similarity index 100% rename from frontend/ui/src/components/ExerciceDownloads.svelte rename to frontend/ui/src/lib/components/ExerciceDownloads.svelte diff --git a/frontend/ui/src/components/ExerciceFlags.svelte b/frontend/ui/src/lib/components/ExerciceFlags.svelte similarity index 98% rename from frontend/ui/src/components/ExerciceFlags.svelte rename to frontend/ui/src/lib/components/ExerciceFlags.svelte index 75151dd1..a865df47 100644 --- a/frontend/ui/src/components/ExerciceFlags.svelte +++ b/frontend/ui/src/lib/components/ExerciceFlags.svelte @@ -15,9 +15,9 @@ import { blake2b } from 'hash-wasm'; - import { my } from '../stores/my.js'; - import { teams } from '../stores/teams.js'; - import { settings } from '../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { teams } from '$lib/stores/teams.js'; + import { settings } from '$lib/stores/settings.js'; import DateFormat from './DateFormat.svelte'; import FlagKey from './FlagKey.svelte'; diff --git a/frontend/ui/src/components/ExerciceHints.svelte b/frontend/ui/src/lib/components/ExerciceHints.svelte similarity index 98% rename from frontend/ui/src/components/ExerciceHints.svelte rename to frontend/ui/src/lib/components/ExerciceHints.svelte index 8096012d..065a3923 100644 --- a/frontend/ui/src/components/ExerciceHints.svelte +++ b/frontend/ui/src/lib/components/ExerciceHints.svelte @@ -10,7 +10,7 @@ Spinner, } from 'sveltestrap'; - import { settings } from '../stores/settings.js'; + import { settings } from '$lib/stores/settings.js'; export let hints = []; export let exercice = {}; diff --git a/frontend/ui/src/components/ExerciceSolved.svelte b/frontend/ui/src/lib/components/ExerciceSolved.svelte similarity index 100% rename from frontend/ui/src/components/ExerciceSolved.svelte rename to frontend/ui/src/lib/components/ExerciceSolved.svelte diff --git a/frontend/ui/src/components/ExerciceVideo.svelte b/frontend/ui/src/lib/components/ExerciceVideo.svelte similarity index 100% rename from frontend/ui/src/components/ExerciceVideo.svelte rename to frontend/ui/src/lib/components/ExerciceVideo.svelte diff --git a/frontend/ui/src/components/FileSize.svelte b/frontend/ui/src/lib/components/FileSize.svelte similarity index 100% rename from frontend/ui/src/components/FileSize.svelte rename to frontend/ui/src/lib/components/FileSize.svelte diff --git a/frontend/ui/src/components/FlagKey.svelte b/frontend/ui/src/lib/components/FlagKey.svelte similarity index 98% rename from frontend/ui/src/components/FlagKey.svelte rename to frontend/ui/src/lib/components/FlagKey.svelte index 64bf4948..6695eab9 100644 --- a/frontend/ui/src/components/FlagKey.svelte +++ b/frontend/ui/src/lib/components/FlagKey.svelte @@ -6,8 +6,8 @@ } from 'sveltestrap'; import { tick } from 'svelte'; - import { my } from '../stores/my.js'; - import { settings } from '../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { settings } from '$lib/stores/settings.js'; export let exercice_id = 0; export let flag = { }; diff --git a/frontend/ui/src/components/FlagMCQ.svelte b/frontend/ui/src/lib/components/FlagMCQ.svelte similarity index 100% rename from frontend/ui/src/components/FlagMCQ.svelte rename to frontend/ui/src/lib/components/FlagMCQ.svelte diff --git a/frontend/ui/src/components/FormIssue.svelte b/frontend/ui/src/lib/components/FormIssue.svelte similarity index 93% rename from frontend/ui/src/components/FormIssue.svelte rename to frontend/ui/src/lib/components/FormIssue.svelte index 75eec136..735ea0d3 100644 --- a/frontend/ui/src/components/FormIssue.svelte +++ b/frontend/ui/src/lib/components/FormIssue.svelte @@ -4,8 +4,8 @@ Icon, } from 'sveltestrap'; - import { issues, issues_idx } from '../stores/issues.js'; - import { settings } from '../stores/settings.js'; + import { issues, issues_idx } from '$lib/stores/issues.js'; + import { settings } from '$lib/stores/settings.js'; export let exercice = null; export let issue = { }; diff --git a/frontend/ui/src/components/Header.svelte b/frontend/ui/src/lib/components/Header.svelte similarity index 94% rename from frontend/ui/src/components/Header.svelte rename to frontend/ui/src/lib/components/Header.svelte index 80e2ec53..14163b2f 100644 --- a/frontend/ui/src/components/Header.svelte +++ b/frontend/ui/src/lib/components/Header.svelte @@ -19,10 +19,10 @@ Row, } from 'sveltestrap'; - import { challengeInfo } from '../stores/challengeinfo.js'; - import { my } from '../stores/my.js'; - import { teams } from '../stores/teams.js'; - import { settings, time } from '../stores/settings.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; + import { my } from '$lib/stores/my.js'; + import { teams } from '$lib/stores/teams.js'; + import { settings, time } from '$lib/stores/settings.js'; import HeaderClock from './HeaderClock.svelte'; import HeaderIssues from './HeaderIssues.svelte'; diff --git a/frontend/ui/src/components/HeaderClock.svelte b/frontend/ui/src/lib/components/HeaderClock.svelte similarity index 96% rename from frontend/ui/src/components/HeaderClock.svelte rename to frontend/ui/src/lib/components/HeaderClock.svelte index 3aadbcb0..10291ca8 100644 --- a/frontend/ui/src/components/HeaderClock.svelte +++ b/frontend/ui/src/lib/components/HeaderClock.svelte @@ -4,8 +4,8 @@ Icon, } from 'sveltestrap'; - import { challengeInfo } from '../stores/challengeinfo.js'; - import { settings, time } from '../stores/settings.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; + import { settings, time } from '$lib/stores/settings.js'; {#if $settings} diff --git a/frontend/ui/src/components/HeaderIssues.svelte b/frontend/ui/src/lib/components/HeaderIssues.svelte similarity index 87% rename from frontend/ui/src/components/HeaderIssues.svelte rename to frontend/ui/src/lib/components/HeaderIssues.svelte index 45b32cf9..fccb4c76 100644 --- a/frontend/ui/src/components/HeaderIssues.svelte +++ b/frontend/ui/src/lib/components/HeaderIssues.svelte @@ -6,8 +6,8 @@ NavLink, } from 'sveltestrap'; - import { issues, issues_need_info, issues_nb_responses, issues_known_responses } from '../stores/issues.js'; - import { settings } from '../stores/settings.js'; + import { issues, issues_need_info, issues_nb_responses, issues_known_responses } from '$lib/stores/issues.js'; + import { settings } from '$lib/stores/settings.js'; let badge_color = 'secondary'; $: { diff --git a/frontend/ui/src/components/HeaderPartners.svelte b/frontend/ui/src/lib/components/HeaderPartners.svelte similarity index 94% rename from frontend/ui/src/components/HeaderPartners.svelte rename to frontend/ui/src/lib/components/HeaderPartners.svelte index 5b9dcdb6..e4fc47cf 100644 --- a/frontend/ui/src/components/HeaderPartners.svelte +++ b/frontend/ui/src/lib/components/HeaderPartners.svelte @@ -6,7 +6,7 @@ CarouselItem, } from 'sveltestrap'; - import { challengeInfo } from '../stores/challengeinfo.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; let activePartner = 0; diff --git a/frontend/ui/src/components/NavTags.svelte b/frontend/ui/src/lib/components/NavTags.svelte similarity index 92% rename from frontend/ui/src/components/NavTags.svelte rename to frontend/ui/src/lib/components/NavTags.svelte index d710e9b6..b9ff2da6 100644 --- a/frontend/ui/src/components/NavTags.svelte +++ b/frontend/ui/src/lib/components/NavTags.svelte @@ -8,8 +8,8 @@ Icon, } from 'sveltestrap'; - import { my } from '../stores/my.js'; - import { tags } from '../stores/mythemes.js'; + import { my } from '$lib/stores/my.js'; + import { tags } from '$lib/stores/mythemes.js'; let filter = ""; diff --git a/frontend/ui/src/components/NavThemes.svelte b/frontend/ui/src/lib/components/NavThemes.svelte similarity index 89% rename from frontend/ui/src/components/NavThemes.svelte rename to frontend/ui/src/lib/components/NavThemes.svelte index a3ec9b00..dce00389 100644 --- a/frontend/ui/src/components/NavThemes.svelte +++ b/frontend/ui/src/lib/components/NavThemes.svelte @@ -8,9 +8,9 @@ Icon, } from 'sveltestrap'; - import { my } from '../stores/my.js'; - import { max_solved } from '../stores/themes.js'; - import { myThemes, themes } from '../stores/mythemes.js'; + import { my } from '$lib/stores/my.js'; + import { max_solved } from '$lib/stores/themes.js'; + import { myThemes, themes } from '$lib/stores/mythemes.js'; diff --git a/frontend/ui/src/components/RegistrationFormCreateTeam.svelte b/frontend/ui/src/lib/components/RegistrationFormCreateTeam.svelte similarity index 98% rename from frontend/ui/src/components/RegistrationFormCreateTeam.svelte rename to frontend/ui/src/lib/components/RegistrationFormCreateTeam.svelte index 70a359bc..cb9620d4 100644 --- a/frontend/ui/src/components/RegistrationFormCreateTeam.svelte +++ b/frontend/ui/src/lib/components/RegistrationFormCreateTeam.svelte @@ -12,7 +12,7 @@ Row, } from 'sveltestrap'; - import { settings } from '../stores/settings.js'; + import { settings } from '$lib/stores/settings.js'; import RegistrationRowMember from './RegistrationRowMember.svelte'; diff --git a/frontend/ui/src/components/RegistrationFormJoinTeam.svelte b/frontend/ui/src/lib/components/RegistrationFormJoinTeam.svelte similarity index 96% rename from frontend/ui/src/components/RegistrationFormJoinTeam.svelte rename to frontend/ui/src/lib/components/RegistrationFormJoinTeam.svelte index 160c60bf..895234d1 100644 --- a/frontend/ui/src/components/RegistrationFormJoinTeam.svelte +++ b/frontend/ui/src/lib/components/RegistrationFormJoinTeam.svelte @@ -12,8 +12,8 @@ Row, } from 'sveltestrap'; - import { settings } from '../stores/settings.js'; - import { teams } from '../stores/teams.js'; + import { settings } from '$lib/stores/settings.js'; + import { teams } from '$lib/stores/teams.js'; import RegistrationRowMember from './RegistrationRowMember.svelte'; diff --git a/frontend/ui/src/components/RegistrationRowMember.svelte b/frontend/ui/src/lib/components/RegistrationRowMember.svelte similarity index 100% rename from frontend/ui/src/components/RegistrationRowMember.svelte rename to frontend/ui/src/lib/components/RegistrationRowMember.svelte diff --git a/frontend/ui/src/components/ScoreGrid.svelte b/frontend/ui/src/lib/components/ScoreGrid.svelte similarity index 95% rename from frontend/ui/src/components/ScoreGrid.svelte rename to frontend/ui/src/lib/components/ScoreGrid.svelte index 828173f1..ac8cad1a 100644 --- a/frontend/ui/src/components/ScoreGrid.svelte +++ b/frontend/ui/src/lib/components/ScoreGrid.svelte @@ -7,10 +7,10 @@ Table, } from 'sveltestrap'; - import DateFormat from '../components/DateFormat.svelte'; + import DateFormat from '$lib/components/DateFormat.svelte'; - import { my } from '../stores/my.js'; - import { themes } from '../stores/themes.js'; + import { my } from '$lib/stores/my.js'; + import { themes } from '$lib/stores/themes.js'; let req = null; function refresh_scores() { diff --git a/frontend/ui/src/components/TeamChangeName.svelte b/frontend/ui/src/lib/components/TeamChangeName.svelte similarity index 96% rename from frontend/ui/src/components/TeamChangeName.svelte rename to frontend/ui/src/lib/components/TeamChangeName.svelte index a42b34e0..1886f870 100644 --- a/frontend/ui/src/components/TeamChangeName.svelte +++ b/frontend/ui/src/lib/components/TeamChangeName.svelte @@ -7,8 +7,8 @@ Icon, } from 'sveltestrap'; - import { my } from '../stores/my.js'; - import { settings } from '../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { settings } from '$lib/stores/settings.js'; let newTeamName = ""; diff --git a/frontend/ui/src/components/TeamMembers.svelte b/frontend/ui/src/lib/components/TeamMembers.svelte similarity index 100% rename from frontend/ui/src/components/TeamMembers.svelte rename to frontend/ui/src/lib/components/TeamMembers.svelte diff --git a/frontend/ui/src/components/ThemeNav.svelte b/frontend/ui/src/lib/components/ThemeNav.svelte similarity index 97% rename from frontend/ui/src/components/ThemeNav.svelte rename to frontend/ui/src/lib/components/ThemeNav.svelte index 3bb83e6a..2f38e2c4 100644 --- a/frontend/ui/src/components/ThemeNav.svelte +++ b/frontend/ui/src/lib/components/ThemeNav.svelte @@ -6,7 +6,7 @@ Icon, } from 'sveltestrap'; - import { my } from '../stores/my.js'; + import { my } from '$lib/stores/my.js'; export let theme = {}; export let exercice = {}; diff --git a/frontend/ui/src/stores/challengeinfo.js b/frontend/ui/src/lib/stores/challengeinfo.js similarity index 100% rename from frontend/ui/src/stores/challengeinfo.js rename to frontend/ui/src/lib/stores/challengeinfo.js diff --git a/frontend/ui/src/stores/common.js b/frontend/ui/src/lib/stores/common.js similarity index 100% rename from frontend/ui/src/stores/common.js rename to frontend/ui/src/lib/stores/common.js diff --git a/frontend/ui/src/stores/issues.js b/frontend/ui/src/lib/stores/issues.js similarity index 100% rename from frontend/ui/src/stores/issues.js rename to frontend/ui/src/lib/stores/issues.js diff --git a/frontend/ui/src/stores/my.js b/frontend/ui/src/lib/stores/my.js similarity index 100% rename from frontend/ui/src/stores/my.js rename to frontend/ui/src/lib/stores/my.js diff --git a/frontend/ui/src/stores/myresponses.js b/frontend/ui/src/lib/stores/myresponses.js similarity index 100% rename from frontend/ui/src/stores/myresponses.js rename to frontend/ui/src/lib/stores/myresponses.js diff --git a/frontend/ui/src/stores/mythemes.js b/frontend/ui/src/lib/stores/mythemes.js similarity index 100% rename from frontend/ui/src/stores/mythemes.js rename to frontend/ui/src/lib/stores/mythemes.js diff --git a/frontend/ui/src/stores/settings.js b/frontend/ui/src/lib/stores/settings.js similarity index 100% rename from frontend/ui/src/stores/settings.js rename to frontend/ui/src/lib/stores/settings.js diff --git a/frontend/ui/src/stores/teams.js b/frontend/ui/src/lib/stores/teams.js similarity index 100% rename from frontend/ui/src/stores/teams.js rename to frontend/ui/src/lib/stores/teams.js diff --git a/frontend/ui/src/stores/themes.js b/frontend/ui/src/lib/stores/themes.js similarity index 100% rename from frontend/ui/src/stores/themes.js rename to frontend/ui/src/lib/stores/themes.js diff --git a/frontend/ui/src/routes/+layout.js b/frontend/ui/src/routes/+layout.js index 5b1113ac..2853b175 100644 --- a/frontend/ui/src/routes/+layout.js +++ b/frontend/ui/src/routes/+layout.js @@ -1,9 +1,9 @@ -import { challengeInfo } from '../stores/challengeinfo.js'; -import { issuesStore } from '../stores/issues.js'; -import { my } from '../stores/my.js'; -import { teamsStore } from '../stores/teams.js'; -import { themesStore } from '../stores/themes.js'; -import { settings, time } from '../stores/settings.js'; +import { challengeInfo } from '$lib/stores/challengeinfo.js'; +import { issuesStore } from '$lib/stores/issues.js'; +import { my } from '$lib/stores/my.js'; +import { teamsStore } from '$lib/stores/teams.js'; +import { themesStore } from '$lib/stores/themes.js'; +import { settings, time } from '$lib/stores/settings.js'; export const ssr = false; diff --git a/frontend/ui/src/routes/+layout.svelte b/frontend/ui/src/routes/+layout.svelte index 713617f5..560fb1ff 100644 --- a/frontend/ui/src/routes/+layout.svelte +++ b/frontend/ui/src/routes/+layout.svelte @@ -7,7 +7,7 @@ //Styles, } from 'sveltestrap'; - import Header from '../components/Header.svelte'; + import Header from '$lib/components/Header.svelte'; diff --git a/frontend/ui/src/routes/+page.svelte b/frontend/ui/src/routes/+page.svelte index 5ddeb509..808a406a 100644 --- a/frontend/ui/src/routes/+page.svelte +++ b/frontend/ui/src/routes/+page.svelte @@ -12,12 +12,12 @@ import { goto } from '$app/navigation'; - import CardTheme from '../components/CardTheme.svelte'; + import CardTheme from '$lib/components/CardTheme.svelte'; - import { my } from '../stores/my.js'; - import { teams } from '../stores/teams.js'; - import { myThemes, themes } from '../stores/mythemes.js'; - import { settings } from '../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { teams } from '$lib/stores/teams.js'; + import { myThemes, themes } from '$lib/stores/mythemes.js'; + import { settings } from '$lib/stores/settings.js'; diff --git a/frontend/ui/src/routes/[theme]/+layout.js b/frontend/ui/src/routes/[theme]/+layout.js index f29e750e..2baa5eb2 100644 --- a/frontend/ui/src/routes/[theme]/+layout.js +++ b/frontend/ui/src/routes/[theme]/+layout.js @@ -1,6 +1,6 @@ import { get_store_value } from 'svelte/internal'; -import { themes } from '../../stores/themes.js'; +import { themes } from '$lib/stores/themes.js'; export async function load({ params }) { const thms = get_store_value(themes); diff --git a/frontend/ui/src/routes/[theme]/+layout.svelte b/frontend/ui/src/routes/[theme]/+layout.svelte index bc4f19af..c53957e4 100644 --- a/frontend/ui/src/routes/[theme]/+layout.svelte +++ b/frontend/ui/src/routes/[theme]/+layout.svelte @@ -3,7 +3,7 @@ Container, } from 'sveltestrap'; - import { challengeInfo } from '../../stores/challengeinfo.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; export let theme; diff --git a/frontend/ui/src/routes/[theme]/+page.svelte b/frontend/ui/src/routes/[theme]/+page.svelte index 153e2755..7618246e 100644 --- a/frontend/ui/src/routes/[theme]/+page.svelte +++ b/frontend/ui/src/routes/[theme]/+page.svelte @@ -13,7 +13,7 @@ import { goto } from '$app/navigation'; - import { my } from '../../stores/my.js'; + import { my } from '$lib/stores/my.js'; export let data; diff --git a/frontend/ui/src/routes/[theme]/[exercice]/+page.js b/frontend/ui/src/routes/[theme]/[exercice]/+page.js index 4b6e7d70..ca471fc1 100644 --- a/frontend/ui/src/routes/[theme]/[exercice]/+page.js +++ b/frontend/ui/src/routes/[theme]/[exercice]/+page.js @@ -1,6 +1,6 @@ import { get_store_value } from 'svelte/internal'; -import { themes } from '../../../stores/themes.js'; +import { themes } from '$lib/stores/themes.js'; export async function load({ parent }) { const stuff = await parent(); diff --git a/frontend/ui/src/routes/[theme]/[exercice]/+page.svelte b/frontend/ui/src/routes/[theme]/[exercice]/+page.svelte index cdf810de..7e8e0a90 100644 --- a/frontend/ui/src/routes/[theme]/[exercice]/+page.svelte +++ b/frontend/ui/src/routes/[theme]/[exercice]/+page.svelte @@ -11,16 +11,16 @@ Row, } from 'sveltestrap'; - import ExerciceDownloads from '../../../components/ExerciceDownloads.svelte'; - import ExerciceFlags from '../../../components/ExerciceFlags.svelte'; - import ExerciceHints from '../../../components/ExerciceHints.svelte'; - import ExerciceSolved from '../../../components/ExerciceSolved.svelte'; - import ExerciceVideo from '../../../components/ExerciceVideo.svelte'; - import ThemeNav from '../../../components/ThemeNav.svelte'; + import ExerciceDownloads from '$lib/components/ExerciceDownloads.svelte'; + import ExerciceFlags from '$lib/components/ExerciceFlags.svelte'; + import ExerciceHints from '$lib/components/ExerciceHints.svelte'; + import ExerciceSolved from '$lib/components/ExerciceSolved.svelte'; + import ExerciceVideo from '$lib/components/ExerciceVideo.svelte'; + import ThemeNav from '$lib/components/ThemeNav.svelte'; - import { challengeInfo } from '../../../stores/challengeinfo.js'; - import { my } from '../../../stores/my.js'; - import { settings } from '../../../stores/settings.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; + import { my } from '$lib/stores/my.js'; + import { settings } from '$lib/stores/settings.js'; export let data; let solved = {}; diff --git a/frontend/ui/src/routes/edit/+page.svelte b/frontend/ui/src/routes/edit/+page.svelte index fb578cf5..0419f491 100644 --- a/frontend/ui/src/routes/edit/+page.svelte +++ b/frontend/ui/src/routes/edit/+page.svelte @@ -10,12 +10,12 @@ Row, } from 'sveltestrap'; - import ScoreGrid from '../../components/ScoreGrid.svelte'; - import TeamChangeName from '../../components/TeamChangeName.svelte'; - import TeamMembers from '../../components/TeamMembers.svelte'; + import ScoreGrid from '$lib/components/ScoreGrid.svelte'; + import TeamChangeName from '$lib/components/TeamChangeName.svelte'; + import TeamMembers from '$lib/components/TeamMembers.svelte'; - import { my } from '../../stores/my.js'; - import { settings } from '../../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { settings } from '$lib/stores/settings.js'; diff --git a/frontend/ui/src/routes/issues/+page.js b/frontend/ui/src/routes/issues/+page.js index c0e4ce6b..caae4fd7 100644 --- a/frontend/ui/src/routes/issues/+page.js +++ b/frontend/ui/src/routes/issues/+page.js @@ -1,6 +1,6 @@ import { get_store_value } from 'svelte/internal'; -import { exercices_idx } from '../../stores/themes.js'; +import { exercices_idx } from '$lib/stores/themes.js'; export async function load({ url }) { const eidx = get_store_value(exercices_idx); diff --git a/frontend/ui/src/routes/issues/+page.svelte b/frontend/ui/src/routes/issues/+page.svelte index 48ce67d7..763fa1be 100644 --- a/frontend/ui/src/routes/issues/+page.svelte +++ b/frontend/ui/src/routes/issues/+page.svelte @@ -10,12 +10,12 @@ Table, } from 'sveltestrap'; - import DateFormat from '../../components/DateFormat.svelte'; + import DateFormat from '$lib/components/DateFormat.svelte'; - import { issues, issues_nb_responses, issues_known_responses } from '../../stores/issues.js'; - import { settings } from '../../stores/settings.js'; + import { issues, issues_nb_responses, issues_known_responses } from '$lib/stores/issues.js'; + import { settings } from '$lib/stores/settings.js'; - import FormIssue from '../../components/FormIssue.svelte'; + import FormIssue from '$lib/components/FormIssue.svelte'; export let data; let issue = {}; diff --git a/frontend/ui/src/routes/rank/+page.svelte b/frontend/ui/src/routes/rank/+page.svelte index ff5fbc77..624bf24e 100644 --- a/frontend/ui/src/routes/rank/+page.svelte +++ b/frontend/ui/src/routes/rank/+page.svelte @@ -10,11 +10,11 @@ Row, } from 'sveltestrap'; - import { my } from '../../stores/my.js'; - import { rank } from '../../stores/teams.js'; - import { challengeInfo } from '../../stores/challengeinfo.js'; + import { my } from '$lib/stores/my.js'; + import { rank } from '$lib/stores/teams.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; - import CardTheme from '../../components/CardTheme.svelte'; + import CardTheme from '$lib/components/CardTheme.svelte'; let search = ""; diff --git a/frontend/ui/src/routes/register/+page.svelte b/frontend/ui/src/routes/register/+page.svelte index 03c30b0d..d9e9182c 100644 --- a/frontend/ui/src/routes/register/+page.svelte +++ b/frontend/ui/src/routes/register/+page.svelte @@ -11,11 +11,11 @@ import { goto } from '$app/navigation'; - import { my } from '../../stores/my.js'; - import { settings } from '../../stores/settings.js'; + import { my } from '$lib/stores/my.js'; + import { settings } from '$lib/stores/settings.js'; - import RegistrationFormCreateTeam from '../../components/RegistrationFormCreateTeam.svelte'; - import RegistrationFormJoinTeam from '../../components/RegistrationFormJoinTeam.svelte'; + import RegistrationFormCreateTeam from '$lib/components/RegistrationFormCreateTeam.svelte'; + import RegistrationFormJoinTeam from '$lib/components/RegistrationFormJoinTeam.svelte'; let form = { }; let partR = false; diff --git a/frontend/ui/src/routes/rules/+page.svelte b/frontend/ui/src/routes/rules/+page.svelte index 179c6fa9..d9412918 100644 --- a/frontend/ui/src/routes/rules/+page.svelte +++ b/frontend/ui/src/routes/rules/+page.svelte @@ -6,8 +6,8 @@ Icon, } from 'sveltestrap'; - import { challengeInfo } from '../../stores/challengeinfo.js'; - import { settings } from '../../stores/settings.js'; + import { challengeInfo } from '$lib/stores/challengeinfo.js'; + import { settings } from '$lib/stores/settings.js'; diff --git a/frontend/ui/src/routes/tags/[tag]/+page.svelte b/frontend/ui/src/routes/tags/[tag]/+page.svelte index b587c756..87cfc52b 100644 --- a/frontend/ui/src/routes/tags/[tag]/+page.svelte +++ b/frontend/ui/src/routes/tags/[tag]/+page.svelte @@ -12,9 +12,9 @@ import { goto } from '$app/navigation'; - import { themes } from '../../../stores/themes.js'; + import { themes } from '$lib/stores/themes.js'; - import CardTheme from '../../../components/CardTheme.svelte'; + import CardTheme from '$lib/components/CardTheme.svelte'; export let data;