From 35791f3fc60e2e7e33e740ed8d423c89c7e1b44a Mon Sep 17 00:00:00 2001 From: Gini24mp Date: Sat, 1 Jun 2024 13:28:45 +0200 Subject: [PATCH] fix to incorrect formating to ensure linter passes --- .../lib/components/admin/+Activities.svelte | 5 +- .../src/lib/components/admin/+Admins.svelte | 4 +- .../components/admin/+Announcements.svelte | 4 +- .../src/lib/components/admin/+Lectures.svelte | 6 +- .../components/admin/+Notifications.svelte | 41 -- .../lib/components/admin/+Organisation.svelte | 5 +- .../src/lib/components/admin/+Profile.svelte | 5 +- .../src/lib/components/admin/+Students.svelte | 4 +- .../authentication/+SignInForm.svelte | 3 +- .../authentication/+SignUpForm.svelte | 2 +- .../components/utils/+AuroraBackground.svelte | 37 -- src/client/src/lib/components/utils/cn.ts | 7 - src/client/src/routes/activities/+page.ts | 18 - src/client/src/routes/announcements/+page.ts | 18 - src/client/src/routes/demo/+page.svelte | 19 - src/client/src/routes/demo/+page.ts | 0 src/client/src/routes/lecturers/+page.ts | 18 - src/client/src/routes/organisation/+page.ts | 18 - src/client/src/routes/profile/+page.ts | 18 - src/client/src/routes/settings/+page.ts | 18 - src/client/src/routes/signin/+page.server.js | 2 + src/client/src/routes/signin/+page.svelte | 2 - src/client/src/routes/signup/+page.server.js | 5 + src/client/src/routes/signup/+page.svelte | 2 - src/client/src/routes/students/+page.ts | 18 - src/client/src/routes/sverdle/+page.svelte | 409 ------------------ src/client/tailwind.config.ts | 18 +- 27 files changed, 23 insertions(+), 683 deletions(-) delete mode 100644 src/client/src/lib/components/admin/+Notifications.svelte delete mode 100644 src/client/src/lib/components/utils/+AuroraBackground.svelte delete mode 100644 src/client/src/lib/components/utils/cn.ts delete mode 100644 src/client/src/routes/demo/+page.svelte delete mode 100644 src/client/src/routes/demo/+page.ts delete mode 100644 src/client/src/routes/sverdle/+page.svelte diff --git a/src/client/src/lib/components/admin/+Activities.svelte b/src/client/src/lib/components/admin/+Activities.svelte index 3e0fa37d..0c028156 100644 --- a/src/client/src/lib/components/admin/+Activities.svelte +++ b/src/client/src/lib/components/admin/+Activities.svelte @@ -1,7 +1,6 @@ - -

Notifications

