From b4d07a7d6fea329f6984e9a656755df5fb3b4ec8 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Tue, 29 Aug 2023 23:30:42 -0400 Subject: [PATCH 01/43] Persist language in localStorage --- src/lib/language/translate.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/lib/language/translate.ts b/src/lib/language/translate.ts index 1e78e19..6877bd6 100644 --- a/src/lib/language/translate.ts +++ b/src/lib/language/translate.ts @@ -1,11 +1,28 @@ // Code unapologetically copied from: https://dev.to/danawoodman/svelte-quick-tip-adding-basic-internationalization-i18n-to-you-app-2lm - +import { browser } from "$app/environment"; import { derived, writable } from "svelte/store"; import translations from "./translations"; -export const locale = writable("en"); +const DEFAULT_LOCALE = 'en'; + +function getInitialLocaleValue() { + if (browser) { + const savedValue = window.localStorage.getItem('locale'); + return savedValue ?? DEFAULT_LOCALE; + } + + return DEFAULT_LOCALE; +} + +export const locale = writable(getInitialLocaleValue()); export const locales = Object.keys(translations); +locale.subscribe((value) => { + if (browser) { + window.localStorage.setItem('locale', value); + } +}); + function translate(locale, key, vars) { // Let's throw some errors if we're trying to use keys/locales that don't exist. // We could improve this by using Typescript and/or fallback values. From 20d58c223b48382a45c257ff86af6fd1f4e2ef0d Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 30 Aug 2023 23:31:34 -0400 Subject: [PATCH 02/43] Add AppData and Thing models --- src/lib/models/AppData.ts | 6 ++++++ src/lib/models/Thing.ts | 9 +++++++++ src/lib/server/api.ts | 10 ++++++++++ src/lib/stores/catalog.ts | 5 +++-- src/routes/+page.server.ts | 9 +++------ src/routes/+page.svelte | 6 +++--- 6 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 src/lib/models/AppData.ts create mode 100644 src/lib/models/Thing.ts create mode 100644 src/lib/server/api.ts diff --git a/src/lib/models/AppData.ts b/src/lib/models/AppData.ts new file mode 100644 index 0000000..afa1a09 --- /dev/null +++ b/src/lib/models/AppData.ts @@ -0,0 +1,6 @@ +import type { Thing } from "./Thing"; + +export interface AppData { + things: Thing[]; + categories: string[]; +} \ No newline at end of file diff --git a/src/lib/models/Thing.ts b/src/lib/models/Thing.ts new file mode 100644 index 0000000..a0e0448 --- /dev/null +++ b/src/lib/models/Thing.ts @@ -0,0 +1,9 @@ +export interface Thing { + id: string; + name: string; + spanishName?: string; + categories: string[]; + image?: string; + stock: number; + available: number; +} \ No newline at end of file diff --git a/src/lib/server/api.ts b/src/lib/server/api.ts new file mode 100644 index 0000000..b03f198 --- /dev/null +++ b/src/lib/server/api.ts @@ -0,0 +1,10 @@ +import type { AppData } from "$lib/models/AppData"; + +export const fetchThings = async (fetch): Promise => { + const host = process.env.API_HOST ?? 'http://localhost:8088'; + const result = await fetch(`${host}/things`); + const data: AppData = await result.json(); + data.things = data.things.filter(thing => thing.categories); + + return data; +}; \ No newline at end of file diff --git a/src/lib/stores/catalog.ts b/src/lib/stores/catalog.ts index ea227cd..e8f555c 100644 --- a/src/lib/stores/catalog.ts +++ b/src/lib/stores/catalog.ts @@ -1,3 +1,4 @@ +import type { Thing } from "$lib/models/Thing"; import { defaultFilterCategory, filter } from "$lib/utils/filters"; import { derived, writable } from "svelte/store"; @@ -7,7 +8,7 @@ export const searchFilter = writable(''); export const wishListFilter = writable(false); -export const things = writable<[]>(undefined); +export const things = writable(undefined); export const filteredThings = derived( [things, categoryFilter, searchFilter, wishListFilter], @@ -20,4 +21,4 @@ export const filteredThings = derived( } ); -export const categories = writable<[]>(undefined); \ No newline at end of file +export const categories = writable(undefined); \ No newline at end of file diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 3e3f580..7977c28 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,8 +1,5 @@ -export const load = async ({ fetch }) => { - const host = process.env.API_HOST ?? 'http://localhost:8088'; - const result = await fetch(`${host}/things`); - const data = await result.json(); - data.things = data.things.filter(thing => thing.categories); +import { fetchThings } from '$lib/server/api.js' - return data; +export const load = async ({ fetch }) => { + return fetchThings(fetch); } \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b85b09e..d86c033 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,9 +1,9 @@ + +
+
+

