diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4df0c4b..0d88c25 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,6 +1,14 @@ { - "name": "frontend", - "lockfileVersion": 2, "requires": true, - "packages": {} + "lockfileVersion": 1, + "dependencies": { + "@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==" + }, + "svelte_pages": { + "version": "file:svelte" + } + } } diff --git a/frontend/svelte/README.md b/frontend/svelte/README.md index 4f36e87..d443f6b 100644 --- a/frontend/svelte/README.md +++ b/frontend/svelte/README.md @@ -6,4 +6,8 @@ ## Run the docker container -``docker run --name svelte -dp 5173:5173 svelte`` \ No newline at end of file +``docker run --name svelte -dp 5173:5173 svelte`` + +## Mastercommand for rebuild run etc. + +``docker build -t svelte .;docker stop svelte;docker rm svelte; docker run --name svelte -dp 5173:5173 svelte`` \ No newline at end of file diff --git a/frontend/svelte/package-lock.json b/frontend/svelte/package-lock.json index 3586104..beb453c 100644 --- a/frontend/svelte/package-lock.json +++ b/frontend/svelte/package-lock.json @@ -1,16 +1,23 @@ { - "name": "svelte", + "name": "svelte_pages", "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "svelte", + "name": "svelte_pages", "version": "0.0.1", + "dependencies": { + "bootstrap-icons": "^1.9.1" + }, + "dependencies": { + "nookies": "^2.5.2" + }, "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", - "svelte": "^3.44.0", + "@types/bootstrap": "^5.2.4", + "@zerodevx/svelte-toast": "^0.7.2", "svelte-check": "^2.7.1", "svelte-preprocess": "^4.10.6", "tslib": "^2.3.1", @@ -171,6 +178,16 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rollup/pluginutils": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", @@ -286,6 +303,15 @@ } } }, + "node_modules/@types/bootstrap": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.4.tgz", + "integrity": "sha512-jGNB81zuDHu1DPvBV7Ox3Z3eyzdWPNguYwrt0j7X90VExA8H7c6qxJh0cz5j3xp0XvSy1TYaP2pkyXCHeo8CaA==", + "dev": true, + "dependencies": { + "@popperjs/core": "^2.9.2" + } + }, "node_modules/@types/cookie": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.1.tgz", @@ -335,6 +361,12 @@ "nft": "out/cli.js" } }, + "node_modules/@zerodevx/svelte-toast": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@zerodevx/svelte-toast/-/svelte-toast-0.7.2.tgz", + "integrity": "sha512-vWiY6IqsstcOoQ8PFBuFuxgPkj1JFAGhUF9gC7wLx7c5A9SSfdtxWs/39ekGSIeyJK0yqWhTcmzGrCEWSELzDw==", + "dev": true + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -436,6 +468,11 @@ "file-uri-to-path": "1.0.0" } }, + "node_modules/bootstrap-icons": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.9.1.tgz", + "integrity": "sha512-d4ZkO30MIkAhQ2nNRJqKXJVEQorALGbLWTuRxyCTJF96lRIV6imcgMehWGJUiJMJhglN0o2tqLIeDnMdiQEE9g==" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1558,6 +1595,23 @@ "node-gyp-build-test": "build-test.js" } }, + "node_modules/nookies": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/nookies/-/nookies-2.5.2.tgz", + "integrity": "sha512-x0TRSaosAEonNKyCrShoUaJ5rrT5KHRNZ5DwPCuizjgrnkpE5DRf3VL7AyyQin4htict92X1EQ7ejDbaHDVdYA==", + "dependencies": { + "cookie": "^0.4.1", + "set-cookie-parser": "^2.4.6" + } + }, + "node_modules/nookies/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -1920,8 +1974,7 @@ "node_modules/set-cookie-parser": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", - "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==", - "dev": true + "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==" }, "node_modules/signal-exit": { "version": "3.0.7", @@ -2037,6 +2090,7 @@ "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==", "dev": true, + "peer": true, "engines": { "node": ">= 8" } @@ -2463,6 +2517,12 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "dev": true + }, "@rollup/pluginutils": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", @@ -2551,6 +2611,15 @@ "svelte-hmr": "^0.15.0" } }, + "@types/bootstrap": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.4.tgz", + "integrity": "sha512-jGNB81zuDHu1DPvBV7Ox3Z3eyzdWPNguYwrt0j7X90VExA8H7c6qxJh0cz5j3xp0XvSy1TYaP2pkyXCHeo8CaA==", + "dev": true, + "requires": { + "@popperjs/core": "^2.9.2" + } + }, "@types/cookie": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.1.tgz", @@ -2597,6 +2666,12 @@ "rollup-pluginutils": "^2.8.2" } }, + "@zerodevx/svelte-toast": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@zerodevx/svelte-toast/-/svelte-toast-0.7.2.tgz", + "integrity": "sha512-vWiY6IqsstcOoQ8PFBuFuxgPkj1JFAGhUF9gC7wLx7c5A9SSfdtxWs/39ekGSIeyJK0yqWhTcmzGrCEWSELzDw==", + "dev": true + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2677,6 +2752,11 @@ "file-uri-to-path": "1.0.0" } }, + "bootstrap-icons": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.9.1.tgz", + "integrity": "sha512-d4ZkO30MIkAhQ2nNRJqKXJVEQorALGbLWTuRxyCTJF96lRIV6imcgMehWGJUiJMJhglN0o2tqLIeDnMdiQEE9g==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3402,6 +3482,22 @@ "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==", "dev": true }, + "nookies": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/nookies/-/nookies-2.5.2.tgz", + "integrity": "sha512-x0TRSaosAEonNKyCrShoUaJ5rrT5KHRNZ5DwPCuizjgrnkpE5DRf3VL7AyyQin4htict92X1EQ7ejDbaHDVdYA==", + "requires": { + "cookie": "^0.4.1", + "set-cookie-parser": "^2.4.6" + }, + "dependencies": { + "cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + } + } + }, "nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -3643,8 +3739,7 @@ "set-cookie-parser": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", - "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==", - "dev": true + "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==" }, "signal-exit": { "version": "3.0.7", @@ -3735,7 +3830,8 @@ "version": "3.50.1", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", "integrity": "sha512-bS4odcsdj5D5jEg6riZuMg5NKelzPtmsCbD9RG+8umU03TeNkdWnP6pqbCm0s8UQNBkqk29w/Bdubn3C+HWSwA==", - "dev": true + "dev": true, + "peer": true }, "svelte-check": { "version": "2.9.0", diff --git a/frontend/svelte/package.json b/frontend/svelte/package.json index 3086444..441ef4a 100644 --- a/frontend/svelte/package.json +++ b/frontend/svelte/package.json @@ -1,5 +1,5 @@ { - "name": "svelte", + "name": "svelte_pages", "version": "0.0.1", "private": true, "scripts": { @@ -12,12 +12,16 @@ "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", - "svelte": "^3.44.0", + "@types/bootstrap": "^5.2.4", + "@zerodevx/svelte-toast": "^0.7.2", "svelte-check": "^2.7.1", "svelte-preprocess": "^4.10.6", "tslib": "^2.3.1", "typescript": "^4.7.4", "vite": "^3.1.0" }, - "type": "module" + "type": "module", + "dependencies": { + "nookies": "^2.5.2" + } } diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html index 5b53ef7..2767694 100644 --- a/frontend/svelte/src/app.html +++ b/frontend/svelte/src/app.html @@ -2,7 +2,7 @@ - + %sveltekit.head% diff --git a/frontend/svelte/src/models/PomeloUtils.ts b/frontend/svelte/src/models/PomeloUtils.ts new file mode 100644 index 0000000..6cc8f6b --- /dev/null +++ b/frontend/svelte/src/models/PomeloUtils.ts @@ -0,0 +1,3 @@ +export function capitalizeFirstLetter(str: string) { + return str.charAt(0).toUpperCase() + str.slice(1); +} \ No newline at end of file diff --git a/frontend/svelte/src/models/customToasts.ts b/frontend/svelte/src/models/customToasts.ts new file mode 100644 index 0000000..b50a821 --- /dev/null +++ b/frontend/svelte/src/models/customToasts.ts @@ -0,0 +1,10 @@ +import {toast} from "@zerodevx/svelte-toast"; +import {capitalizeFirstLetter} from "./PomeloUtils"; + +export const createErrorToast = (m: string) => { + toast.push("Error: " + capitalizeFirstLetter(m), { + theme: { + '--toastBackground': 'red' + } + }) +} \ No newline at end of file diff --git a/frontend/svelte/src/models/user.ts b/frontend/svelte/src/models/user.ts new file mode 100644 index 0000000..fe5e669 --- /dev/null +++ b/frontend/svelte/src/models/user.ts @@ -0,0 +1,22 @@ +export class User { + id: number; + email: string; + username: string; + + // Can be extended by these + // blocked: boolean; + // provider: string; + // confirmed: boolean; + // createdAt: Date; + // updatedAt: Date; + + /** + * Creates the user. + * @param params Fetch data. + */ + constructor(params: any) { + this.id = params?.id; + this.email = params?.email; + this.username = params?.username; + } +} \ No newline at end of file diff --git a/frontend/svelte/src/resources/images/logo1.svg b/frontend/svelte/src/resources/images/logo1.svg new file mode 100644 index 0000000..dff0db9 --- /dev/null +++ b/frontend/svelte/src/resources/images/logo1.svg @@ -0,0 +1,39 @@ + + + +Created with Fabric.js 4.2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/svelte/src/resources/images/logo2.svg b/frontend/svelte/src/resources/images/logo2.svg new file mode 100644 index 0000000..b8bb37f --- /dev/null +++ b/frontend/svelte/src/resources/images/logo2.svg @@ -0,0 +1,40 @@ + + + +Created with Fabric.js 4.2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/svelte/src/resources/images/logo3.svg b/frontend/svelte/src/resources/images/logo3.svg new file mode 100644 index 0000000..2625767 --- /dev/null +++ b/frontend/svelte/src/resources/images/logo3.svg @@ -0,0 +1,43 @@ + + + +Created with Fabric.js 4.2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pomelo Note + + \ No newline at end of file diff --git a/frontend/svelte/src/routes/+layout.js b/frontend/svelte/src/routes/+layout.js new file mode 100644 index 0000000..5829b7e --- /dev/null +++ b/frontend/svelte/src/routes/+layout.js @@ -0,0 +1 @@ +export const ssr = false; \ No newline at end of file diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 62f1166..517b1b3 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -1,2 +1,231 @@ -