- -{#each activities as activity} -
-
- -
- User avatar - -
-

Student requested workspace access

-
-
-
-{/each} diff --git a/src/client/src/lib/components/admin/+Organisation.svelte b/src/client/src/lib/components/admin/+Organisation.svelte index caca7bd9..79e1de5c 100644 --- a/src/client/src/lib/components/admin/+Organisation.svelte +++ b/src/client/src/lib/components/admin/+Organisation.svelte @@ -1,8 +1,5 @@ - -
-
-
-
-
- -
-
diff --git a/src/client/src/lib/components/utils/cn.ts b/src/client/src/lib/components/utils/cn.ts deleted file mode 100644 index e2fb668e..00000000 --- a/src/client/src/lib/components/utils/cn.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { clsx } from 'clsx'; -import type { ClassValue } from 'clsx'; -import { twMerge } from 'tailwind-merge'; - -export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); -} diff --git a/src/client/src/routes/activities/+page.ts b/src/client/src/routes/activities/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/activities/+page.ts +++ b/src/client/src/routes/activities/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/announcements/+page.ts b/src/client/src/routes/announcements/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/announcements/+page.ts +++ b/src/client/src/routes/announcements/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/demo/+page.svelte b/src/client/src/routes/demo/+page.svelte deleted file mode 100644 index 648926d2..00000000 --- a/src/client/src/routes/demo/+page.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - - -
-
-
- -
-
- -
-
-
- diff --git a/src/client/src/routes/demo/+page.ts b/src/client/src/routes/demo/+page.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/client/src/routes/lecturers/+page.ts b/src/client/src/routes/lecturers/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/lecturers/+page.ts +++ b/src/client/src/routes/lecturers/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/organisation/+page.ts b/src/client/src/routes/organisation/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/organisation/+page.ts +++ b/src/client/src/routes/organisation/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/profile/+page.ts b/src/client/src/routes/profile/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/profile/+page.ts +++ b/src/client/src/routes/profile/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/settings/+page.ts b/src/client/src/routes/settings/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/settings/+page.ts +++ b/src/client/src/routes/settings/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/signin/+page.server.js b/src/client/src/routes/signin/+page.server.js index 27df2a05..ecbb4d7f 100644 --- a/src/client/src/routes/signin/+page.server.js +++ b/src/client/src/routes/signin/+page.server.js @@ -2,6 +2,8 @@ // Mock sign-in function async function signIn(email, password) { + console.log(email); + console.log(password); // In a real application, you would send these credentials to your server // and get an access token in response. Here we're just generating a mock token. const mockToken = 'mocktoken12345678910'; diff --git a/src/client/src/routes/signin/+page.svelte b/src/client/src/routes/signin/+page.svelte index ffdb0727..dcf2483d 100644 --- a/src/client/src/routes/signin/+page.svelte +++ b/src/client/src/routes/signin/+page.svelte @@ -1,8 +1,6 @@
diff --git a/src/client/src/routes/signup/+page.server.js b/src/client/src/routes/signup/+page.server.js index 1570a0ce..b2d64229 100644 --- a/src/client/src/routes/signup/+page.server.js +++ b/src/client/src/routes/signup/+page.server.js @@ -1,6 +1,11 @@ /** @type {import('./$types').Actions} */ // Mock sign-in function async function signUp(name, email, password, org_name, image_file) { + console.log(name); + console.log(email); + console.log(password); + console.log(org_name); + console.log(image_file.name); // In a real application, you would send these credentials to your server // and get an access token in response. Here we're just generating a mock token. const mockToken = 'mocktoken12345678910'; diff --git a/src/client/src/routes/signup/+page.svelte b/src/client/src/routes/signup/+page.svelte index 56b6899d..04d9c222 100644 --- a/src/client/src/routes/signup/+page.svelte +++ b/src/client/src/routes/signup/+page.svelte @@ -1,8 +1,6 @@
diff --git a/src/client/src/routes/students/+page.ts b/src/client/src/routes/students/+page.ts index 80080dbd..e69de29b 100644 --- a/src/client/src/routes/students/+page.ts +++ b/src/client/src/routes/students/+page.ts @@ -1,18 +0,0 @@ -export async function load({ page, fetch, session, context }) { - // Fetch some data here. For example: - // const res = await fetch('/api/some-endpoint'); - // const data = await res.json(); - // if (res.ok) { - // return { - // props: { - // data - // } - // }; - // } else { - // // If there was an error, you can return an error status and message - // return { - // status: res.status, - // error: new Error(`Could not load data: ${data.message}`) - // }; - // } -} diff --git a/src/client/src/routes/sverdle/+page.svelte b/src/client/src/routes/sverdle/+page.svelte deleted file mode 100644 index 6fa44180..00000000 --- a/src/client/src/routes/sverdle/+page.svelte +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - Sverdle - - - -

Sverdle

- -
{ - // prevent default callback from resetting the form - return ({ update }) => { - update({ reset: false }); - }; - }} -> - How to play - -
- {#each Array.from(Array(6).keys()) as row (row)} - {@const current = row === i} - -
- {#each Array.from(Array(5).keys()) as column (column)} - {@const guess = current ? currentGuess : data.guesses[row]} - {@const answer = data.answers[row]?.[column]} - {@const value = guess?.[column] ?? ''} - {@const selected = current && column === guess.length} - {@const exact = answer === 'x'} - {@const close = answer === 'c'} - {@const missing = answer === '_'} -
- {value} - - -
- {/each} -
- {/each} -
- -
- {#if won || data.answers.length >= 6} - {#if !won && data.answer} -

the answer was "{data.answer}"

- {/if} - - {:else} -
- - - - - {#each ['qwertyuiop', 'asdfghjkl', 'zxcvbnm'] as row} -
- {#each row as letter} - - {/each} -
- {/each} -
- {/if} -
-
- -{#if won} -
-{/if} - - diff --git a/src/client/tailwind.config.ts b/src/client/tailwind.config.ts index 9a7b2dbc..51a0e924 100644 --- a/src/client/tailwind.config.ts +++ b/src/client/tailwind.config.ts @@ -1,5 +1,3 @@ -const { default: flattenColorPalette } = require('tailwindcss/lib/util/flattenColorPalette'); - const config = { content: [ './src/**/*.{html,js,svelte,ts}', @@ -7,7 +5,7 @@ const config = { './src/**/*.{ts,tsx}' ], - plugins: [require('@tailwindcss/typography'), require('flowbite/plugin'), addVariablesForColors], + plugins: [require('@tailwindcss/typography'), require('flowbite/plugin')], darkMode: 'class', @@ -51,16 +49,4 @@ const config = { } }; -module.exports = config; - -// This plugin adds each Tailwind color as a global CSS variable, e.g. var(--gray-200). -function addVariablesForColors({ addBase, theme }: any) { - const allColors = flattenColorPalette(theme('colors')); - const newVars = Object.fromEntries( - Object.entries(allColors).map(([key, val]) => [`--${key}`, val]) - ); - - addBase({ - ':root': newVars - }); -} +export default config;