Compare commits

..

98 commits

Author SHA1 Message Date
Stefan Prechtl
809e7ce6d7
Update README.md 2024-10-01 10:00:32 +02:00
Jonas Weissengruber
576e65dca6
Update index.md 2022-11-10 11:11:27 +01:00
Jonas Weissengruber
e0505755da
Update index.md 2022-11-10 11:08:23 +01:00
Jonas Weissengruber
4fe86d33b6
Update index.md 2022-11-10 11:06:15 +01:00
Jonas Weissengruber
3cd93ac7da
Update index.md 2022-11-10 11:03:32 +01:00
Jonas Weissengruber
7c4ed1d2b2
image size in md? 2022-11-10 10:59:49 +01:00
Jonas Weissengruber
67395c9ebf
added text 2022-11-10 10:31:33 +01:00
Jonas Weissengruber
3ef834e103
Delete about_us.md 2022-11-10 10:26:56 +01:00
Jonas Weissengruber
cf9da4c6a0
moved team to index 2022-11-10 10:26:38 +01:00
Stefan Prechtl
58f2a53539
Update index.md 2022-11-10 10:08:58 +01:00
Stefan Prechtl
46e891d429
Delete CNAME 2022-11-03 11:34:53 +01:00
Stefan Prechtl
01d9377238
Update CNAME 2022-11-03 11:34:36 +01:00
Stefan Prechtl
7819b461b8
Create CNAME 2022-11-03 11:34:15 +01:00
Stefan Prechtl
f0e2c9ca94
Update index.md 2022-11-03 11:31:45 +01:00
j-weissen
ad94658aef about us page 2022-11-03 11:28:37 +01:00
Stefan Prechtl
1b52eaac46
Update index.md 2022-11-03 11:28:14 +01:00
Stefan Prechtl
e03b58057e
Update index.md 2022-11-03 11:24:29 +01:00
Stefan Prechtl
1ffd08082b
Update index.md 2022-11-03 11:22:37 +01:00
Stefan Prechtl
942ee3805d
Update index.md 2022-11-03 11:19:38 +01:00
Stefan Prechtl
75034e0602
Update index.md 2022-11-03 11:14:53 +01:00
Stefan Prechtl
5bd335dbd6
Update index.md 2022-11-03 11:12:09 +01:00
Stefan Prechtl
ffce155154
Delete test.md 2022-11-03 11:06:56 +01:00
Stefan Prechtl
245de43c78
Update _config.yml 2022-11-03 11:04:17 +01:00
j-weissen
bb9ee26bd2 Merge remote-tracking branch 'origin/master' 2022-11-03 11:03:13 +01:00
j-weissen
158d49d221 guckst du foto 2022-11-03 11:02:55 +01:00
Stefan Prechtl
fcd2f16401
Delete index.md 2022-11-03 10:54:21 +01:00
Stefan Prechtl
f1331157fd
Rename _config.yml to docs/_config.yml 2022-11-03 10:54:02 +01:00
Stefan Prechtl
f021209531
Create test.md 2022-11-03 10:52:33 +01:00
Stefan Prechtl
d5867c4f0d
Create index.md 2022-11-03 10:51:50 +01:00
Stefan Prechtl
b8c3603cbb
Delete web directory 2022-11-03 10:51:02 +01:00
Stefan Prechtl
dbde003fc2
Update index.md 2022-11-03 10:45:59 +01:00
Stefan Prechtl
239c73fb8e
Update index.md 2022-11-03 10:43:36 +01:00
Stefan Prechtl
9589a21f96
Update README.md 2022-11-03 10:42:48 +01:00
Stefan Prechtl
c1c6804a63
Create index.md 2022-11-03 10:41:35 +01:00
Stefan Prechtl
08166dda95
Create index.md 2022-11-03 10:39:54 +01:00
Stefan Prechtl
2e3af63c72
Update _config.yml 2022-11-03 10:37:20 +01:00
Stefan Prechtl
d438bc4b14
Update _config.yml 2022-11-03 10:36:13 +01:00
Stefan Prechtl
00f74d4228
Create _config.yml 2022-11-03 10:34:15 +01:00
j-weissen
2d06680bab Merge branch 'develop' into editor 2022-10-18 09:42:17 +02:00
j-weissen
39d8a2034f coloscheme fixed 2022-10-18 09:41:58 +02:00
j-weissen
8d63c8fd4e heading stop jumping 2022-10-18 09:36:54 +02:00
dhain
63e37061de Merge remote-tracking branch 'origin/develop' into develop 2022-10-18 09:11:55 +02:00
Jonas Weissengruber
319828b8b1
Update README.md 2022-10-18 09:10:42 +02:00
j-weissen
952917d415 added comments, fixed repo error 2022-10-18 09:00:19 +02:00
dhain
c85fbe915f Merge branch 'develop' into popup
# Conflicts:
#	frontend/svelte/src/routes/+page.svelte
2022-10-18 08:53:06 +02:00
j-weissen
4091f6c8f5 lastViewed bugfix findOne 2022-10-18 08:12:31 +02:00
dhain
e9c21409cd edited comments 2022-10-18 08:05:58 +02:00
j-weissen
7068ae402e editor styling added 2022-10-17 21:27:19 +02:00
dhain
a9bebd789e delete popup now working (1ms sleep) 2022-10-17 08:30:12 +02:00
j-weissen
fa94a99567 editor functionable 2022-10-17 00:32:27 +02:00
j-weissen
180a26344a updated path to StrapiNoteRepo 2022-10-17 00:04:10 +02:00
j-weissen
f7686371c5 Merge branch 'endpoints' into develop 2022-10-17 00:02:39 +02:00
j-weissen
51735f79dc fixed update 2022-10-17 00:01:21 +02:00
sprechtl
53854b23cd Fixed path 2022-10-16 23:56:59 +02:00
sprechtl
fa91d5f670 Merge branch 'user-repo' into develop 2022-10-16 23:44:18 +02:00
sprechtl
ad23d05000 No beauty but worky 2022-10-16 23:42:40 +02:00
j-weissen
154d496208 stores.ts added, StrapiNoteRepository using it, updated editor 2022-10-16 23:22:19 +02:00
dhain
36d373cdc3 added customBootstrap.css to main page 2022-10-16 23:10:38 +02:00
dhain
f266f3579c popup now working
note deletion via popup working
popup is not closing properly (1st close ok, after that not working (bcs 1 bool for all modals))
2022-10-16 23:08:15 +02:00
s-prechtl
6fd7726ae0 UserRepo Working 2022-10-13 08:54:24 +02:00
s-prechtl
bee5b04441 Merge branch 'develop' into user-repo
# Conflicts:
#	frontend/svelte/src/routes/+page.svelte
#	frontend/svelte/src/routes/login/+page.svelte
2022-10-11 13:14:41 +02:00
dhain
cdefc2e993 ? 2022-10-11 11:09:09 +02:00
dhain
7abdbe605b updated some pwa files (not working)
removed unnecessary code in listing
refactored function comments
2022-10-11 10:42:53 +02:00
s-prechtl
2d193969f7 UserRepo fixed oda so 2022-10-11 09:32:14 +02:00
dhain
22396d1a00 Merge branch 'listing' into develop 2022-10-11 08:52:38 +02:00
dhain
031a4e5259 Create new note in listing now working 2022-10-11 08:52:11 +02:00
s-prechtl
03b1695d9a Merge branch 'styling' into develop 2022-10-11 08:08:08 +02:00
s-prechtl
03e75ffe2a Styling 2022-10-11 08:06:37 +02:00
dhain
93f9979259 Merge branch 'develop' into listing 2022-10-10 20:31:02 +02:00
j-weissen
02d5aa0263 Note interface changed, Repo create fixed 2022-10-10 20:30:09 +02:00
dhain
4125b433e5 PWA a bissi probiert 2022-10-10 20:28:51 +02:00
j-weissen
bbd6f6635d Merge branch 'develop' into note-repo 2022-10-10 20:25:24 +02:00
j-weissen
1612e7d241 Merge branch 'endpoints' into develop 2022-10-10 20:25:01 +02:00
j-weissen
81f0aadd39 custom note create implemented, note <-> user relation fixed 2022-10-10 20:24:27 +02:00
sprechtl
d66b9272b7 Repo for USER started 2022-10-10 01:21:53 +02:00
sprechtl
07e014cd8f new folder structure 2022-10-10 00:10:11 +02:00
sprechtl
aa65cead2e changed type path 2022-10-10 00:07:34 +02:00
dhain
7a5ba150f7 removed useless junk 2022-10-09 21:19:35 +02:00
j-weissen
057bcdcf02 converted to Partials 2022-10-04 11:24:20 +02:00
dhain
2eeda6fc5c delete note do be working 2022-10-04 10:51:59 +02:00
dhain
b49a4c3ddf Merge branch 'listing' into develop
# Conflicts:
#	backend/strapi/src/api/note/content-types/note/schema.json
#	frontend/svelte/package-lock.json
#	frontend/svelte/src/routes/editor/+page.svelte
2022-10-04 10:32:48 +02:00
j-weissen
70590fbdc9 Merge branch 'note-repo' into develop 2022-10-04 10:28:53 +02:00
j-weissen
fe005863a8 cleanup 2022-10-04 10:25:32 +02:00
dhain
982f845cfc listing cums from strap
NO MORE local json &str
date in listing very butiful
2022-10-04 10:25:06 +02:00
j-weissen
b1b081fe30 Added StrapiNoteRepository, .env not working, authHeader is mocked 2022-10-04 10:14:28 +02:00
s-prechtl
7d4d74b01a README.md updated username shown in input for login 2022-10-04 09:16:17 +02:00
s-prechtl
0dea7b77d7 README.md created for entire project 2022-10-04 09:05:34 +02:00
s-prechtl
626a3474f8 Readme updated 2022-10-04 09:04:21 +02:00
s-prechtl
7abd354625 docker-compose.yml for full project created, .env to source root! 2022-10-04 08:55:55 +02:00
s-prechtl
562829a23b docker-compose.yml for Strapi created 2022-10-04 08:38:52 +02:00
s-prechtl
c5799921d1 Strapi Schema fixed register Console log removed 2022-10-04 08:16:49 +02:00
dhain
6da2807b0a bissl styling bei listing 2022-09-28 10:59:17 +02:00
dhain
fe1d24a23e funktioniert mit actual strapi JSON layout 2022-09-27 10:44:27 +02:00
dhain
5453691016 localstorage weg 2022-09-27 10:15:32 +02:00
dhain
1c1d758ab1 jwt oba nix geht 2022-09-26 23:07:39 +02:00
dhain
15ed4bd993 Merge branch 'login' into listing 2022-09-26 19:08:00 +02:00
dhain
92bf70831e Merge branch 'develop' into listing
# Conflicts:
#	frontend/svelte/package.json
2022-09-26 19:06:27 +02:00
dhain
5fda34fef9 bootstrap icons dependency 2022-09-26 19:03:45 +02:00
46 changed files with 895 additions and 343 deletions

