From 5351cec9dc6fc040912944bc335d93cc9e441c60 Mon Sep 17 00:00:00 2001 From: s-prechtl Date: Wed, 21 Sep 2022 09:05:21 +0200 Subject: [PATCH 1/8] Login page created --- frontend/svelte/src/routes/login/+page.svelte | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 frontend/svelte/src/routes/login/+page.svelte diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte new file mode 100644 index 0000000..67ae89f --- /dev/null +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -0,0 +1,4 @@ + + From bcd03eeeda334a715e02ab79db47fa7530a10afe Mon Sep 17 00:00:00 2001 From: sprechtl Date: Fri, 23 Sep 2022 00:06:18 +0200 Subject: [PATCH 2/8] Login Skeleton --- frontend/package-lock.json | 14 +++- frontend/svelte/package-lock.json | 44 ++++++++++-- frontend/svelte/package.json | 4 +- frontend/svelte/src/routes/login/+page.svelte | 67 +++++++++++++++++++ frontend/svelte/tsconfig.json | 1 + 5 files changed, 121 insertions(+), 9 deletions(-) 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/package-lock.json b/frontend/svelte/package-lock.json index 3586104..fac15d2 100644 --- a/frontend/svelte/package-lock.json +++ b/frontend/svelte/package-lock.json @@ -1,16 +1,16 @@ { - "name": "svelte", + "name": "svelte_pages", "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "svelte", + "name": "svelte_pages", "version": "0.0.1", "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", - "svelte": "^3.44.0", + "@types/bootstrap": "^5.2.4", "svelte-check": "^2.7.1", "svelte-preprocess": "^4.10.6", "tslib": "^2.3.1", @@ -171,6 +171,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 +296,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", @@ -2037,6 +2056,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 +2483,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 +2577,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", @@ -3735,7 +3770,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..83c87fc 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,7 +12,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", - "svelte": "^3.44.0", + "@types/bootstrap": "^5.2.4", "svelte-check": "^2.7.1", "svelte-preprocess": "^4.10.6", "tslib": "^2.3.1", diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 67ae89f..387a8e5 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -2,3 +2,70 @@ + + + + PomeloNote | Login + + + +
+
+ Logo +

Please sign in

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

© 2017–2022

+
+
+ + + \ 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, From 985b94b10980b339e012cfb2b29e0f97cd393997 Mon Sep 17 00:00:00 2001 From: sprechtl Date: Fri, 23 Sep 2022 00:45:24 +0200 Subject: [PATCH 3/8] Login API request implemented --- frontend/svelte/README.md | 6 ++- frontend/svelte/src/routes/login/+page.svelte | 37 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) 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/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 387a8e5..3c26010 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -1,5 +1,30 @@ @@ -10,16 +35,16 @@
-
+ Logo

Please sign in

- +
- +
@@ -28,9 +53,9 @@ Remember me - -

© 2017–2022

-
+ +

©2022

+
From 16af21123bf67086f5850f2e7b234539be84d0b0 Mon Sep 17 00:00:00 2001 From: sprechtl Date: Sun, 25 Sep 2022 22:08:38 +0200 Subject: [PATCH 4/8] Cookie creation and error handling --- frontend/svelte/package-lock.json | 55 ++++++++++++-- frontend/svelte/package.json | 6 +- frontend/svelte/src/models/PomeloUtils.ts | 3 + frontend/svelte/src/models/customToasts.ts | 10 +++ frontend/svelte/src/models/user.ts | 22 ++++++ frontend/svelte/src/routes/login/+page.svelte | 71 +++++++++++++------ .../src/routes/login/models/authentication.ts | 7 ++ 7 files changed, 149 insertions(+), 25 deletions(-) create mode 100644 frontend/svelte/src/models/PomeloUtils.ts create mode 100644 frontend/svelte/src/models/customToasts.ts create mode 100644 frontend/svelte/src/models/user.ts create mode 100644 frontend/svelte/src/routes/login/models/authentication.ts diff --git a/frontend/svelte/package-lock.json b/frontend/svelte/package-lock.json index fac15d2..b9406a7 100644 --- a/frontend/svelte/package-lock.json +++ b/frontend/svelte/package-lock.json @@ -7,10 +7,14 @@ "": { "name": "svelte_pages", "version": "0.0.1", + "dependencies": { + "nookies": "^2.5.2" + }, "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", "@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", @@ -354,6 +358,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", @@ -1577,6 +1587,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", @@ -1939,8 +1966,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", @@ -2632,6 +2658,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", @@ -3437,6 +3469,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", @@ -3678,8 +3726,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", diff --git a/frontend/svelte/package.json b/frontend/svelte/package.json index 83c87fc..441ef4a 100644 --- a/frontend/svelte/package.json +++ b/frontend/svelte/package.json @@ -13,11 +13,15 @@ "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", "@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/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/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 3c26010..4ed867c 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -1,11 +1,15 @@ + PomeloNote | Login - + +
- Logo -

Please sign in

+ Logo +

Please sign in

-
- - -
-
- - -
+
+ + +
+
+ + +
-
- -
- -

©2022

+
+ +
+ +

©2022

+ + + \ No newline at end of file From 0a168ea8b493fce5aec8e73d64aa5f087d55341d Mon Sep 17 00:00:00 2001 From: sprechtl Date: Mon, 26 Sep 2022 00:13:37 +0200 Subject: [PATCH 8/8] using users from users permissions --- backend/strapi/src/api/note/content-types/note/schema.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/strapi/src/api/note/content-types/note/schema.json b/backend/strapi/src/api/note/content-types/note/schema.json index 82d431e..5c0c29b 100644 --- a/backend/strapi/src/api/note/content-types/note/schema.json +++ b/backend/strapi/src/api/note/content-types/note/schema.json @@ -4,7 +4,8 @@ "info": { "singularName": "note", "pluralName": "notes", - "displayName": "note" + "displayName": "note", + "description": "" }, "options": { "draftAndPublish": true @@ -21,7 +22,7 @@ "owners": { "type": "relation", "relation": "oneToMany", - "target": "admin::user" + "target": "plugin::users-permissions.user" }, "lastViewed": { "type": "datetime",