diff --git a/src/App.svelte b/src/App.svelte index 0f3a9bf..6a6c73a 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -46,38 +46,11 @@ onMount(getRandomItemId); onMount(hashchange); - - - - -
-
- Light -
- - -
- - Dark -
-
- - - + {#if currentView === "/home" || currentView === "/"} @@ -107,33 +80,33 @@ - +

Topics

 - +

Formats

 - +

Random Item

 - +

Search

 -
- + +

Want to learn

 - +

Finished learning

 -
- + +

Datasette

 diff --git a/src/BookCard.svelte b/src/BookCard.svelte index d9f5764..149c186 100644 --- a/src/BookCard.svelte +++ b/src/BookCard.svelte @@ -2,13 +2,13 @@ export let item; - + {item.name}

{#if !item.image} -
+

{item.name}

{item.creators}

diff --git a/src/FormatList.svelte b/src/FormatList.svelte index 9607ff1..660cbd1 100644 --- a/src/FormatList.svelte +++ b/src/FormatList.svelte @@ -1,49 +1,16 @@ +

Learn from the following formats

- -{#each formats as format} - -
- -
-

{format.name}

- -{/each} - + {#each formats as format} + +
+ +
+

{format.name}

+ + {/each}
\ No newline at end of file diff --git a/src/GenericCard.svelte b/src/GenericCard.svelte index c1d9da6..00437ea 100644 --- a/src/GenericCard.svelte +++ b/src/GenericCard.svelte @@ -1,10 +1,22 @@ - -
- {item.name} - {item.creators} -
+ +
+
+ {item.name} + {item.creators} +
+ +
+ {#each item.links.split(";") as type} + {type.split("|")[0]} + + + {/each} +
+
+ \ No newline at end of file diff --git a/src/ItemCard.svelte b/src/ItemCard.svelte index 5553b70..5e9dfdc 100644 --- a/src/ItemCard.svelte +++ b/src/ItemCard.svelte @@ -7,57 +7,6 @@ export let displayType = null; - - - {#if item.links.includes('book|') && item.links.includes('video|')} {#if displayType == 'video'} diff --git a/src/ItemDetail.svelte b/src/ItemDetail.svelte index 6c23666..8c6331a 100644 --- a/src/ItemDetail.svelte +++ b/src/ItemDetail.svelte @@ -70,310 +70,313 @@ {#if item} -
-

+

{#each item.topics.split(";") as topicname} {topicname} {/each}

-
- -
- {#if item.image} - {item.name} - - {:else if item.links.includes('book')} - {item.name} - - {:else if item.links.includes('video')} -
- {item.name} -
+ --> +
{:else}

loading...

{/if} diff --git a/src/ItemList.svelte b/src/ItemList.svelte index 6a674b4..cf0f9c9 100644 --- a/src/ItemList.svelte +++ b/src/ItemList.svelte @@ -22,10 +22,12 @@ -

{kind == 0 ? 'Want to learn' : 'Finished learning'}

-
- +

{kind == 0 ? 'Want to learn' : 'Finished learning'}

+ + + +
{#each items as item} {/each} diff --git a/src/SearchForm.svelte b/src/SearchForm.svelte index 6844559..d0a6e48 100644 --- a/src/SearchForm.svelte +++ b/src/SearchForm.svelte @@ -18,7 +18,7 @@ -
+ diff --git a/src/TopicDetail.svelte b/src/TopicDetail.svelte index 28ab558..155cd5f 100644 --- a/src/TopicDetail.svelte +++ b/src/TopicDetail.svelte @@ -67,7 +67,7 @@ {#if format.id == 'book'} -
+
{#each filteredItems.filter(x => x.links.includes(format.id + '|')) as item} {/each} diff --git a/src/TopicMasonryGrid.svelte b/src/TopicMasonryGrid.svelte index 5de9295..88865d0 100644 --- a/src/TopicMasonryGrid.svelte +++ b/src/TopicMasonryGrid.svelte @@ -86,16 +86,16 @@
{#each [...map.entries()] as parent} -
+
{#if typeof(parent[0]) == "string"} { parent[0] } {:else} - { format_topic_name(parent[0]) } + { format_topic_name(parent[0]) } {/if}
{#each parent[1] as child} - {format_topic_name(child)} + {format_topic_name(child)} {/each}
diff --git a/src/VideoCard.svelte b/src/VideoCard.svelte index 4a81515..9782f17 100644 --- a/src/VideoCard.svelte +++ b/src/VideoCard.svelte @@ -18,7 +18,7 @@ - +
@@ -42,8 +42,8 @@
- {item.name} - {item.creators} + {item.name} + {item.creators}
diff --git a/src/tailwindui/AppShell.svelte b/src/tailwindui/AppShell.svelte index 18179fd..3600644 100644 --- a/src/tailwindui/AppShell.svelte +++ b/src/tailwindui/AppShell.svelte @@ -7,7 +7,7 @@ -
+
{#if isNavDrawerOpen}