diff --git a/CHANGELOG.md b/CHANGELOG.md index 2523585..c93eb73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - notification after redirect - redirect to requested page after login/registration - make theme persistent (save in local storage) +- various small UI/UX improvements +- fetch and show toilet data on new review page ## Changelog init (Version 1.0) diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 3b67e7c..313fbc1 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -32,8 +32,8 @@

Know the toilets around you

Spread and gain knowledge about the arguably most important room in a building.

- View Toilets - Login and leave a review + Reviews + Toilets
diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 8d2f83c..96c2ef7 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -15,7 +15,8 @@
-

Hello there, your profile

+

Hello {data.profile.username}

+

Here's your profile.

@@ -25,32 +26,45 @@
- +
-
- -
-
- +
+
+ +
+
+ +
+
-
-
- -
- -
-
- +
+ +
+
+ +
+
-
+
+ + + Your toilets + + + + + Your reviews + +
+ diff --git a/frontend/src/routes/review/[toilet]/+page.server.js b/frontend/src/routes/review/[toilet]/+page.server.js index 9dbdc68..c523f13 100644 --- a/frontend/src/routes/review/[toilet]/+page.server.js +++ b/frontend/src/routes/review/[toilet]/+page.server.js @@ -16,7 +16,13 @@ export async function load({ params, cookies }) { return error(500, "Error fetching user, please try again later.") } - return { toilet: params.toilet } + const toilet = await f.get(`${env.API_URL}/api/toilets/${params.toilet}`, {}) + + if (!toilet.ok) { + return error(500, "Error fetching toilet, please try again later.") + } + + return { toilet: toilet.json } } export const actions = { diff --git a/frontend/src/routes/review/[toilet]/+page.svelte b/frontend/src/routes/review/[toilet]/+page.svelte index 0ba1cfa..2d973d4 100644 --- a/frontend/src/routes/review/[toilet]/+page.svelte +++ b/frontend/src/routes/review/[toilet]/+page.svelte @@ -10,7 +10,7 @@ export let data export let form - let toilet = data.toilet + let toilet = data.toilet.id let rating = 0 let description = "" let paper = false @@ -43,73 +43,105 @@ -
- +
+
- +
- +
-
-
- +
+
- +
- +
-
- +
- +
-

NO

-

YES

- +
-
- +
+
- +
-

NO

-

YES

- +
+
-
- +
+
- +
-

NO

-

YES

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

NO

+

YES

+ +
+
+
+ +
+
+ +
+

NO

+

YES

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

NO

+

YES

+ +
+
+
+ +
+
+ +
+

NO

+

YES

+
-

NO

-

YES

-
diff --git a/frontend/src/routes/reviews/+page.svelte b/frontend/src/routes/reviews/+page.svelte index cb1bf50..1900734 100644 --- a/frontend/src/routes/reviews/+page.svelte +++ b/frontend/src/routes/reviews/+page.svelte @@ -18,15 +18,17 @@ } function isValid(review) { - const { toilet_id, title, university, place, building, author_name, description } = review + let lowFilter = filter.toLowerCase() + const { toilet_id, title, university, place, building, author_name, author_id, description } = review return ( - toilet_id.toLowerCase().includes(filter) || - title.toLowerCase().includes(filter) || - university.toLowerCase().includes(filter) || - place.toLowerCase().includes(filter) || - building.toLowerCase().includes(filter) || - author_name.toLowerCase().includes(filter) || - description.toLowerCase().includes(filter) + toilet_id.toLowerCase().includes(lowFilter) || + title.toLowerCase().includes(lowFilter) || + university.toLowerCase().includes(lowFilter) || + place.toLowerCase().includes(lowFilter) || + building.toLowerCase().includes(lowFilter) || + author_name.toLowerCase().includes(lowFilter) || + author_id.toLowerCase().includes(lowFilter) || + description.toLowerCase().includes(lowFilter) ) } @@ -35,7 +37,7 @@

Reviews available

-

Visit /toilets page to leave a review.

+

Visit toilets page to leave a review.