19
README.md Normal file
View file

@ -0,0 +1,19 @@
# 🚀 Getting started with PomeloNote
### **THIS REPOSITORY HAS DEPENDENCIES WITH SECURITY VULNERABILITIES. YOU MIGHT WANT TO UPDATE PACKAGES BEFORE USE.**
## Setup
- run `npm i`
- get the .env file and save it to the root directory of the project
- set up Strapi
- go to `localhost:1337/admin`
- register an admin user
- go to Settings => Users&Permissions Plugin => Roles => Authenticated => Note => Select all
- Save
### Starting the container with svelte and strapi:
``docker-compose up --build -d``
### Restart and rebuild Svelte:
``docker-compose up --detach --build svelte``
### Restart and rebuild Strapi:
``docker-compose up --detach --build strapi``

View file

@ -23,7 +23,7 @@
"type": "relation", "type": "relation",
"relation": "manyToMany", "relation": "manyToMany",
"target": "plugin::users-permissions.user", "target": "plugin::users-permissions.user",
"inversedBy": "notes" "mappedBy": "notes"
}, },
"lastViewed": { "lastViewed": {
"type": "datetime", "type": "datetime",

View file

@ -1,5 +1,6 @@
'use strict'; 'use strict';
//move to utils! //move to utils!
function getNoteIdFromUrl(url) { function getNoteIdFromUrl(url) {
return Number(url.split("/").at(-1)); return Number(url.split("/").at(-1));
} }
@ -43,13 +44,15 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({
populate: ['owners'], populate: ['owners'],
}); });
const authorized = entry.owners.some(owner => owner.id === userId) const authorized = entry.owners.some(owner => owner.id === userId)
console.log(authorized)
if (authorized) { if (authorized) {
entry = await strapi.entityService.update(noteUid, noteId, { entry = await strapi.entityService.update(noteUid, noteId, {
data: { data: {
lastViewed: Date.now() lastViewed: Date.now()
} }
}) })
entry = await strapi.entityService.findOne(noteUid, noteId, {
populate: ['owners'],
});
return JSON.stringify(entry); return JSON.stringify(entry);
} else { } else {
ctx.response.status = 403; ctx.response.status = 403;
@ -63,22 +66,46 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({
async update(ctx) { async update(ctx) {
const noteId = getNoteIdFromUrl(ctx.request.url) const noteId = getNoteIdFromUrl(ctx.request.url)
const userId = ctx.state.user.id; const userId = ctx.state.user.id;
const requestBody = ctx.request.body; const requestBody = JSON.parse(ctx.request.body);
console.log(JSON.stringify(requestBody, null, 2))
const entry = await strapi.entityService.findOne(noteUid, noteId, { const entry = await strapi.entityService.findOne(noteUid, noteId, {
populate: ['owners'], populate: ['owners'],
}); });
const authorized = entry.owners.some(owner => owner.id === userId) const authorized = entry.owners.some(owner => owner.id === userId)
let allowed; let allPreviousOwnersKept = true;
if (requestBody.data.hasOwnProperty("owners")) { if (requestBody.data.hasOwnProperty("owners")) {
allowed = entry.owners.every(owner => requestBody.data.owners.includes(owner)); allPreviousOwnersKept = entry.owners.every(owner => requestBody.data.owners.includes(owner));
} }
console.log({
"auth": authorized,
"allprev": allPreviousOwnersKept,
})
if (!authorized) { if (!authorized) {
ctx.response.status = 403; ctx.response.status = 403;
} else if (!allowed) { } else if (!allPreviousOwnersKept) {
ctx.response.status = 400; ctx.response.status = 400;
} else {
return super.update(ctx);
} }
return await strapi.entityService.update(noteUid, noteId, requestBody);
},
/**
* Creates a new note, automatically sets owners to the user making the request and lastViewed
* @param ctx
* @returns {Promise<ctx>}
*/
async create(ctx) {
const userId = ctx.state.user.id;
const requestBody = JSON.parse(ctx.request.body);
console.log(requestBody);
const response = await strapi.entityService.create(noteUid, {
data: {
title: requestBody.data.title,
content: requestBody.data.content,
lastViewed: Date.now(),
owners: [userId],
publishedAt: Date.now()
}
});
return response;
}, },
/** /**
* Deletes user from note owners. If note has no owners anymore, deletes note. * Deletes user from note owners. If note has no owners anymore, deletes note.

View file

@ -0,0 +1,73 @@
{
"kind": "collectionType",
"collectionName": "up_users",
"info": {
"name": "user",
"description": "",
"singularName": "user",
"pluralName": "users",
"displayName": "User"
},
"options": {
"draftAndPublish": false,
"timestamps": true
},
"attributes": {
"username": {
"type": "string",
"minLength": 3,
"unique": true,
"configurable": false,
"required": true
},
"email": {
"type": "email",
"minLength": 6,
"configurable": false,
"required": true
},
"provider": {
"type": "string",
"configurable": false
},
"password": {
"type": "password",
"minLength": 6,
"configurable": false,
"private": true
},
"resetPasswordToken": {
"type": "string",
"configurable": false,
"private": true
},
"confirmationToken": {
"type": "string",
"configurable": false,
"private": true
},
"confirmed": {
"type": "boolean",
"default": false,
"configurable": false
},
"blocked": {
"type": "boolean",
"default": false,
"configurable": false
},
"role": {
"type": "relation",
"relation": "manyToOne",
"target": "plugin::users-permissions.role",
"inversedBy": "users",
"configurable": false
},
"notes": {
"type": "relation",
"relation": "manyToMany",
"target": "api::note.note",
"inversedBy": "owners"
}
}
}

View file

@ -2,7 +2,7 @@ version: "3"
services: services:
strapi: strapi:
container_name: strapi container_name: strapi
build: . build: ./backend/strapi
image: mystrapi:latest image: mystrapi:latest
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
@ -17,11 +17,11 @@ services:
DATABASE_PASSWORD: ${DATABASE_PASSWORD} DATABASE_PASSWORD: ${DATABASE_PASSWORD}
NODE_ENV: ${NODE_ENV} NODE_ENV: ${NODE_ENV}
volumes: volumes:
- ./config:/opt/app/config - ./backend/strapi/config:/opt/app/config
- ./src:/opt/app/src - ./backend/strapi/src:/opt/app/src
- ./package.json:/opt/package.json - ./backend/strapi/package.json:/opt/package.json
- ./yarn.lock:/opt/yarn.lock # Replace with package-lock.json if using npm - ./backend/strapi/yarn.lock:/opt/yarn.lock # Replace with package-lock.json if using npm
- ./.env:/opt/app/.env - ./backend/strapi/.env:/opt/app/.env
ports: ports:
- "1337:1337" - "1337:1337"
networks: networks:
@ -47,6 +47,14 @@ services:
networks: networks:
- strapi - strapi
svelte:
container_name: svelte
build: ./frontend/svelte
image: svelte:latest
ports:
- "80:5173"
volumes: volumes:
strapi-data: strapi-data:
@ -54,3 +62,6 @@ networks:
strapi: strapi:
name: Strapi name: Strapi
driver: bridge driver: bridge

3
docs/_config.yml Normal file
View file

@ -0,0 +1,3 @@
remote_theme: pages-themes/leap-day@v0.2.0
plugins:
- jekyll-remote-theme

4
docs/_data/devs.csv Normal file
View file

@ -0,0 +1,4 @@
name,github,image
Jonas Weissengruber,j-weissen,jowei
Stefan Prechtler,s-prechtl,stef
David Hain,d-hain,dave
1 name github image
2 Jonas Weissengruber j-weissen jowei
3 Stefan Prechtler s-prechtl stef
4 David Hain d-hain dave

BIN
docs/images/dave.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

BIN
docs/images/delete.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
docs/images/editor.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

BIN
docs/images/jowei.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 KiB

BIN
docs/images/listing.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
docs/images/login.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

BIN
docs/images/register.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

BIN
docs/images/stef.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

31
docs/index.md Normal file
View file

@ -0,0 +1,31 @@
# Pomelo Note
This is the best open source note app you will ever find.
## Login
When first entering the app, you will need to login. If you haven't got an account you may consider [registering](#register), or just not using the app at all.
<br /><img src="images/login.png" width="50%" style="margin: auto; display: block;" />
## Register
A username, an email and a password that's all you need. If you are missing one of those, just don't use the app at all.
<br /><img src="images/register.png" width="50%" style="margin: auto; display: block;" />
## Editor
You can edit your notes with our minimalistic editor interface.
<br /><img src="images/editor.png" width="50%" style="margin: auto; display: block;" />
## Listing
Here you can see all your notes. Click on them to open the editor or hover and press the red "X" to delete them.
<br /><img src="images/listing.png" width="50%" style="margin: auto; display: block;" />
## Delete
Confirm the deletion.
<br /><img src="images/delete.png" width="50%" style="margin: auto; display: block;" />
# The Team
{% for dev in site.data.devs %}
{{ dev.name }}
[GitHub](https://github.com/{{ dev.github }})
![{{ dev.name }}](images/{{ dev.image }}.jpg)
{% endfor %}

View file

@ -1,13 +1,7 @@
# Creating the svelte project # 🚀 Getting started with Svelte
## Create the docker image ### Starting the container:
``docker-compose up --build -d``
``docker build -t svelte .`` ### Restart and rebuild Svelte:
``docker-compose up --detach --build svelte``
## Run the docker container
``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``

View file

@ -0,0 +1,9 @@
version: "3"
services:
svelte:
container_name: svelte
build: .
image: svelte:latest
ports:
- "80:5173"

View file

@ -8,7 +8,10 @@
"name": "svelte_pages", "name": "svelte_pages",
"version": "0.0.1", "version": "0.0.1",
"dependencies": { "dependencies": {
"nookies": "^2.5.2" "bootstrap-icons": "^1.9.1",
"nookies": "^2.5.2",
"sv-popup": "^0.2.5",
"webworker": "^0.8.4"
}, },
"devDependencies": { "devDependencies": {
"@sveltejs/adapter-auto": "next", "@sveltejs/adapter-auto": "next",
@ -465,6 +468,11 @@
"file-uri-to-path": "1.0.0" "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": { "node_modules/brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -2077,6 +2085,11 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/sv-popup": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/sv-popup/-/sv-popup-0.2.5.tgz",
"integrity": "sha512-JhBu4piXaauamT4vMEcFCydvxJ8e72G7c9F3caZVAPsiFqWPTYT3JDz99FlR+YCnbOp1emsZqqOPVvCwHgURog=="
},
"node_modules/svelte": { "node_modules/svelte": {
"version": "3.50.1", "version": "3.50.1",
"resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz",
@ -2352,6 +2365,14 @@
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
"dev": true "dev": true
}, },
"node_modules/webworker": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/webworker/-/webworker-0.8.4.tgz",
"integrity": "sha512-zzsVxtHf+mCn0WuYLarSWfRGmX7JiYKkKvso5FYC7rJ9G8svwGQA5a51Sjq9D2c/rKVU6U/kyBcaI7gUTVlsJg==",
"engines": {
"node": ">=0.4.3"
}
},
"node_modules/whatwg-url": { "node_modules/whatwg-url": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
@ -2744,6 +2765,11 @@
"file-uri-to-path": "1.0.0" "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": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -3813,6 +3839,11 @@
"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
"dev": true "dev": true
}, },
"sv-popup": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/sv-popup/-/sv-popup-0.2.5.tgz",
"integrity": "sha512-JhBu4piXaauamT4vMEcFCydvxJ8e72G7c9F3caZVAPsiFqWPTYT3JDz99FlR+YCnbOp1emsZqqOPVvCwHgURog=="
},
"svelte": { "svelte": {
"version": "3.50.1", "version": "3.50.1",
"resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz",
@ -3970,6 +4001,11 @@
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
"dev": true "dev": true
}, },
"webworker": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/webworker/-/webworker-0.8.4.tgz",
"integrity": "sha512-zzsVxtHf+mCn0WuYLarSWfRGmX7JiYKkKvso5FYC7rJ9G8svwGQA5a51Sjq9D2c/rKVU6U/kyBcaI7gUTVlsJg=="
},
"whatwg-url": { "whatwg-url": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",

View file

@ -22,6 +22,9 @@
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"nookies": "^2.5.2" "bootstrap-icons": "^1.9.1",
"nookies": "^2.5.2",
"sv-popup": "^0.2.5",
"webworker": "^0.8.4"
} }
} }

View file

@ -1,9 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en" data-theme="emerald">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="../src/resources/images/logo2.svg" /> <link rel="icon" href="../src/resources/images/logo2.svg" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<link rel="manifest" href="../static/manifest.json">
%sveltekit.head% %sveltekit.head%
</head> </head>
<body> <body>

View file

@ -0,0 +1,29 @@
html,
:root {
--main-txt-color: black;
--cross-txt-color: red;
--color-primary: #fff494;
--color-primary-600: #fff17a;
--color-primary-700: #ffec47;
--color-primary-800: #ffe714;
--color-primary-900: #e0c900;
}
.btn-primary {
background-color: var(--color-primary-800) !important;
border: var(--color-primary-800) !important;
color: var(--main-txt-color) !important;
}
.btn-primary:hover {
background-color: var(--color-primary-900) !important;
border: var(--color-primary-900) !important;
color: var(--main-txt-color) !important;
}
.btn-primary:disabled {
background-color: var(--color-primary-700) !important;
border: var(--color-primary-700) !important;
}

View file

@ -1,3 +1,6 @@
import type {Authentication} from "./authentication";
import {createErrorToast} from "./customToasts";
/** /**
* Capitalises first letter of string. * Capitalises first letter of string.
* @param str * @param str
@ -19,3 +22,15 @@ export async function bearerFetch(endpoint: string, jwt: string, baseUrl: string
} }
}); });
} }
export function handleErrorsFromResponseWithToast(response: Authentication) {
if (response.error != null) {
if (response.error.details.errors) {
for (const error of response.error.details.errors) {
createErrorToast(error.message);
}
} else {
createErrorToast(response.error.message);
}
}
}

View file

@ -1,4 +1,4 @@
import type {User} from "../../../models/user"; import type {User} from "./user";
/** /**
* User Login Auth. * User Login Auth.

View file

@ -0,0 +1,10 @@
import type {Note} from "../../types";
export interface NoteRepository {
getNotes(): Promise<Note[]>;
getNote(id: number): Promise<Note>;
getCurrentNote(): Promise<Note | void>;
updateNote(id: number, note: Partial<Note>): Promise<Note>;
deleteNote(id: number): void;
createNote(note: Partial<Note> & Pick<Note, 'title'>): Promise<Note>;
}

View file

@ -0,0 +1,86 @@
import type {Note} from "../../types";
import {parseCookies} from "nookies";
import type {NoteRepository} from "./NoteRepository";
import {currentNoteId} from "../../../stores";
type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'
export class StrapiNoteRepository implements NoteRepository {
private static instance: StrapiNoteRepository;
public static getInstance(): StrapiNoteRepository {
if (this.instance === undefined || this.instance === null) {
this.instance = new StrapiNoteRepository();
}
return this.instance;
}
private constructor() {
currentNoteId.subscribe((value) => (this._currentNoteId = value));
}
private _currentNoteId: unknown;
private static apiNoteEndpoint: string = "http://localhost:1337/api/notes"
public set currentNoteId(value: number | undefined) {
currentNoteId.set(value || -1);
}
public get currentNoteId(): number {
return <number>this._currentNoteId;
}
public async getNotes(): Promise<Note[]>{
const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/", 'GET');
return await response.json();
}
public async getNote(id: number): Promise<Note>{
const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'GET');
return await response.json();
}
public async getCurrentNote(): Promise<Note | void> {
if (this._currentNoteId === null || this._currentNoteId === undefined) {
return;
}
return await this.getNote(this.currentNoteId);
}
public async updateNote(id: number, note: Partial<Note>): Promise<Note> {
const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'PUT', note);
return await response.json();
}
public async createNote(note: Partial<Note> & Pick<Note, 'title'>): Promise<Note> {
const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/", 'POST', note);
return await response.json();
}
public async deleteNote(id: number): Promise<void> {
await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'DELETE');
}
private static async fetchStrapiNoteEndpoint(path: string, method: HttpMethod, body: Partial<Note> | null = null): Promise<Response> {
let requestInit: RequestInit = {
method: method,
headers: {
authorization: StrapiNoteRepository.getAuthorizationHeader()
}
};
if (body) {
requestInit["body"] = JSON.stringify({data: body});
}
return await fetch(StrapiNoteRepository.apiNoteEndpoint + path, requestInit);
}
private static mockedGetAuthorizationHeader() {
return "bearer TOKEN"
}
static getAuthorizationHeader() {
// @ts-ignore
const jwt = parseCookies('/').jwt;
return `bearer ${jwt}`
}
}

View file

@ -0,0 +1,93 @@
import type {UserRepository} from "./UserRepository";
import type {Authentication} from "../../authentication";
import type {HttpMethod} from "@sveltejs/kit/types/private";
import {StrapiNoteRepository} from "../note/StrapiNoteRepository";
import {error} from "@sveltejs/kit";
import {User} from "../../user";
export class StrapiUserRepo implements UserRepository {
private static instance: StrapiUserRepo;
public static getInstance(verification: boolean = true): StrapiUserRepo {
if (this.instance === undefined || this.instance === null) {
this.instance = new StrapiUserRepo();
this.instance.verify().then(() => {
if (verification && !this.instance.verified) {
window.location.href = "/login";
}
});
}
return this.instance;
}
private verified: boolean = false;
private constructor() {
}
private static api: string = "http://localhost:1337/api"
private static apiUserEndpoint: string = StrapiUserRepo.api + "/auth/local"
/**
* Verifies the current users jwt.
* @private
*/
private async verify() {
this.verified = false;
let result = await this.getMe();
if (!result.error) {
this.verified = true;
}
}
async getMe(): Promise<Authentication> {
const response = await StrapiUserRepo.fetchStrapi("/me", "GET", null, true, "/users")
return await response.json();
}
async registerUser(email: string, username: string, password: string): Promise<Authentication> {
const payload = {
email: email,
password: password,
username: username
};
const response = await StrapiUserRepo.fetchStrapi("/register", "POST", payload, false);
return await response.json();
}
async loginUser(identifier: string, password: string): Promise<Authentication> {
const payload = {
identifier: identifier,
password: password
};
const response = await StrapiUserRepo.fetchStrapi("/", "POST", payload, false);
return response.json();
}
private static async fetchStrapi(path: string, method: HttpMethod, body: any | null = null, authorization: boolean = true, customPath: any = null): Promise<Response> {
let requestInit: RequestInit = {
method: method,
};
if (authorization && body) {
requestInit["headers"] = {
authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
'Accept': 'application/json',
'Content-Type': 'application/json'
}
} else if (authorization) {
requestInit["headers"] = {
authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
}
} else if (body) {
requestInit["headers"] = {
'Accept': 'application/json',
'Content-Type': 'application/json'
}
}
if (body) {
requestInit["body"] = JSON.stringify(body)
}
return await fetch((customPath) ? (this.api + customPath + path) : StrapiUserRepo.apiUserEndpoint + path, requestInit);
}
}

View file

@ -0,0 +1,19 @@
import type {Authentication} from "../../authentication";
export interface UserRepository {
/**
* Registers a new user.
* @param email
* @param username
* @param password
*/
registerUser(email: string, username: string, password: string): Promise<Authentication>;
/**
* Gets the current user.
* @param jwt
*/
getMe(jwt: string): Promise<Authentication>;
loginUser(identifier: string, password: string): Promise<Authentication>;
}

View file

@ -2,5 +2,5 @@ export interface Note {
id: number; id: number;
title: string; title: string;
content: string; content: string;
lastOpened: string; lastViewed: Date;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View file

@ -1 +0,0 @@
export const ssr = false;

View file

@ -1,118 +1,48 @@
<script lang="ts"> <script lang="ts">
import type {Note} from "../types"; import type {Note} from "../models/types";
import {onMount} from "svelte"; import {onMount} from "svelte";
import {parseCookies} from "nookies"; import {StrapiNoteRepository} from "../models/repos/note/StrapiNoteRepository";
import {bearerFetch} from "../models/PomeloUtils"; import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
import {User} from "../models/user"; import {Content, Modal, Trigger} from "sv-popup";
let user: User;
const sleep = (ms) => new Promise(r => setTimeout(r, ms));
const noteRepo: StrapiNoteRepository = StrapiNoteRepository.getInstance();
let notes: Note[];
onMount(async () => { onMount(async () => {
const jwt = parseCookies("/").jwt; StrapiUserRepo.getInstance();
let invalid = !jwt; notes = await noteRepo.getNotes();
notes.forEach(note => {
if (!invalid) { note.lastViewed = new Date(note.lastViewed);
const request = await bearerFetch("/users/me", jwt); });
const response = await request.json();
if ('error' in response){
invalid = true;
} else {
user = new User(response);
}
}
if (invalid) {
window.location = "/login";
}
}); });
//TODO: TEMP!!!
const tempJson = "[{\"id\":0,\"title\":\"samc\",\"content\":\"SAAAAAAAAAAMC\",\"lastOpened\":\"2022-09-25T10:45:49.903Z\"},{\"id\":1,\"title\":\"Push\",\"content\":\"Kollege Pusch\",\"lastOpened\":\"2022-09-25T10:50:49.903Z\"},{\"id\":2,\"title\":\"Mike\",\"content\":\"C Meister\",\"lastOpened\":\"2022-09-25T10:09:13.903Z\"},{\"id\":3,\"title\":\"kekw\",\"content\":\"OMEGALUL\",\"lastOpened\":\"2022-09-25T12:03:49.903Z\"}]";
//TODO: TEMP!!!
let notes: Note[] = JSON.parse(tempJson);
sortNotesByDate();
window.localStorage.setItem("notes", JSON.stringify(notes));
/** /**
* Reloads the Notes Listing * Adds a Note with the title "New Note" and redirects to editor
* (by doing something very intelligent)
*/ */
function reloadNotesListing() { async function addNoteHandler() {
notes = notes.filter(i => i === i); const newTitle = "New Note";
const newNote = await addNote(newTitle);
noteRepo.currentNoteId = newNote.id;
window.location = "/editor";
} }
/** /**
* Sorts the "notes" Array by the lastOpened Property of a Note * Adds a new note to the Database
*/
function sortNotesByDate() {
notes.sort(function (x, y) {
if (x.lastOpened > y.lastOpened) {
return 1;
}
if (x.lastOpened < y.lastOpened) {
return -1;
}
return 0;
});
}
/**
* Gives the user a prompt to input the new title of the note and creates it if the title is valid
*/
function addNotePrompt() {
let newTitle = prompt('Name of the new Note');
console.log(notes)
if (newTitle != null && newTitle != '') {
addNote(newTitle);
console.log(notes)
sortNotesByDate();
reloadNotesListing();
window.localStorage.setItem("notes", JSON.stringify(notes));
}
}
/**
* Adds a new note to the "notes" Array with:
* * the latest id + 1 (or 0 if no notes exist)
* * no content
* @param title The title of the new Note * @param title The title of the new Note
* @return The created Note Object
*/ */
function addNote(title: string) { async function addNote(title: string): Promise<Note> {
let date = new Date(); return await noteRepo.createNote({title: title,});
let newNoteId = (notes.length == 0) ? 0 : notes[notes.length - 1].id + 1
let note: Note = {
id: newNoteId,
title: title,
content: "",
lastOpened: date.toISOString()
};
notes.push(note);
} }
/** /**
* Gives the user a prompt if they are sure to delete this note and deletes it if they confirm * Deletes the note from the "notes" Array and the database
* @param note The note to be removed * @param note The note to be deleted
*/ */
function removeNotePrompt(note) { function deleteNote(note) {
const reallyDelete = confirm("Do you really want to delete this Note?");
if (reallyDelete) {
removeNote(note);
}
}
/**
* Removes the note from the "notes" Array
* @param note The note to be removed
*/
function removeNote(note) {
notes = notes.filter(i => i !== note); notes = notes.filter(i => i !== note);
noteRepo.deleteNote(note.id);
} }
/** /**
@ -132,72 +62,112 @@
} }
/** /**
* Handles a click on a note list element * Sets the currentNoteId and redirects to the editor
* @param note The note the user clicked on * @param note The note the user clicked on
*/ */
function onNoteLiClick(note) { function onNoteLiClick(note) {
window.localStorage.setItem("clickedNoteId", note.id); noteRepo.currentNoteId = note.id;
window.location = "/editor"; window.location = "/editor";
} }
/**
* Closes the modal (popup for deletion)
*/
async function closeModal() {
closeModalBool = true;
await sleep(1);
closeModalBool = false;
}
let closeModalBool = false;
</script> </script>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta content="width=device-width, initial-scale=1" name="viewport">
<title>PomeloNote | Home</title> <title>PomeloNote | Home</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
</head> </head>
<body> <body>
<div class="row"> <div class="container">
<div class="row">
<!-- Add Note Button --> <!-- Add Note Button -->
<div class="offset-md-7 col-md-1"> <div class="offset-md-7 col-md-1">
<button class="btn btn-primary" on:click={() => addNotePrompt()}>Add Note</button> <button class="btn btn-primary" on:click={() => addNoteHandler()}>Add Note</button>
</div>
</div> </div>
<div class="row">
<div class="offset-md-4 col-md-4"> <div class="offset-md-4 col-md-4">
{#if notes}
<!-- Notes listing --> <!-- Notes listing -->
<ul> <ul>
{#each notes as note} {#each notes as note}
<li on:mouseover={() => handleMouseOverLi(note.id)} <li on:mouseover={() => handleMouseOverLi(note.id)}
on:mouseout={() => handleMouseOutLi(note.id)}> on:mouseout={() => handleMouseOutLi(note.id)}>
<div class="row"> <div class="row">
<div class="col-md-10" on:click={() => onNoteLiClick(note)}> <div class="col-10" on:click={() => onNoteLiClick(note)}>
<span> <div>
{note.title} <br/> {note.title}
{note.lastOpened}
</span>
</div> </div>
<div class="col-md-1"> <div class="list-date-text">
<button style="display: none" id={"noteButton" + note.id} {note.lastViewed.toLocaleDateString()}
on:click={() => removeNotePrompt(note)}> </div>
</div>
<div class="col-1">
<!-- Delete Note Popup -->
<Modal basic small={true} button={false} close={closeModalBool}>
<Content>
<div class="row" style="margin-bottom: 10px;">
<h5>Do you really want to delete the "{note.title}" note?</h5>
</div>
<div class="row">
<div class="col-4 offset-2">
<button class="btn btn-primary"
on:click={() => deleteNote(note)}
on:click={() => closeModal()}>
<b>Yes</b>
</button>
</div>
<div class="col-4 offset-2">
<button class="btn btn-primary" autofocus
on:click={() => closeModal()}>
<b>No</b>
</button>
</div>
</div>
</Content>
<Trigger>
<button style="display: none" id={"noteButton" + note.id}>
<i class="bi bi-x"></i> <i class="bi bi-x"></i>
</button> </button>
</Trigger>
</Modal>
</div> </div>
</div> </div>
</li> </li>
{/each} {/each}
</ul> </ul>
{/if}
</div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
<style> <style>
@import "../customBootstrap.css";
html, html,
:root { :root {
--main-txt-color: black; --sub-txt-color: gray;
--cross-txt-color: red;
--color-primary: #fff494;
--color-primary-600: #fff17a;
--color-primary-700: #ffec47;
--color-primary-800: #ffe714;
--color-primary-900: #e0c900;
} }
body { body {
@ -207,19 +177,23 @@
background-color: #ffffff; background-color: #ffffff;
} }
a {
color: var(--main-txt-color);
text-decoration: none;
}
li { li {
list-style: none; list-style: none;
padding: 6px 10px; padding: 6px 10px;
margin-bottom: 5px;
margin-top: 5px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
border-radius: 10px;
border-bottom-color: var(--color-primary-900); border-bottom-color: var(--color-primary-900);
border-top-color: var(--color-primary-900);
background-color: var(--color-primary-600); background-color: var(--color-primary-600);
} }
li:hover {
background-color: var(--color-primary-700);
}
li button { li button {
float: right; float: right;
border: none; border: none;
@ -228,10 +202,11 @@
margin: 0; margin: 0;
font-size: 18px; font-size: 18px;
cursor: pointer; cursor: pointer;
transform: scale(1.5);
} }
li button:hover { li button:hover {
transform: scale(1.7); transform: scale(2);
} }
li:last-child { li:last-child {
@ -246,15 +221,8 @@
color: var(--cross-txt-color); color: var(--cross-txt-color);
} }
.btn-primary { .list-date-text {
background-color: var(--color-primary-800); color: var(--sub-txt-color);
border: var(--color-primary-800); font-size: 0.8314159265358979323846264338rem;
color: var(--main-txt-color);
}
.btn-primary:hover {
background-color: var(--color-primary-900);
border: var(--color-primary-900);
color: var(--main-txt-color);
} }
</style> </style>

View file

@ -0,0 +1,6 @@
import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
/** @type {import('./$types').PageLoad} */
export async function load() {
// StrapiUserRepo.getInstance();
}

View file

@ -1,24 +1,81 @@
<script lang="ts"> <script lang="ts">
import type {Note} from "../../types"; import type {Note} from "../../models/types";
import {StrapiNoteRepository} from "../../models/repos/note/StrapiNoteRepository";
import {onMount} from "svelte";
let notes: Note[] = JSON.parse(window.localStorage.getItem("notes")); let noteRepo: StrapiNoteRepository;
const clickedNoteId = window.localStorage.getItem("clickedNoteId"); let currentNote: Note;
onMount(async () => {
noteRepo = StrapiNoteRepository.getInstance();
try {
currentNote = await noteRepo.getNote(noteRepo.currentNoteId);
} catch {
returnToListing();
}
title = (<Note>currentNote).title;
content = (<Note>currentNote).content;
})
/**
* saves the currently opened Note and returns to listing
*/
function saveAndQuit() {
noteRepo.updateNote(currentNote.id, {
"title": title,
"content": content,
})
returnToListing();
}
/**
* redirects to listing
*/
function returnToListing() {
window.location = "/";
}
export let title: string, content: string;
const currNote = notes.find((note)=>{
return note.id === parseInt(clickedNoteId);
});
</script> </script>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{"Pomelonote | Edit " + currNote.title}</title> <title>Editor</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
</head> </head>
<html lang="en"> <html lang="en">
<div class="offset-3 col-6"> <div class="offset-3 col-6 wrapper">
{currNote.content} <h1 class="">{title === "" ? "" : title}</h1>
<input bind:value={title} class="input"> <br/>
<textarea bind:value={content} class="input textarea"></textarea>
<div class="button-container">
<button on:click={() => saveAndQuit()} class="btn btn-primary">Save</button>
<button on:click={() => returnToListing()} class="btn btn-outline-danger">Cancel</button>
</div>
</div> </div>
</html> </html>
<style>
@import "../../customBootstrap.css";
.wrapper {
margin-top: 20px;
}
.input {
margin-bottom: 10px;
width: 100%;
}
.button-container {
float: right;
}
.textarea {
height: 300px;
}
</style>

View file

@ -1,9 +1,9 @@
<script lang="ts"> <script lang="ts">
import {setCookie} from "nookies"; import {setCookie} from "nookies";
import type {Authentication} from "./models/authentication"; import {SvelteToast} from '@zerodevx/svelte-toast'
import { SvelteToast } from '@zerodevx/svelte-toast'
import {createErrorToast} from "../../models/customToasts";
import logo from "../../resources/images/logo2.svg"; import logo from "../../resources/images/logo2.svg";
import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
let user: string; let user: string;
let password: string; let password: string;
@ -14,31 +14,12 @@
* Handles the button click. * Handles the button click.
*/ */
async function handleSubmit() { async function handleSubmit() {
const endpoint = "http://localhost:1337/api/auth/local"; const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
const payload = {
identifier: user,
password: password
};
const login = await fetch(endpoint, { const response = await userRepo.loginUser(user, password);
method: 'post',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify(payload)
})
const response: Authentication = await login.json(); if (response.error != null) {
handleErrorsFromResponseWithToast(response);
if (response.error != null){
if (response.error.details.errors){
for (const error of response.error.details.errors) {
createErrorToast(error.message);
}
} else{
createErrorToast(response.error.message);
}
} else { } else {
if (rememberMe) { if (rememberMe) {
setCookie(null, 'jwt', response.jwt, { setCookie(null, 'jwt', response.jwt, {
@ -56,34 +37,34 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta content="width=device-width, initial-scale=1" name="viewport">
<title>PomeloNote | Login</title> <title>PomeloNote | Login</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
</head> </head>
<body> <body>
<main class="form-signin w-100 m-auto"> <main class="form-signin w-100 m-auto">
<img class="img-fluid" src="{logo}" alt="Logo"> <img alt="Logo" class="img-fluid" src="{logo}">
<h1 class="h3 mb-3 fw-normal">Please sign in</h1> <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
<div class="form-floating"> <div class="form-floating">
<input type="email" class="form-control" id="floatingInput" placeholder="name@example.com" bind:value={user}> <input bind:value={user} class="form-control" id="floatingInput" placeholder="name@example.com" type="text">
<label for="floatingInput">Email address</label> <label for="floatingInput">Email address or username</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input type="password" class="form-control" id="floatingPassword" placeholder="Password" bind:value={password}> <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
<label for="floatingPassword">Password</label> <label for="floatingPassword">Password</label>
</div> </div>
<div class="checkbox mb-3"> <div class="checkbox mb-3">
<label> <label>
<input type="checkbox" value="rememberMe" bind:checked={rememberMe}> Remember me <input bind:checked={rememberMe} type="checkbox" value="rememberMe"> Remember me
</label> </label>
</div> </div>
<button class="w-100 btn btn-lg btn-primary" on:click={handleSubmit}>Sign in</button> <button class="w-100 btn btn-lg btn-primary" on:click={handleSubmit}>Sign in</button>
<a href="/register" class="opacity-75 d-flex justify-content-center text-center fs-6">No user yet? Register.</a> <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/register">No user yet? Register.</a>
<p class="mt-5 mb-3 text-muted">&copy;2022</p> <p class="mt-5 mb-3 text-muted">&copy;2022</p>
</main> </main>
@ -91,42 +72,7 @@
</body> </body>
</html> </html>
<style> <style>
html, @import "../../userInput.css";
body { @import "../../customBootstrap.css";
height: 100%;
}
body {
align-items: center;
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 330px;
padding: 15px;
}
.form-signin .form-floating:focus-within {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.img-fluid{
margin-bottom: 15px;
}
</style> </style>

View file

@ -1,8 +1,8 @@
<script lang="ts"> <script lang="ts">
import logo from "../../resources/images/logo2.svg"; import logo from "../../resources/images/logo2.svg";
import {SvelteToast} from "@zerodevx/svelte-toast"; import {SvelteToast} from "@zerodevx/svelte-toast";
import type {Authentication} from "../login/models/authentication"; import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
import {createErrorToast} from "../../models/customToasts"; import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
let user: string; let user: string;
let password: string; let password: string;
@ -13,33 +13,12 @@
* Handles the button click. * Handles the button click.
*/ */
async function handleSubmit() { async function handleSubmit() {
console.log("TEST") const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
const endpoint = "http://localhost:1337/api/auth/local/register";
const payload = {
email: email,
password: password,
username: user
};
const login = await fetch(endpoint, { const response = await userRepo.registerUser(email, user, password);
method: 'post',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify(payload)
})
const response: Authentication = await login.json();
if (response.error != null) { if (response.error != null) {
if (response.error.details.errors) { handleErrorsFromResponseWithToast(response);
for (const error of response.error.details.errors) {
createErrorToast(error.message);
}
} else {
createErrorToast(response.error.message);
}
} else { } else {
window.location = "/login"; window.location = "/login";
} }
@ -50,29 +29,29 @@
lang="en"> lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta content="width=device-width, initial-scale=1" name="viewport">
<title>PomeloNote | Register</title> <title>PomeloNote | Register</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"> integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
</head> </head>
<body> <body>
<main class="form-signin w-100 m-auto"> <main class="form-signin w-100 m-auto">
<img class="img-fluid" src="{logo}" alt="Logo"> <img alt="Logo" class="img-fluid" src="{logo}">
<h1 class="h3 mb-3 fw-normal">Register a new user</h1> <h1 class="h3 mb-3 fw-normal">Register a new user</h1>
<div class="form-floating"> <div class="form-floating">
<input type="text" class="form-control" id="floatingUsr" placeholder="exampleUsername" bind:value={user}> <input bind:value={user} class="form-control" id="floatingUsr" placeholder="exampleUsername" type="text">
<label for="floatingUsr">Username</label> <label for="floatingUsr">Username</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input type="email" class="form-control" id="floatingInput" placeholder="name@example.com" bind:value={email}> <input bind:value={email} class="form-control" id="floatingInput" placeholder="name@example.com" type="email">
<label for="floatingInput">Email address</label> <label for="floatingInput">Email address</label>
</div> </div>
<div class="form-floating"> <div class="form-floating">
<input type="password" class="form-control" id="floatingPassword" placeholder="Password" bind:value={password}> <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
<label for="floatingPassword">Password</label> <label for="floatingPassword">Password</label>
</div> </div>
@ -80,7 +59,7 @@
Register user Register user
{#if user}: {user} {/if} {#if user}: {user} {/if}
</button> </button>
<a href="/login" class="opacity-75 d-flex justify-content-center text-center fs-6">Already registered? Login.</a> <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/login">Already registered? Login.</a>
<p class="mt-5 mb-3 text-muted">&copy;2022</p> <p class="mt-5 mb-3 text-muted">&copy;2022</p>
</main> </main>
@ -89,46 +68,6 @@
</html> </html>
<style> <style>
html, @import "../../userInput.css";
body { @import "../../customBootstrap.css";
height: 100%;
}
body {
align-items: center;
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 330px;
padding: 15px;
}
.form-signin .form-floating:focus-within {
z-index: 2;
}
.form-signin input[type="text"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.img-fluid {
margin-bottom: 15px;
}
</style> </style>

View file

@ -0,0 +1,78 @@
/// <reference lib="webworker" />
import { build, files, version } from '$service-worker';
const worker = ServiceWorkerGlobalScope;
// const FILES = cache + version;
const to_cache = build.concat(files);
const staticAssets = new Set(to_cache);
worker.addEventListener('install', (event) => {
event.waitUntil(
caches
.open(FILES)
.then((cache) => cache.addAll(to_cache))
.then(() => {
worker.skipWaiting();
})
);
});
worker.addEventListener('activate', (event) => {
event.waitUntil(
caches.keys().then(async (keys) => {
// delete old caches
for (const key of keys) {
if (key !== FILES) await caches.delete(key);
}
worker.clients.claim();
})
);
});
/**
* Fetch the asset from the network and store it in the cache.
* Fall back to the cache if the user is offline.
*/
async function fetchAndCache(request) {
const cache = await caches.open(offline + version);
try {
const response = await fetch(request);
cache.put(request, response.clone());
return response;
} catch (err) {
const response = await cache.match(request);
if (response) return response;
throw err;
}
}
worker.addEventListener('fetch', (event) => {
if (event.request.method !== 'GET' || event.request.headers.has('range')) return;
const url = new URL(event.request.url);
// don't try to handle e.g. data: URIs
const isHttp = url.protocol.startsWith('http');
const isDevServerRequest =
url.hostname === self.location.hostname && url.port !== self.location.port;
const isStaticAsset = url.host === self.location.host && staticAssets.has(url.pathname);
const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset;
if (isHttp && !isDevServerRequest && !skipBecauseUncached) {
event.respondWith(
(async () => {
// always serve static files and bundler-generated assets from cache.
// if your application has other URLs with data that will never change,
// set this variable to true for them and they will only be fetched once.
const cachedAsset = isStaticAsset && (await caches.match(event.request));
return cachedAsset || fetchAndCache(event.request);
})()
);
}
});

View file

@ -0,0 +1,7 @@
import {writable} from "svelte/store";
import {browser} from "$app/environment"
export const currentNoteId = writable<number>();
if (browser) {
currentNoteId.set(Number(localStorage.getItem("currentNoteId") || ""))
currentNoteId.subscribe(val => localStorage.setItem("currentNoteId", String(val)));
}

View file

@ -0,0 +1,41 @@
html,
body {
height: 100%;
}
body {
align-items: center;
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 330px;
padding: 15px;
}
.form-signin .form-floating:focus-within {
z-index: 2;
}
.form-signin input[type="text"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.img-fluid {
margin-bottom: 15px;
}

View file

@ -0,0 +1,41 @@
{
"lang": "en",
"dir": "/",
"name": "Pomelo Note",
"short_name": "Pomelo",
"description": "Best Note App",
"theme_color": "#000",
"background_color": "#000",
"display": "standalone",
"orientation": "portrait",
"prefer_related_applications": false,
"scope": "/",
"start_url": "/",
"icons": [
{
"src": "../resources/icons/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "../resources/icons/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "../resources/icons/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "../resources/icons/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
}
],
"splash_pages": null
}

View file

@ -2,7 +2,14 @@ import { sveltekit } from '@sveltejs/kit/vite';
import type { UserConfig } from 'vite'; import type { UserConfig } from 'vite';
const config: UserConfig = { const config: UserConfig = {
plugins: [sveltekit()] plugins: [sveltekit()],
server: {
fs: {
// Allow serving files from one level up to the project root
allow: ['..'],
},
},
}; };
export default config; export default config;