From 1b3279a07eb108ffa44358126860377b45dba474 Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Fri, 8 Dec 2023 10:39:05 +0100 Subject: [PATCH 01/33] revert delay graph --- netlify.toml | 6 +- netlify/functions/lectiodelay.mjs | 116 ----------------------------- package-lock.json | 4 +- src/routes/api/getdelay/+server.js | 36 --------- src/routes/auth/+page.svelte | 24 +----- 5 files changed, 4 insertions(+), 182 deletions(-) delete mode 100644 netlify/functions/lectiodelay.mjs delete mode 100644 src/routes/api/getdelay/+server.js diff --git a/netlify.toml b/netlify.toml index 96e4b97d..572afda1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,3 @@ [build] command = "npm run build" - publish = "build" - - -[functions."lectiodelay"] - schedule = "@hourly" \ No newline at end of file + publish = "build" \ No newline at end of file diff --git a/netlify/functions/lectiodelay.mjs b/netlify/functions/lectiodelay.mjs deleted file mode 100644 index 3e1e2f92..00000000 --- a/netlify/functions/lectiodelay.mjs +++ /dev/null @@ -1,116 +0,0 @@ -/* eslint-disable array-bracket-spacing */ -/* eslint-disable camelcase */ -import { addDoc, collection, getDocs, getFirestore } from 'firebase/firestore'; -import { deleteApp, getApp, getApps, initializeApp } from 'firebase/app'; -const QuickChart = require('quickchart-js'); -const chart = new QuickChart(); - -const firebaseConfig = { - apiKey: 'AIzaSyA0PfQiXswZmGxwoyMVGrs3r7ocwv73Ako', - authDomain: 'betterlectio-36bb9.firebaseapp.com', - projectId: 'betterlectio-36bb9', - storageBucket: 'betterlectio-36bb9.appspot.com', - messagingSenderId: '1068596128158', - appId: '1:1068596128158:web:9dffe9cfdf8bb8d2b80e8f' -}; - -let firebase; -if (!getApps().length) { - firebase = initializeApp(firebaseConfig); -} else { - firebase = getApp(); - deleteApp(firebase); - firebase = initializeApp(firebaseConfig); -} - -// this function is called by Netlify Functions every hour to log the current Lectio latency -// it will later be used to create a graph of Lectio latency over time -export default async req => { - console.log('Received'); - - const startmillis = Date.now(); - await fetch('https://lectio.dk'); - const endmillis = Date.now(); - - console.log(`Current Lectio delay: ${endmillis - startmillis}ms`); - - const db = getFirestore(); - const delayRef = collection(db, 'Lectio Delay'); - - // get the last 100 documents from the Lectio Delay collection - const querySnapshot = await getDocs(delayRef); - const docs = []; - querySnapshot.forEach(doc => { - docs.push(doc.data()); - }); - - // fort the docs by time.seconds - docs.sort((a, b) => a.time.seconds - b.time.seconds); - - // if over 50 documents, only use the - if (docs.length > 50) docs.splice(0, docs.length - 50); - - const labels = []; - const characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; - const wordLength = 8; - - docs.forEach(doc => { - let word = ''; - for (let i = 0; i < wordLength; i++) { - const randomIndex = Math.floor(Math.random() * characters.length); - word += characters[randomIndex]; - } - labels.push(word); - }); - - const data = []; - docs.forEach(doc => { - data.push(doc.delay); - }); - - // create a graph of Lectio latency over time - chart.setWidth(100); - chart.setHeight(48); - chart.setVersion('2'); - - chart.setConfig({ - type: 'line', - data: { - labels, - datasets: [{ - data, - fill: false, - borderColor: '#000000', - borderWidth: 2, - pointRadius: 0 - }] - }, - options: { - legend: { display: false }, - scales: { - xAxes: [{ - display: false, - gridLines: { display: false } - }], - yAxes: [{ - display: false, - gridLines: { display: false } - }] - } - } - }); - - // Print the chart URL - console.log(chart.getUrl()); - - // open the Lectio Delay collection - // add a document to the collection with the time and delay - const docRef = await addDoc(delayRef, { - time: new Date(), - delay: endmillis - startmillis, - imgUrl: chart.getUrl() - }); - - console.log(`Document written with ID: ${docRef.id}`); -}; - diff --git a/package-lock.json b/package-lock.json index f08c5556..dabbee0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "betterlectio", - "version": "0.10.132", + "version": "0.10.136", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "betterlectio", - "version": "0.10.132", + "version": "0.10.136", "dependencies": { "@event-calendar/core": "^1.5.0", "@event-calendar/time-grid": "^1.5.0", diff --git a/src/routes/api/getdelay/+server.js b/src/routes/api/getdelay/+server.js deleted file mode 100644 index 1be9dad8..00000000 --- a/src/routes/api/getdelay/+server.js +++ /dev/null @@ -1,36 +0,0 @@ -import { collection, getDocs, getFirestore } from 'firebase/firestore'; -import { deleteApp, getApp, getApps, initializeApp } from 'firebase/app'; - -const firebaseConfig = { - apiKey: 'AIzaSyA0PfQiXswZmGxwoyMVGrs3r7ocwv73Ako', - authDomain: 'betterlectio-36bb9.firebaseapp.com', - projectId: 'betterlectio-36bb9', - storageBucket: 'betterlectio-36bb9.appspot.com', - messagingSenderId: '1068596128158', - appId: '1:1068596128158:web:9dffe9cfdf8bb8d2b80e8f' -}; - -let firebase; -if (!getApps().length) { - firebase = initializeApp(firebaseConfig); -} else { - firebase = getApp(); - deleteApp(firebase); - firebase = initializeApp(firebaseConfig); -} - -/** @type {import('./$types').RequestHandler} */ -export async function GET() { - // firebase stuff - const db = getFirestore(); - const delayRef = collection(db, 'Lectio Delay'); - const querySnapshot = await getDocs(delayRef); - const docs = querySnapshot.docs.map(doc => doc.data()); - const doc = docs[0]; - let docIndex = 0; - docs.forEach(doc => { - if (doc.time.seconds > docs[docIndex].time.seconds) docIndex = docs.indexOf(doc); - }); - - return new Response(JSON.stringify(docs[docIndex])); -} diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index f60c2134..87c95de8 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -131,16 +131,6 @@ console.log(`Error scanning file. Reason: ${err}`); }); } - - let delayGraphUrl = ''; - let delayGraphAvailable = false; - let delay = 0; - fetch('/api/getdelay').then(res => res.json()).then(json => { - delayGraphUrl = json.imgUrl; - delay = json.delay; - console.log(delayGraphUrl); - if (delayGraphUrl !== '' && delayGraphUrl.includes('https://quickchart.io/chart?c=')) delayGraphAvailable = true; - });
@@ -257,19 +247,7 @@ Servicevilkår & Privatlivspolitik

