From 5351cec9dc6fc040912944bc335d93cc9e441c60 Mon Sep 17 00:00:00 2001 From: s-prechtl Date: Wed, 21 Sep 2022 09:05:21 +0200 Subject: [PATCH 01/12] 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 02/12] 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 03/12] 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 bbec9e5e1b1f18c01231e1e70adb578d55dbbc8d Mon Sep 17 00:00:00 2001 From: dhain Date: Sat, 24 Sep 2022 17:50:56 +0200 Subject: [PATCH 04/12] mid commit hab angst --- frontend/svelte/src/routes/+page.svelte | 131 +++++++++++++++++++++++- 1 file changed, 129 insertions(+), 2 deletions(-) diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 62f1166..2f813b2 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -1,2 +1,129 @@ -

AAAAAAAAAAAAAAa to SvelteKit

-

Visit kit.svelte.dev to read the documentation

+ + + + + + PomeloNote | Home + + + +
+ + + + + +
    + {#each notes as note} +
  • + {note.title} + + +
    • + {/each} +
+
+ + \ No newline at end of file From 2705fe27ef2b7a173ad16939f2982c29c631573d Mon Sep 17 00:00:00 2001 From: dhain Date: Sun, 25 Sep 2022 10:27:04 +0200 Subject: [PATCH 05/12] Notes can be displayed from a JSON String Notes can be deleted (will not save to the JSON) Notes can be added (will not save to the JSON) You can click on a Note to open it but /editor route is not working properly --- frontend/svelte/src/routes/+layout.js | 1 + frontend/svelte/src/routes/+page.svelte | 39 ++++++++++++------- frontend/svelte/src/routes/editor/+layout.js | 1 + .../svelte/src/routes/editor/+page.svelte | 24 ++++++++++++ 4 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 frontend/svelte/src/routes/+layout.js create mode 100644 frontend/svelte/src/routes/editor/+layout.js create mode 100644 frontend/svelte/src/routes/editor/+page.svelte 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 2f813b2..656a237 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -6,26 +6,28 @@ } //TODO: TEMP!!! - const tempJson = "[{\"id\":0,\"title\":\"samc\",\"content\":\"SAAAAAAAAAAMC\"},{\"id\":1,\"title\":\"Push\",\"content\":\"Kollege Pusch\"},{\"id\":2,\"title\":\"Mike\",\"content\":\"C Meister\"}]"; + const tempJson = "[{\"id\":0,\"title\":\"samc\",\"content\":\"SAAAAAAAAAAMC\"},{\"id\":1,\"title\":\"Push\",\"content\":\"Kollege Pusch\"},{\"id\":2,\"title\":\"Mike\",\"content\":\"C Meister\"},{\"id\":3,\"title\":\"kekw\",\"content\":\"OMEGALUL\"}]"; //TODO: TEMP!!! let notes: Note[] = JSON.parse(tempJson); + window.localStorage.setItem("notes", JSON.stringify(notes)); /** * Reloads the Notes Listing * (by doing something very intelligent) */ - function reloadNotesListing(){ + function reloadNotesListing() { notes = notes.filter(i => i === i); } /** * Gives the user a prompt to input the new title of the note and creates it if the title is valid */ - function addNotePrompt(){ + function addNotePrompt() { let newTitle = prompt('Name of the new Note'); - if(newTitle != null && newTitle != ''){ + if (newTitle != null && newTitle != '') { addNote(newTitle); + window.localStorage.setItem("notes", JSON.stringify(notes)); } } @@ -58,19 +60,26 @@ PomeloNote | Home - + -
- - + + +
+
+
    {#each notes as note}
  • - {note.title} + + window.localStorage.setItem("clickedNoteId", note.id)}> + {note.title} + +
    • @@ -80,6 +89,10 @@ \ No newline at end of file diff --git a/frontend/svelte/src/routes/editor/+layout.js b/frontend/svelte/src/routes/editor/+layout.js deleted file mode 100644 index c7c9b51..0000000 --- a/frontend/svelte/src/routes/editor/+layout.js +++ /dev/null @@ -1 +0,0 @@ -// export const ssr = false; \ No newline at end of file diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte index 5baa8fe..eeab65c 100644 --- a/frontend/svelte/src/routes/editor/+page.svelte +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -3,19 +3,22 @@ let notes: Note[] = JSON.parse(window.localStorage.getItem("notes")); const clickedNoteId = window.localStorage.getItem("clickedNoteId"); + + const currNote = notes.find((note)=>{ + return note.id === parseInt(clickedNoteId); + }); - - {"Pomelonote | Edit " + notes[clickedNoteId].title} + {"Pomelonote | Edit " + currNote.title}
    - samc samg ccocooc {notes[clickedNoteId].content} + {currNote.content}
    From 670a860d9052ea988b31fc6bf10d9d1a4a14b036 Mon Sep 17 00:00:00 2001 From: sprechtl Date: Sun, 25 Sep 2022 23:02:50 +0200 Subject: [PATCH 09/12] Only creates cookie when there is no error + logos --- frontend/svelte/src/app.html | 2 +- frontend/svelte/src/resources/logo1.svg | 39 +++++++++++++++++ frontend/svelte/src/resources/logo2.svg | 39 +++++++++++++++++ frontend/svelte/src/resources/logo3.svg | 43 +++++++++++++++++++ frontend/svelte/src/routes/login/+page.svelte | 21 ++++----- 5 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 frontend/svelte/src/resources/logo1.svg create mode 100644 frontend/svelte/src/resources/logo2.svg create mode 100644 frontend/svelte/src/resources/logo3.svg diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html index 5b53ef7..7643ce1 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/resources/logo1.svg b/frontend/svelte/src/resources/logo1.svg new file mode 100644 index 0000000..dff0db9 --- /dev/null +++ b/frontend/svelte/src/resources/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/logo2.svg b/frontend/svelte/src/resources/logo2.svg new file mode 100644 index 0000000..4ca5b22 --- /dev/null +++ b/frontend/svelte/src/resources/logo2.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/logo3.svg b/frontend/svelte/src/resources/logo3.svg new file mode 100644 index 0000000..8adf42c --- /dev/null +++ b/frontend/svelte/src/resources/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/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 4ed867c..34c603e 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -35,18 +35,15 @@ } else{ createErrorToast(response.error.message); } + } else { + if (rememberMe) { + setCookie(null, 'jwt', response.jwt, { + maxAge: 30 * 24 * 60 * 60, + path: '/' + }) + window.location = "/"; + } } - - if (rememberMe) { - setCookie(null, 'jwt', response.jwt, { - maxAge: 30 * 24 * 60 * 60, - path: '/' - }) - // window.location = "/"; - } - - console.log(response); - } @@ -64,7 +61,7 @@
    - Logo + Logo

    Please sign in

    From 220531b95105bbcd74d91f4bb9c43a6a05790720 Mon Sep 17 00:00:00 2001 From: sprechtl Date: Sun, 25 Sep 2022 23:34:18 +0200 Subject: [PATCH 10/12] Include Logo set Favicon --- frontend/svelte/src/app.html | 2 +- frontend/svelte/src/resources/{ => images}/logo1.svg | 0 frontend/svelte/src/resources/{ => images}/logo2.svg | 3 ++- frontend/svelte/src/resources/{ => images}/logo3.svg | 2 +- frontend/svelte/src/routes/login/+page.svelte | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) rename frontend/svelte/src/resources/{ => images}/logo1.svg (100%) rename frontend/svelte/src/resources/{ => images}/logo2.svg (94%) rename frontend/svelte/src/resources/{ => images}/logo3.svg (96%) diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html index 7643ce1..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/resources/logo1.svg b/frontend/svelte/src/resources/images/logo1.svg similarity index 100% rename from frontend/svelte/src/resources/logo1.svg rename to frontend/svelte/src/resources/images/logo1.svg diff --git a/frontend/svelte/src/resources/logo2.svg b/frontend/svelte/src/resources/images/logo2.svg similarity index 94% rename from frontend/svelte/src/resources/logo2.svg rename to frontend/svelte/src/resources/images/logo2.svg index 4ca5b22..b8bb37f 100644 --- a/frontend/svelte/src/resources/logo2.svg +++ b/frontend/svelte/src/resources/images/logo2.svg @@ -4,10 +4,11 @@ Created with Fabric.js 4.2.0 + - + diff --git a/frontend/svelte/src/resources/logo3.svg b/frontend/svelte/src/resources/images/logo3.svg similarity index 96% rename from frontend/svelte/src/resources/logo3.svg rename to frontend/svelte/src/resources/images/logo3.svg index 8adf42c..2625767 100644 --- a/frontend/svelte/src/resources/logo3.svg +++ b/frontend/svelte/src/resources/images/logo3.svg @@ -8,7 +8,7 @@ - + diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 34c603e..6f2b11b 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -3,6 +3,7 @@ import type {Authentication} from "./models/authentication"; import { SvelteToast } from '@zerodevx/svelte-toast' import {createErrorToast} from "../../models/customToasts"; + import logo from "../../resources/images/logo2.svg"; let user: string; let password: string; @@ -61,7 +62,7 @@
    - Logo + Logo

    Please sign in

    From c734aef84591a9ddeb776a28fa6eeef42218249e Mon Sep 17 00:00:00 2001 From: sprechtl Date: Sun, 25 Sep 2022 23:55:14 +0200 Subject: [PATCH 11/12] logo margin --- frontend/svelte/src/routes/login/+page.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte index 6f2b11b..bd3cc51 100644 --- a/frontend/svelte/src/routes/login/+page.svelte +++ b/frontend/svelte/src/routes/login/+page.svelte @@ -95,7 +95,6 @@ } body { - display: flex; align-items: center; padding-top: 40px; padding-bottom: 40px; @@ -122,4 +121,8 @@ border-top-left-radius: 0; border-top-right-radius: 0; } + + .img-fluid{ + margin-bottom: 15px; + } \ 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 12/12] 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",