It's not loading!

+

{$page.status} {$page.error.message}

+
+
\ No newline at end of file From 0443c35f170d95c95296a2d3482ea2e1d15d2ba9 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Tue, 12 Sep 2023 20:06:30 -0400 Subject: [PATCH 04/43] Introduce bottom navigation bar --- src/lib/components/Head.svelte | 1 + src/lib/icons/book-open.svg | 3 +++ src/lib/icons/bookmark.svg | 3 +++ src/lib/stores/app.ts | 8 +++++++ src/lib/views/BottomNavigationView.svelte | 22 ++++++++++++++++++ src/lib/views/CatalogView.svelte | 25 +++++++++++++++++++++ src/routes/+page.svelte | 27 +++++------------------ 7 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 src/lib/icons/book-open.svg create mode 100644 src/lib/icons/bookmark.svg create mode 100644 src/lib/stores/app.ts create mode 100644 src/lib/views/BottomNavigationView.svelte create mode 100644 src/lib/views/CatalogView.svelte diff --git a/src/lib/components/Head.svelte b/src/lib/components/Head.svelte index 56898fb..0f1cf1a 100644 --- a/src/lib/components/Head.svelte +++ b/src/lib/components/Head.svelte @@ -25,4 +25,5 @@ + \ No newline at end of file diff --git a/src/lib/icons/book-open.svg b/src/lib/icons/book-open.svg new file mode 100644 index 0000000..c512f1c --- /dev/null +++ b/src/lib/icons/book-open.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/lib/icons/bookmark.svg b/src/lib/icons/bookmark.svg new file mode 100644 index 0000000..03f684e --- /dev/null +++ b/src/lib/icons/bookmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts new file mode 100644 index 0000000..999c3dd --- /dev/null +++ b/src/lib/stores/app.ts @@ -0,0 +1,8 @@ +import { writable } from "svelte/store"; + +export enum Screen { + catalog, + myList +} + +export const activeScreen = writable(Screen.catalog); \ No newline at end of file diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte new file mode 100644 index 0000000..6e053fd --- /dev/null +++ b/src/lib/views/BottomNavigationView.svelte @@ -0,0 +1,22 @@ + + +
+ + +
\ No newline at end of file diff --git a/src/lib/views/CatalogView.svelte b/src/lib/views/CatalogView.svelte new file mode 100644 index 0000000..bc85fed --- /dev/null +++ b/src/lib/views/CatalogView.svelte @@ -0,0 +1,25 @@ + + + +
+
+ + +
+ +
+
+ {#if $filteredThings.length > 0} + + {:else} +
{$t('No Results')}
+ {/if} +
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index d86c033..6ba2101 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,13 +1,9 @@ - - \ No newline at end of file diff --git a/src/lib/components/layout/Header.svelte b/src/lib/components/layout/Header.svelte deleted file mode 100644 index bffde2e..0000000 --- a/src/lib/components/layout/Header.svelte +++ /dev/null @@ -1,35 +0,0 @@ - - -
-
-
- -
-
- - PVD Things - -
-
- {#each locales as localeKey} - - {/each} -
-
-

PVD Things

-
\ No newline at end of file diff --git a/src/lib/components/layout/Layout.svelte b/src/lib/components/layout/Layout.svelte deleted file mode 100644 index 3a5768e..0000000 --- a/src/lib/components/layout/Layout.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -
-
-
-
-
\ No newline at end of file diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte index 6e053fd..f791945 100644 --- a/src/lib/views/BottomNavigationView.svelte +++ b/src/lib/views/BottomNavigationView.svelte @@ -4,19 +4,25 @@ import { activeScreen, Screen } from '$lib/stores/app'; -
+
-
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 5a6d8bb..77ade0a 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,17 +1,22 @@ - - - - \ No newline at end of file +
+ +
+ +
+ +
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6ba2101..8cfce66 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -3,7 +3,6 @@ import { LoadingIndicator } from '$lib/components'; import { categories, things, wishListFilter } from '$lib/stores/catalog'; import CatalogView from '$lib/views/CatalogView.svelte'; - import BottomNavigationView from '$lib/views/BottomNavigationView.svelte'; export let data; @@ -22,7 +21,6 @@ {:else}
-
{/if} From d4cf9def823142f96c1a6dc401e408d7c736b247 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Tue, 12 Sep 2023 23:47:44 -0400 Subject: [PATCH 06/43] Add working language and home buttons to app bar --- src/lib/components/AppBar.svelte | 13 +++++++++++ src/lib/components/HomeButton.svelte | 16 ++++++++++++++ src/lib/components/Title.svelte | 19 ---------------- src/lib/components/index.ts | 3 +-- src/lib/components/layout/AppBar.svelte | 27 ----------------------- src/lib/language/translations.ts | 8 +++++-- src/lib/views/BottomNavigationView.svelte | 12 ++++++---- src/lib/views/LanguageToggleView.svelte | 14 ++++++++++++ src/routes/+layout.svelte | 9 ++++++-- 9 files changed, 65 insertions(+), 56 deletions(-) create mode 100644 src/lib/components/AppBar.svelte create mode 100644 src/lib/components/HomeButton.svelte delete mode 100644 src/lib/components/Title.svelte delete mode 100644 src/lib/components/layout/AppBar.svelte create mode 100644 src/lib/views/LanguageToggleView.svelte diff --git a/src/lib/components/AppBar.svelte b/src/lib/components/AppBar.svelte new file mode 100644 index 0000000..6f06e41 --- /dev/null +++ b/src/lib/components/AppBar.svelte @@ -0,0 +1,13 @@ +
+
+ +
+
+ + PVD Things + +
+
+ +
+
\ No newline at end of file diff --git a/src/lib/components/HomeButton.svelte b/src/lib/components/HomeButton.svelte new file mode 100644 index 0000000..835326a --- /dev/null +++ b/src/lib/components/HomeButton.svelte @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/lib/components/Title.svelte b/src/lib/components/Title.svelte deleted file mode 100644 index c347c1d..0000000 --- a/src/lib/components/Title.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - -

- -

- - \ No newline at end of file diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 1a9fd88..9dcf982 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -4,5 +4,4 @@ export { default as Column } from "./Column.svelte"; export { default as Head } from "./Head.svelte"; export { default as LoadingIndicator } from "./LoadingIndicator.svelte"; export { default as Row } from "./Row.svelte"; -export { default as TextInput } from "./TextInput.svelte"; -export { default as Title } from "./Title.svelte"; \ No newline at end of file +export { default as TextInput } from "./TextInput.svelte"; \ No newline at end of file diff --git a/src/lib/components/layout/AppBar.svelte b/src/lib/components/layout/AppBar.svelte deleted file mode 100644 index 14d37f8..0000000 --- a/src/lib/components/layout/AppBar.svelte +++ /dev/null @@ -1,27 +0,0 @@ -
-
- -
-
- - PVD Things - -
-
-
-
\ No newline at end of file diff --git a/src/lib/language/translations.ts b/src/lib/language/translations.ts index b53277d..de70258 100644 --- a/src/lib/language/translations.ts +++ b/src/lib/language/translations.ts @@ -30,7 +30,9 @@ export default { "OK": "OK", "Hours": "Hours", "Wednesday": "Wednesday", - "Saturday": "Saturday" + "Saturday": "Saturday", + "Catalog": "Catalog", + "My List": "My List" }, es: { "Button.Home": "Inicio", @@ -64,6 +66,8 @@ export default { "Crafts": "Artesanía", "Pet": "Mascotas", "Automotive": "Automotor", - "Health": "Salud" + "Health": "Salud", + "Catalog": "Catálago", + "My List": "My lista" } } \ No newline at end of file diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte index f791945..2ef9d22 100644 --- a/src/lib/views/BottomNavigationView.svelte +++ b/src/lib/views/BottomNavigationView.svelte @@ -1,7 +1,11 @@
@@ -9,15 +13,15 @@ class:active={$activeScreen === Screen.catalog} on:click={() => $activeScreen = Screen.catalog} > - Catalog - Catalog + {catalog} + {catalog}
diff --git a/src/lib/views/LanguageToggleView.svelte b/src/lib/views/LanguageToggleView.svelte new file mode 100644 index 0000000..7589713 --- /dev/null +++ b/src/lib/views/LanguageToggleView.svelte @@ -0,0 +1,14 @@ + + + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 77ade0a..a7d53f6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,7 +2,9 @@ import '../app.css'; import { Head } from '$lib/components'; import BottomNavigationView from '$lib/views/BottomNavigationView.svelte'; - import AppBar from '$lib/components/layout/AppBar.svelte'; + import AppBar from '$lib/components/AppBar.svelte'; + import LanguageToggleView from '$lib/views/LanguageToggleView.svelte'; + import HomeButton from '$lib/components/HomeButton.svelte';
- + + + +
From 069f94234e4d59e420db3ff5b7b895767e513a5d Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Tue, 12 Sep 2023 23:53:15 -0400 Subject: [PATCH 07/43] Fix translation --- src/lib/language/translations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/language/translations.ts b/src/lib/language/translations.ts index de70258..abbeacb 100644 --- a/src/lib/language/translations.ts +++ b/src/lib/language/translations.ts @@ -68,6 +68,6 @@ export default { "Automotive": "Automotor", "Health": "Salud", "Catalog": "Catálago", - "My List": "My lista" + "My List": "Mi lista" } } \ No newline at end of file From e1aa577b2bb57a6313cb96b6cf6158a68c6cebe0 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 07:31:32 -0400 Subject: [PATCH 08/43] Hide bottom nav bar on lg+ screens --- src/lib/views/BottomNavigationView.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte index 2ef9d22..ddd4295 100644 --- a/src/lib/views/BottomNavigationView.svelte +++ b/src/lib/views/BottomNavigationView.svelte @@ -8,7 +8,7 @@ const myList = $t('My List'); -
+
- + +
\ No newline at end of file + .upward-shadow { + box-shadow: 0 -1px 4px rgba(50, 50, 50, 0.2); + } + From 4f25454700e5714fc4978e498c15b8105a5cc93f Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 08:16:21 -0400 Subject: [PATCH 12/43] Fix bottom nav translation --- src/lib/views/BottomNavigationView.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte index 0a5dfb2..dcfdb7d 100644 --- a/src/lib/views/BottomNavigationView.svelte +++ b/src/lib/views/BottomNavigationView.svelte @@ -6,8 +6,8 @@ import { t } from '$lib/language/translate'; import { activeScreen, Screen } from '$lib/stores/app'; - const catalog = $t('Catalog'); - const myList = $t('My List'); + $: catalogText = $t('Catalog'); + $: myListText = $t('My List');
@@ -17,11 +17,11 @@ > {catalog} - {catalog} + {catalogText}
From aac12ec34ff661c26868bbd8a4fdfd83dbf86176 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 08:21:51 -0400 Subject: [PATCH 13/43] Simplify donate text and improve Spanish translation --- src/lib/components/things/Thing.svelte | 2 +- src/lib/language/translations.ts | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/components/things/Thing.svelte b/src/lib/components/things/Thing.svelte index d50d96e..82ff3a5 100644 --- a/src/lib/components/things/Thing.svelte +++ b/src/lib/components/things/Thing.svelte @@ -62,7 +62,7 @@
{#if hasZeroStock} - {isMobile ? $t('Donate') : $t('Click to Donate')} + {$t('Donate')} {:else if noneAvailable} {isMobile ? `${thing.available} / ${thing.stock}` : $t('Unavailable')} {:else} diff --git a/src/lib/language/translations.ts b/src/lib/language/translations.ts index abbeacb..77224b8 100644 --- a/src/lib/language/translations.ts +++ b/src/lib/language/translations.ts @@ -6,7 +6,6 @@ export default { "Input.Search": "Search...", "No Results": "No Results", "Donate": "Donate", - "Click to Donate": "Click to Donate", "Available": "Available", "Unavailable": "Unavailable", "All": "All", @@ -36,13 +35,12 @@ export default { }, es: { "Button.Home": "Inicio", - "Button.Donate": "Donar", + "Button.Donate": "Done", "Button.WishList": "Donaciones", "Category": "Categoría", "Input.Search": "Buscar...", "No Results": "No hay resultados", - "Donate": "Donar", - "Click to Donate": "Clic para donar", + "Donate": "Done", "How to Borrow": "Como pedir prestado", "How to Borrow.Step1": "Compre una membresía de PVD Things y pague cuotas anuales.", "How to Borrow.Step2": "Visítenos en 12 Library Court en Providence.", From 6aa6bfab44e63876f803ad8630247a8b36daebbb Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 11:22:57 -0400 Subject: [PATCH 14/43] Fix z-index of chooser body --- src/lib/components/Chooser/ChooserBody.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/Chooser/ChooserBody.svelte b/src/lib/components/Chooser/ChooserBody.svelte index f9c8c02..0c61881 100644 --- a/src/lib/components/Chooser/ChooserBody.svelte +++ b/src/lib/components/Chooser/ChooserBody.svelte @@ -15,7 +15,7 @@
From 655a53df8ca64b8540a2b5316340ceeaf848dd97 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 13:47:27 -0400 Subject: [PATCH 15/43] Match AppBar color to website --- src/lib/components/AppBar.svelte | 2 +- src/routes/+layout.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/AppBar.svelte b/src/lib/components/AppBar.svelte index 6f06e41..658c8b2 100644 --- a/src/lib/components/AppBar.svelte +++ b/src/lib/components/AppBar.svelte @@ -1,4 +1,4 @@ -
+
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 3f6e611..42b4f2d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,7 +15,7 @@ url="https://app.pvdthings.coop" twitterHandle="@pvdthings" /> -
+
From ad58fc78913e20c0db30e5b0d60ce4c18a09c3b3 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 13 Sep 2023 17:15:35 -0400 Subject: [PATCH 16/43] Add info navigation item --- src/lib/icons/info-circle.svg | 3 +++ src/lib/icons/solid/info-circle.svg | 3 +++ src/lib/language/translations.ts | 6 ++++-- src/lib/stores/app.ts | 3 ++- src/lib/views/BottomNavigationView.svelte | 16 ++++++++++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/lib/icons/info-circle.svg create mode 100644 src/lib/icons/solid/info-circle.svg diff --git a/src/lib/icons/info-circle.svg b/src/lib/icons/info-circle.svg new file mode 100644 index 0000000..1659d20 --- /dev/null +++ b/src/lib/icons/info-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/lib/icons/solid/info-circle.svg b/src/lib/icons/solid/info-circle.svg new file mode 100644 index 0000000..d7502ca --- /dev/null +++ b/src/lib/icons/solid/info-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/lib/language/translations.ts b/src/lib/language/translations.ts index 77224b8..1783441 100644 --- a/src/lib/language/translations.ts +++ b/src/lib/language/translations.ts @@ -31,7 +31,8 @@ export default { "Wednesday": "Wednesday", "Saturday": "Saturday", "Catalog": "Catalog", - "My List": "My List" + "My List": "My List", + "Info": "Info" }, es: { "Button.Home": "Inicio", @@ -66,6 +67,7 @@ export default { "Automotive": "Automotor", "Health": "Salud", "Catalog": "Catálago", - "My List": "Mi lista" + "My List": "Mi lista", + "Info": "Información" } } \ No newline at end of file diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts index 999c3dd..54f963c 100644 --- a/src/lib/stores/app.ts +++ b/src/lib/stores/app.ts @@ -2,7 +2,8 @@ import { writable } from "svelte/store"; export enum Screen { catalog, - myList + myList, + info } export const activeScreen = writable(Screen.catalog); \ No newline at end of file diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte index dcfdb7d..2b7d6b2 100644 --- a/src/lib/views/BottomNavigationView.svelte +++ b/src/lib/views/BottomNavigationView.svelte @@ -1,13 +1,17 @@
@@ -35,6 +39,18 @@ /> {myListText} +
\ No newline at end of file diff --git a/src/lib/views/InfoView/index.ts b/src/lib/views/InfoView/index.ts new file mode 100644 index 0000000..78e106f --- /dev/null +++ b/src/lib/views/InfoView/index.ts @@ -0,0 +1,3 @@ +import InfoView from "./InfoView.svelte"; + +export default InfoView; \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index afc84fa..9fc510f 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -5,6 +5,7 @@ import { categories, things, wishListFilter } from '$lib/stores/catalog'; import CatalogView from '$lib/views/CatalogView.svelte'; import MyListView from '$lib/views/MyListView'; + import InfoView from '$lib/views/InfoView'; export let data; @@ -29,6 +30,10 @@ {#if $activeScreen === Screen.myList} {/if} + + {#if $activeScreen === Screen.info} + + {/if}
{/if}
From 0e8188655fc2fb4b6cc7e215aabb4d8f717ca573 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Sat, 16 Sep 2023 11:37:26 -0400 Subject: [PATCH 30/43] Show borrow modal on desktop devices --- .../BorrowModal/BorrowModal.svelte | 0 .../{things => }/BorrowModal/index.ts | 0 .../{things => }/BorrowModal/stores.ts | 0 src/lib/components/things/Thing.svelte | 23 +++++++++++++------ src/lib/views/CatalogView.svelte | 4 +++- 5 files changed, 19 insertions(+), 8 deletions(-) rename src/lib/components/{things => }/BorrowModal/BorrowModal.svelte (100%) rename src/lib/components/{things => }/BorrowModal/index.ts (100%) rename src/lib/components/{things => }/BorrowModal/stores.ts (100%) diff --git a/src/lib/components/things/BorrowModal/BorrowModal.svelte b/src/lib/components/BorrowModal/BorrowModal.svelte similarity index 100% rename from src/lib/components/things/BorrowModal/BorrowModal.svelte rename to src/lib/components/BorrowModal/BorrowModal.svelte diff --git a/src/lib/components/things/BorrowModal/index.ts b/src/lib/components/BorrowModal/index.ts similarity index 100% rename from src/lib/components/things/BorrowModal/index.ts rename to src/lib/components/BorrowModal/index.ts diff --git a/src/lib/components/things/BorrowModal/stores.ts b/src/lib/components/BorrowModal/stores.ts similarity index 100% rename from src/lib/components/things/BorrowModal/stores.ts rename to src/lib/components/BorrowModal/stores.ts diff --git a/src/lib/components/things/Thing.svelte b/src/lib/components/things/Thing.svelte index 027d339..2cc5e21 100644 --- a/src/lib/components/things/Thing.svelte +++ b/src/lib/components/things/Thing.svelte @@ -3,13 +3,14 @@ import BookmarkIcon from './BookmarkIcon.svelte'; import { t, locale } from '$lib/language/translate'; import { things } from '$lib/stores/myList'; + import { showBorrowModal } from '../BorrowModal/stores'; export let thing; let innerWidth = 0; let language; - $: isMobile = innerWidth < 600; + $: isMobile = innerWidth < 1024; $: fontSize = thing.name.length > 13 || isMobile ? 'text-sm' : 'text-base'; $: isInList = $things.find(t => t.id === thing.id) !== undefined; @@ -32,19 +33,27 @@ const onClick = () => { if (!hasZeroStock) { - const existingThing = $things.find(t => t.id === thing.id); - if (existingThing) { - // remove - things.update(value => value.filter(t => t.id !== thing.id)); + if (isMobile) { + updateList(); } else { - // add - things.update(value => [thing, ...value]); + showBorrowModal.set(true); } } else { window.open(donateURL, '_blank').focus(); } }; + const updateList = () => { + const existingThing = $things.find(t => t.id === thing.id); + if (existingThing) { + // remove + things.update(value => value.filter(t => t.id !== thing.id)); + } else { + // add + things.update(value => [thing, ...value]); + } + }; + locale.subscribe((value) => { language = value; }); diff --git a/src/lib/views/CatalogView.svelte b/src/lib/views/CatalogView.svelte index 5b14fa9..aece710 100644 --- a/src/lib/views/CatalogView.svelte +++ b/src/lib/views/CatalogView.svelte @@ -1,5 +1,6 @@ @@ -11,7 +12,7 @@
  • {$t('How to Borrow.Step2')}
    • -
    From b45ed1694f6ffb679d07f5d36f20b450b50a6bd3 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Mon, 2 Oct 2023 21:07:50 -0400 Subject: [PATCH 39/43] Re-skin Chooser, TextInput, InfoView --- src/lib/components/Chooser/Chooser.css | 2 +- src/lib/components/Chooser/Chooser.svelte | 2 +- src/lib/components/Chooser/ChooserBody.svelte | 4 ++-- src/lib/components/TextInput.svelte | 2 +- src/lib/components/things/Thing.svelte | 2 +- src/lib/icons/chevron.svg | 2 +- src/lib/views/CatalogView.svelte | 3 ++- src/lib/views/InfoView/InfoView.svelte | 6 +++--- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/components/Chooser/Chooser.css b/src/lib/components/Chooser/Chooser.css index c568e0c..302834d 100644 --- a/src/lib/components/Chooser/Chooser.css +++ b/src/lib/components/Chooser/Chooser.css @@ -1,3 +1,3 @@ button.chooser-button { - @apply px-3 py-1 font-bold font-display text-left outline-none; + @apply px-3 py-1 font-semibold font-display text-left outline-none; } \ No newline at end of file diff --git a/src/lib/components/Chooser/Chooser.svelte b/src/lib/components/Chooser/Chooser.svelte index fd99008..61efff3 100644 --- a/src/lib/components/Chooser/Chooser.svelte +++ b/src/lib/components/Chooser/Chooser.svelte @@ -37,7 +37,7 @@
    {}} on:keypress={() => {}}>