andrea/probo-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to Skeleton 2.0

Browse source
This commit is contained in:
andrea 2023-09-07 09:51:36 +02:00
parent c77100d454
commit c41234bdf9
10 changed files with 110 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/quizzes/question_1_10.md
View file

@ -1,6 +0,0 @@
Se in un circuito sono presenti una ddp pari a 20 V e una corrente pari a 2 A
* La resistenza complessiva del circuito è pari a 10 ohm
* La resistenza complessiva del circuito è pari a 1 ohm
* La resistenza complessiva del circuito è pari a 10 A (Ampere)
* La resistenza complessiva del circuito è pari a 5 V

64
frontend/package-lock.json generated
View file

@ -10,12 +10,14 @@
"devDependencies": { "devDependencies": {
"@floating-ui/dom": "^1.4.2", "@floating-ui/dom": "^1.4.2",
"@playwright/test": "^1.28.1", "@playwright/test": "^1.28.1",
"@skeletonlabs/skeleton": "^1.8.0", "@skeletonlabs/skeleton": "^2.0.0",
"@skeletonlabs/tw-plugin": "^0.1.0",
"@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-static": "^2.0.2", "@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.5.0", "@sveltejs/kit": "^1.5.0",
"@tailwindcss/forms": "^0.5.3", "@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.9", "@tailwindcss/typography": "^0.5.9",
"@types/node": "^20.5.9",
"@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0", "@typescript-eslint/parser": "^5.45.0",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -627,22 +629,24 @@
"dev": true "dev": true
}, },
"node_modules/@skeletonlabs/skeleton": { "node_modules/@skeletonlabs/skeleton": {
"version": "1.8.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-1.8.0.tgz", "resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-2.0.0.tgz",
"integrity": "sha512-dO4ukU34MGUY1yA1Gln+YUFEEew25AHm6GMpbzCOX8p8b9NmVBWiSuF3me9jnbrV15TGJxmUGzdiRN/70b4KIg==", "integrity": "sha512-8SaDK3kEUU57cSb/5a984EbINgnOPzShlkwPkduAhqc71SEqhRvx+RlLEpe1174NAYi00oi//LguIAYuVrSfBA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"esm-env": "1.0.0", "esm-env": "1.0.0"
"svelte": "3.58.0" },
"peerDependencies": {
"svelte": "^3.56.0 || ^4.0.0"
} }
}, },
"node_modules/@skeletonlabs/skeleton/node_modules/svelte": { "node_modules/@skeletonlabs/tw-plugin": {
"version": "3.58.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/svelte/-/svelte-3.58.0.tgz", "resolved": "https://registry.npmjs.org/@skeletonlabs/tw-plugin/-/tw-plugin-0.1.0.tgz",
"integrity": "sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==", "integrity": "sha512-ufnm4FS+s/khuho4yJ/uqfW91u2YXnH3E5N541MtX9XjmoimQzYIcxWyTIuX9AM/brIPP6M6l0et3nRx17CRoQ==",
"dev": true, "dev": true,
"engines": { "peerDependencies": {
"node": ">= 8" "tailwindcss": ">=3.0.0"
} }
}, },
"node_modules/@sveltejs/adapter-auto": { "node_modules/@sveltejs/adapter-auto": {
@ -791,9 +795,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.3.2", "version": "20.5.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz",
"integrity": "sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==", "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==",
"dev": true "dev": true
}, },
"node_modules/@types/pug": { "node_modules/@types/pug": {
@ -4337,22 +4341,20 @@
"dev": true "dev": true
}, },
"@skeletonlabs/skeleton": { "@skeletonlabs/skeleton": {
"version": "1.8.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-1.8.0.tgz", "resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-2.0.0.tgz",
"integrity": "sha512-dO4ukU34MGUY1yA1Gln+YUFEEew25AHm6GMpbzCOX8p8b9NmVBWiSuF3me9jnbrV15TGJxmUGzdiRN/70b4KIg==", "integrity": "sha512-8SaDK3kEUU57cSb/5a984EbINgnOPzShlkwPkduAhqc71SEqhRvx+RlLEpe1174NAYi00oi//LguIAYuVrSfBA==",
"dev": true, "dev": true,
"requires": { "requires": {
"esm-env": "1.0.0", "esm-env": "1.0.0"
"svelte": "3.58.0" }
}, },
"dependencies": { "@skeletonlabs/tw-plugin": {
"svelte": { "version": "0.1.0",
"version": "3.58.0", "resolved": "https://registry.npmjs.org/@skeletonlabs/tw-plugin/-/tw-plugin-0.1.0.tgz",
"resolved": "https://registry.npmjs.org/svelte/-/svelte-3.58.0.tgz", "integrity": "sha512-ufnm4FS+s/khuho4yJ/uqfW91u2YXnH3E5N541MtX9XjmoimQzYIcxWyTIuX9AM/brIPP6M6l0et3nRx17CRoQ==",
"integrity": "sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==", "dev": true,
"dev": true "requires": {}
}
}
}, },
"@sveltejs/adapter-auto": { "@sveltejs/adapter-auto": {
"version": "2.1.0", "version": "2.1.0",
@ -4463,9 +4465,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "20.3.2", "version": "20.5.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz",
"integrity": "sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==", "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==",
"dev": true "dev": true
}, },
"@types/pug": { "@types/pug": {

4
frontend/package.json
View file

@ -16,12 +16,14 @@
"devDependencies": { "devDependencies": {
"@floating-ui/dom": "^1.4.2", "@floating-ui/dom": "^1.4.2",
"@playwright/test": "^1.28.1", "@playwright/test": "^1.28.1",
"@skeletonlabs/skeleton": "^1.8.0", "@skeletonlabs/skeleton": "^2.0.0",
"@skeletonlabs/tw-plugin": "^0.1.0",
"@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-static": "^2.0.2", "@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.5.0", "@sveltejs/kit": "^1.5.0",
"@tailwindcss/forms": "^0.5.3", "@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.9", "@tailwindcss/typography": "^0.5.9",
"@types/node": "^20.5.9",
"@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0", "@typescript-eslint/parser": "^5.45.0",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",

2
frontend/package.json.md5
View file

@ -1 +1 @@
eea8ec923b0db2baba8a6a71055188e7 f664f5ec1c0767f24447a20e228a8bb5

5
frontend/src/app.postcss
View file

@ -1,3 +1,8 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind variants;
/*place global styles here */ /*place global styles here */
html, html,
body { body {

22
frontend/src/lib/components/QuizCard.svelte
View file

@ -4,6 +4,8 @@
import { tick } from 'svelte'; import { tick } from 'svelte';
import EditIcon from '$lib/svg/EditIcon.svelte' import EditIcon from '$lib/svg/EditIcon.svelte'
import DeleteIcon from '$lib/svg/DeleteIcon.svelte' import DeleteIcon from '$lib/svg/DeleteIcon.svelte'
import { getModalStore } from '@skeletonlabs/skeleton';
import type { ModalSettings } from '@skeletonlabs/skeleton';
export let quiz:models.Quiz export let quiz:models.Quiz
@ -12,12 +14,16 @@
let content: string; let content: string;
let textarea: HTMLTextAreaElement; let textarea: HTMLTextAreaElement;
const modalStore = getModalStore();
async function handleKeyDown(event) { async function handleKeyDown(event) {
if (event.key === 'Escape') { if (event.key === 'Escape') {
editing = false; editing = false;
try { try {
if (content != "") {
const clientQuiz: client.Quiz = await QuizFromMarkdown(content) const clientQuiz: client.Quiz = await QuizFromMarkdown(content)
await UpdateQuiz(clientQuiz, quiz.id) await UpdateQuiz(clientQuiz, quiz.id)
}
} catch (error) { } catch (error) {
console.log("An error occurred:", error) console.log("An error occurred:", error)
} }
@ -36,11 +42,27 @@
} }
async function handleDelete() { async function handleDelete() {
const modal: ModalSettings = {
type: 'confirm',
// Data
title: 'Please Confirm',
body: 'Are you sure you wish to proceed?',
// TRUE if confirm pressed, FALSE if cancel pressed
response: async (r: boolean) => {
if (r) {
try { try {
await DeleteQuiz(quiz.id) await DeleteQuiz(quiz.id)
content = ""
} catch (error) { } catch (error) {
console.log("An error occurred:", error) console.log("An error occurred:", error)
} }
} else {
}
}
};
modalStore.trigger(modal);
} }
function handleBlur() { function handleBlur() {

11
frontend/src/routes/+layout.svelte
View file

@ -1,18 +1,17 @@
<script lang='ts'> <script lang='ts'>
// The ordering of these imports is critical to your app working properly
import '@skeletonlabs/skeleton/themes/theme-skeleton.css';
// If you have source.organizeImports set to true in VSCode, then it will auto change this ordering
import '@skeletonlabs/skeleton/styles/skeleton.css';
// Most of your app wide CSS should be put in this file // Most of your app wide CSS should be put in this file
import '../app.postcss'; import '../app.postcss';
import { AppShell, AppBar, AppRail, AppRailTile, AppRailAnchor } from '@skeletonlabs/skeleton'; import { AppShell, AppBar, AppRail, AppRailTile, AppRailAnchor } from '@skeletonlabs/skeleton';
import { initializeStores } from '@skeletonlabs/skeleton';
import { Modal } from '@skeletonlabs/skeleton';
let currentTile; let currentTile;
initializeStores();
</script> </script>
<Modal/>
<!-- App Shell --> <!-- App Shell -->
<AppShell> <AppShell>
<svelte:fragment slot="header"> <svelte:fragment slot="header">

3
frontend/src/routes/+page.svelte
View file

@ -22,9 +22,8 @@
}) })
async function handleKeyDown(event: any) { async function handleKeyDown(event: any) {
if (event.key === 'Escape') { if (event.key === 'Escape' && creatingNewQuiz) {
creatingNewQuiz = false; creatingNewQuiz = false;
try { try {
const clientQuiz: client.Quiz = await QuizFromMarkdown(newQuizContent) const clientQuiz: client.Quiz = await QuizFromMarkdown(newQuizContent)
await CreateQuiz(clientQuiz) await CreateQuiz(clientQuiz)

14
frontend/tailwind.config.cjs
View file

@ -1,14 +0,0 @@
import { join } from 'path'
import forms from '@tailwindcss/forms'
import typography from '@tailwindcss/typography'
import skeleton from '@skeletonlabs/skeleton/tailwind/skeleton.cjs'
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: 'class',
content: ['./src/**/*.{html,js,svelte,ts}', join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}')],
theme: {
extend: {},
},
plugins: [forms,typography,...skeleton()],
}

31
frontend/tailwind.config.ts Normal file
View file

@ -0,0 +1,31 @@
import { join } from 'path';
import type { Config } from 'tailwindcss';
// 1. Import the Skeleton plugin
import { skeleton } from '@skeletonlabs/tw-plugin';
const config = {
// 2. Opt for dark mode to be handled via the class method
darkMode: 'class',
content: [
'./src/**/*.{html,js,svelte,ts}',
// 3. Append the path to the Skeleton package
join(require.resolve(
'@skeletonlabs/skeleton'),
'../**/*.{html,js,svelte,ts}'
)
],
theme: {
extend: {},
},
plugins: [
skeleton({
themes: {
// Register each theme within this array:
preset: ["skeleton", "modern", "crimson"]
}
})
]
} satisfies Config;
export default config;