-
- {#if delayGraphAvailable} - {#key delayGraphUrl} -
- -
-

{delay} ms

-

gns. Lectio responstid

-

Graf over de sidste 50 timer

-
-
- {/key} - {/if} +
+{/if} \ No newline at end of file From 0fd060f1221db86c083477a71d25b1f87632de9a Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 15 Dec 2023 19:09:22 +0000 Subject: [PATCH 08/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 052688a8..3532aa96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.139", + "version": "0.10.140", "private": true, "scripts": { "dev": "vite dev", From ab7eac2df179bc99c6ed6cc93558d24b6b25bcb3 Mon Sep 17 00:00:00 2001 From: jona799t Date: Sat, 16 Dec 2023 00:54:20 +0100 Subject: [PATCH 09/33] =?UTF-8?q?Begyndt=20p=C3=A5=20lykkehjul?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 19 ++- package.json | 3 +- .../v\303\246rkt\303\270jer/+page.svelte" | 6 + .../lykkehjul/+page.svelte" | 140 ++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 "src/routes/v\303\246rkt\303\270jer/lykkehjul/+page.svelte" diff --git a/package-lock.json b/package-lock.json index dabbee0d..5a9cd331 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,18 @@ { "name": "betterlectio", - "version": "0.10.136", + "version": "0.10.139", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "betterlectio", - "version": "0.10.136", + "version": "0.10.139", "dependencies": { "@event-calendar/core": "^1.5.0", "@event-calendar/time-grid": "^1.5.0", "@netlify/functions": "^2.4.0", "@sentry/sveltekit": "^7.80.0", + "chartjs-plugin-datalabels": "^2.2.0", "crypto-es": "^2.1.0", "dompurify": "^3.0.5", "firebase": "^10.6.0", @@ -2104,6 +2105,14 @@ "pnpm": "^7.0.0" } }, + "node_modules/chartjs-plugin-datalabels": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz", + "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==", + "peerDependencies": { + "chart.js": ">=3.0.0" + } + }, "node_modules/chokidar": { "version": "3.5.3", "funding": [ @@ -6572,6 +6581,12 @@ "@kurkle/color": "^0.3.0" } }, + "chartjs-plugin-datalabels": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz", + "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==", + "requires": {} + }, "chokidar": { "version": "3.5.3", "requires": { diff --git a/package.json b/package.json index 3532aa96..4baee9a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.140", + "version": "0.10.139", "private": true, "scripts": { "dev": "vite dev", @@ -36,6 +36,7 @@ "@event-calendar/time-grid": "^1.5.0", "@netlify/functions": "^2.4.0", "@sentry/sveltekit": "^7.80.0", + "chartjs-plugin-datalabels": "^2.2.0", "crypto-es": "^2.1.0", "dompurify": "^3.0.5", "firebase": "^10.6.0", diff --git "a/src/routes/v\303\246rkt\303\270jer/+page.svelte" "b/src/routes/v\303\246rkt\303\270jer/+page.svelte" index c24b6d60..1a483221 100644 --- "a/src/routes/v\303\246rkt\303\270jer/+page.svelte" +++ "b/src/routes/v\303\246rkt\303\270jer/+page.svelte" @@ -53,6 +53,12 @@ link: '/værktøjer/googlecalsync', description: 'Synkroniser dine moduler med din google kalender', status: 'BETA' + }, + { + title: 'Lykkehjul', + link: '/værktøjer/lykkehjul', + description: 'Når du har brug for en nem og sjov måde at på at vælge en tilfældig elev.', + status: 'BETA' } ], 'Lectio (vi arbejder på at flytte disse sider til BetterLectio)': [ diff --git "a/src/routes/v\303\246rkt\303\270jer/lykkehjul/+page.svelte" "b/src/routes/v\303\246rkt\303\270jer/lykkehjul/+page.svelte" new file mode 100644 index 00000000..65ccc8a9 --- /dev/null +++ "b/src/routes/v\303\246rkt\303\270jer/lykkehjul/+page.svelte" @@ -0,0 +1,140 @@ + + +
+
+

Lykkehjul

+ {#if valgteMedlemmer.length > 0} +

↓

+ `${medlem.fornavn} ${medlem.efternavn}`), + datasets: [ + { data: valgteMedlemmer.map(() => 1) } + ] + }} {options} {plugins} on:click={spin}/> + {:else} +