AAAAAAAAAAAAAAa to SvelteKit

-

Visit kit.svelte.dev to read the documentation

+ + + + + + + + PomeloNote | Home + + + + + +
+ +
+ +
+ +
+ + +
+
+ + + + \ No newline at end of file diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte new file mode 100644 index 0000000..eeab65c --- /dev/null +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -0,0 +1,24 @@ + + + + + + {"Pomelonote | Edit " + currNote.title} + + + + +
+ {currNote.content} +
+ diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte new file mode 100644 index 0000000..bd3cc51 --- /dev/null +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -0,0 +1,128 @@ + + + + + + + PomeloNote | Login + + + + +
+ + Logo +

Please sign in

+ +
+ + +
+
+ + +
+ +
+ +
+ +

©2022

+ +
+ + + + + + \ No newline at end of file diff --git a/frontend/svelte/src/routes/login/models/authentication.ts b/frontend/svelte/src/routes/login/models/authentication.ts new file mode 100644 index 0000000..512d866 --- /dev/null +++ b/frontend/svelte/src/routes/login/models/authentication.ts @@ -0,0 +1,7 @@ +import type {User} from "../../../models/user"; + +export interface Authentication { + jwt: string; + user: User; + error: any; +} \ No newline at end of file diff --git a/frontend/svelte/src/types.ts b/frontend/svelte/src/types.ts new file mode 100644 index 0000000..9814953 --- /dev/null +++ b/frontend/svelte/src/types.ts @@ -0,0 +1,6 @@ +export interface Note { + id: number; + title: string; + content: string; + lastOpened: string; +} \ No newline at end of file diff --git a/frontend/svelte/tsconfig.json b/frontend/svelte/tsconfig.json index 6ae0c8c..74e5718 100644 --- a/frontend/svelte/tsconfig.json +++ b/frontend/svelte/tsconfig.json @@ -4,6 +4,7 @@ "allowJs": true, "checkJs": true, "esModuleInterop": true, + "moduleResolution": "node", "forceConsistentCasingInFileNames": true, "resolveJsonModule": true, "skipLibCheck": true,