Vælg et hold for at begynde

+ {/if} +
+
+ {#if page === 'hold'} +

Vælg et hold

+
+ {#each holdOgGrupper as hold } + + {/each} +
+ {:else if page === 'medlemmer'} +
+

Vælg medlemmer

+ +
+
+ {#each medlemmer as medlem } + + {/each} +
+ {/if} +
+
+ + +
+

{medlemmer[vinderIndeks]?.fornavn} {medlemmer[vinderIndeks]?.efternavn} har vundet!

+

Du har nu 2 muligheder

+
+
+ + +
+
+
+ From 39f010b3d912fc27a0858a60dfc2637c8d47b7da Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 15 Dec 2023 23:54:34 +0000 Subject: [PATCH 10/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4baee9a3..1ad0fc6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.139", + "version": "0.10.140", "private": true, "scripts": { "dev": "vite dev", From 90afd9d1957268d0b0326e60d542de8a9ba2a4a2 Mon Sep 17 00:00:00 2001 From: victor Date: Sat, 16 Dec 2023 14:25:05 +0100 Subject: [PATCH 11/33] documents native download start --- src/lib/js/http.js | 17 +++++++++++++++++ src/routes/dokumenter/+page.svelte | 15 +++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/lib/js/http.js b/src/lib/js/http.js index 6a481142..93c1632d 100644 --- a/src/lib/js/http.js +++ b/src/lib/js/http.js @@ -94,3 +94,20 @@ export async function post(endpoint, body) { const response = await get(endpoint, body); return response; } + + +export async function getDocument(id) { + const url = `${api}/dokument_hent?id=${id}`; + const response = await fetch(url, + { + headers: + { + 'lectio-cookie': localStorage.getItem('lectio-cookie'), + 'Access-Control-Allow-Origin': '*' + } + }, { method: 'GET' }); + + const blob = await response.blob(); + const urlBlob = URL.createObjectURL(blob); + return urlBlob; +} diff --git a/src/routes/dokumenter/+page.svelte b/src/routes/dokumenter/+page.svelte index 07074b96..7f3071c8 100644 --- a/src/routes/dokumenter/+page.svelte +++ b/src/routes/dokumenter/+page.svelte @@ -1,7 +1,7 @@ -
-
+
+ {#each _besked.vedhæftninger as vedhæftning} + + {/each} + {#if MessageAttachments.length === 0} {#each _besked.vedhæftninger as vedhæftning} - - {/each} - - {#each MessageAttachments as attachment} - + attemptPreviewAttachment(vedhæftning.href)}>{vedhæftning.navn} {/each} + {/if} + +
+
+ {#each MessageAttachments as attachment} +
+ +
+ +
+
+ {/each} +
+ {#if MessageAttachments.length > 0 || _besked.vedhæftninger.length > 0} +
+ {/if}

{@html sanitize(md.render(_besked.besked)).replace(' Date: Sun, 17 Dec 2023 00:31:35 +0000 Subject: [PATCH 16/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be98c026..b3cde37a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.141", + "version": "0.10.142", "private": true, "scripts": { "dev": "vite dev", From ef2d5af230a34699176dfe4c27c768d7f7945b2b Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Mon, 18 Dec 2023 12:26:49 +0100 Subject: [PATCH 17/33] fix bug related to previewing MessageAttachments --- src/routes/besked/+page.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/besked/+page.svelte b/src/routes/besked/+page.svelte index 935cd8d5..6377a6f3 100644 --- a/src/routes/besked/+page.svelte +++ b/src/routes/besked/+page.svelte @@ -15,6 +15,7 @@ let beskedChain = null; let linkPreviewBox = ''; let beskedModtagere = ''; + let MessageAttachments = []; get(`/besked?id=${ beskedId}`).then(data => { beskedChain = data.beskeder; @@ -46,6 +47,7 @@ else addNotification('Beskeden blev sendt.', 'alert-success'); get(`/besked?id=${ beskedId}`).then(data => { + MessageAttachments = []; beskedChain = data.beskeder; beskedModtagere = data.modtagere; }); @@ -62,6 +64,7 @@ get(`/besked?id=${ beskedId}`).then(data => { beskedChain = data.beskeder; beskedModtagere = data.modtagere; + MessageAttachments = []; updating = false; }); } @@ -97,8 +100,6 @@ }); } - - let MessageAttachments = []; async function fetchMessageAttachment(attachment) { console.log(attachment); From 461e24f4d740ebc9f0ef75e025e47197aaa86b62 Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Mon, 18 Dec 2023 12:34:28 +0100 Subject: [PATCH 18/33] Add toggle functionality for message attachments visibility --- src/routes/besked/+page.svelte | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/routes/besked/+page.svelte b/src/routes/besked/+page.svelte index 6377a6f3..3045ed88 100644 --- a/src/routes/besked/+page.svelte +++ b/src/routes/besked/+page.svelte @@ -16,6 +16,7 @@ let linkPreviewBox = ''; let beskedModtagere = ''; let MessageAttachments = []; + let attachmentsHidden = false; get(`/besked?id=${ beskedId}`).then(data => { beskedChain = data.beskeder; @@ -127,15 +128,8 @@ // only continue if the file is an image if (!file.type.startsWith('image/')) return; - - // create a new image element - const img = document.createElement('img'); - img.src = url; - img.alt = attachment.navn; - img.className = 'rounded-xl'; - - // append the image to the div MessageAttachments = [...MessageAttachments, url]; + attachmentsHidden = true; return url; }); }); @@ -195,7 +189,7 @@ {fetchMessageAttachment(vedhæftning)}

{/each} - {#if MessageAttachments.length === 0} + {#if !attachmentsHidden} {#each _besked.vedhæftninger as vedhæftning} attemptPreviewAttachment(vedhæftning.href)}>{vedhæftning.navn} {/each} + {:else} + {#if MessageAttachments.length > 0} + + {/if} {/if}
From 3d8850b6c1ec3d9ef36c9e265252280bf8ca2d1d Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 18 Dec 2023 11:34:49 +0000 Subject: [PATCH 19/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3cde37a..ed8fe619 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.142", + "version": "0.10.143", "private": true, "scripts": { "dev": "vite dev", From ceadf7d5cc57be09a5f08f60a4aca49f82871648 Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Mon, 18 Dec 2023 16:08:49 +0100 Subject: [PATCH 20/33] login "remember me" functionality --- src/routes/auth/+page.server.js | 62 ++++++++++++++++++++++++++++++- src/routes/auth/+page.svelte | 26 ++++++------- src/routes/logout/+page.server.js | 3 ++ 3 files changed, 75 insertions(+), 16 deletions(-) diff --git a/src/routes/auth/+page.server.js b/src/routes/auth/+page.server.js index 8e836ce6..d28e2fea 100644 --- a/src/routes/auth/+page.server.js +++ b/src/routes/auth/+page.server.js @@ -1,7 +1,7 @@ import { fail, redirect } from '@sveltejs/kit'; import { superValidate } from 'sveltekit-superforms/server'; -import { z } from 'zod'; import { validCookie } from '$lib/js/serverCookies.js'; +import { z } from 'zod'; const schema = z.object({ @@ -11,7 +11,8 @@ const schema = z.object({ id: z.string().min(2).max(4), skole: z.string().min(2).max(268), skoleid: z.string().min(2).max(4) - }) + }), + remember: z.boolean().optional() }); export const load = (async ({ cookies, url }) => { @@ -24,6 +25,50 @@ export const load = (async ({ cookies, url }) => { } } const form = await superValidate(schema); + + let persistantSession = cookies.get('persistant-session'); + if (persistantSession) { + persistantSession = JSON.parse(persistantSession); + form.data.username = persistantSession.username; + form.data.school = persistantSession.school; + + // login and redirect if valid + const response = await fetch(`https://api.betterlectio.dk/auth`, { + headers: { + brugernavn: persistantSession.username, + adgangskode: persistantSession.password, + skoleid: persistantSession.school.skoleid + } + }); + + if (response.ok) { + // get the set-lectio-cookie header + const lectioCookie = response.headers.get('set-lectio-cookie'); + + // set a cookie with the lectio cookie + cookies.set('lectio-cookie', lectioCookie, { + path: '/', + maxAge: 60 * 60 * 24 * 7 // 1 week + }); + + // if remember me is checked, set a persistant session cookie + if (form.data.remember) { + cookies.set('persistant-session', JSON.stringify({ + username: form.data.username, + password: form.data.password, + school: form.data.school + }), { + path: '/', + secure: true, + maxAge: 60 * 60 * 24 * 365 // 1 year + }); + } + + // redirect to the homepage (in future change to the page the user was on before logging in, but for now just redirect to the homepage because im lazy :) ) + throw redirect(302, '/forside'); + } + } + return { form }; }); @@ -59,6 +104,19 @@ export const actions = { return fail(401, { form }); } + // if remember me is checked, set a persistant session cookie + if (form.data.remember) { + cookies.set('persistant-session', JSON.stringify({ + username: form.data.username, + password: form.data.password, + school: form.data.school + }), { + path: '/', + secure: true, + maxAge: 60 * 60 * 24 * 365 // 1 year + }); + } + return { form }; } }; diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index 85f61115..5859d6b8 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -260,20 +260,18 @@ />
- {#if api === 'http://localhost:5000'} -
-
- - -
- {/if} +
+
+ + +

Denne side bruger cookies til at huske dine oplysninger til næste gang, du logger ind. Når du logger ind, accepterer du, at din diff --git a/src/routes/logout/+page.server.js b/src/routes/logout/+page.server.js index 41aa38b7..27377baa 100644 --- a/src/routes/logout/+page.server.js +++ b/src/routes/logout/+page.server.js @@ -5,6 +5,9 @@ export function load({ cookies }) { // if the lectio-cookie is set, delete it and redirect to the auth page if (cookies.get('lectio-cookie')) cookies.delete('lectio-cookie'); + // also delete the persistant-session cookie + if (cookies.get('persistant-session')) cookies.delete('persistant-session'); + // if the lectio-cookie is not set, redirect to the auth page throw redirect(302, '/auth'); From ce4d47514849b6b50bfb18de0851ceeeef88dda0 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 18 Dec 2023 15:09:07 +0000 Subject: [PATCH 21/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed8fe619..2e9a5364 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.143", + "version": "0.10.144", "private": true, "scripts": { "dev": "vite dev", From 8f821f144b7c82a34e76df40019093a5601b74de Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Thu, 21 Dec 2023 16:39:32 +0100 Subject: [PATCH 22/33] fix ui bug on small devices in auth --- src/routes/auth/+page.svelte | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index 5859d6b8..a4e93aef 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -165,6 +165,20 @@ } + +

+
+
+ +
+

Vigtig information vedrørende cookies

+

For at opretholde en vedvarende login-session kræver det, at vi gemmer dine oplysninger i en cookie. Vi fraskriver os ethvert ansvar i tilfælde af uautoriseret adgang til dine oplysninger som følge af denne lagring.

+
+ +
+
+ +
{#key isInAutoAuth} {#if !isInAutoAuth} @@ -248,8 +262,8 @@ > -
-
+
+
-
+
- +

From 1d8ddeddcbb24e11daaa7f55224417719ef56f14 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 21 Dec 2023 15:39:51 +0000 Subject: [PATCH 23/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e9a5364..c3703b65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "0.10.144", + "version": "0.10.145", "private": true, "scripts": { "dev": "vite dev", From e0bdc2fe4dd28ed7a759e9041598221386064fa0 Mon Sep 17 00:00:00 2001 From: Victor Digital Date: Thu, 21 Dec 2023 17:10:17 +0100 Subject: [PATCH 24/33] se info i indtillinger --- src/routes/indstillinger/+page.server.js | 12 +++++++ src/routes/indstillinger/+page.svelte | 4 ++- .../indstillinger/routes/Generelt.svelte | 33 ++++++++++++++++++- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/routes/indstillinger/+page.server.js diff --git a/src/routes/indstillinger/+page.server.js b/src/routes/indstillinger/+page.server.js new file mode 100644 index 00000000..2a636a3b --- /dev/null +++ b/src/routes/indstillinger/+page.server.js @@ -0,0 +1,12 @@ +/** @type {import('./$types').PageServerLoad} */ +export async function load({ cookies, url }) { + // check if the cookie "persistant-session" exists + // if it does, return true + // if it doesn't, return false + + const persistantSession = cookies.get('persistant-session'); + if (persistantSession) return { persistantSession: true, persistantSessionUsername: JSON.parse(persistantSession).username }; + + + return { persistantSession: false }; +} diff --git a/src/routes/indstillinger/+page.svelte b/src/routes/indstillinger/+page.svelte index dc1ac1d7..bffb2e8c 100644 --- a/src/routes/indstillinger/+page.svelte +++ b/src/routes/indstillinger/+page.svelte @@ -6,10 +6,12 @@ // import Tilslut from './routes/Tilslut.svelte'; import Generelt from './routes/Generelt.svelte'; import { version } from '$app/environment'; + + export let data;

- + + {#if submissionStatus} + {#if submissionStatus === 'submitting'} + + {:else if submissionStatus === 'success'} + + {:else if submissionStatus === 'error'} + + {/if} + {:else} + + {/if} + +
+ +
+

Fejl rapportering sker gennem Google Forms. Du kan se alle deres vilkår og betingelser her.

+ From b2142d1944f3eed14e235faac1511dcc4e0f36fb Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 3 Jan 2024 18:52:28 +0000 Subject: [PATCH 33/33] Opdaterede versionen --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68bc677b..a863e45b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "betterlectio", - "version": "1.1.4", + "version": "1.1.5", "private": true, "scripts": { "dev": "vite dev",