diff --git a/src/lib/blog.json b/src/lib/blog.json index 034abaf..646d30e 100644 --- a/src/lib/blog.json +++ b/src/lib/blog.json @@ -1,22 +1,5 @@ [ - { "id": 1, "title": "Hello, World!", "image": "/img/blogtest1.gif" }, - { "id": 2, "title": "Hardware", "image": "/img/blogtest2.gif" }, - { "id": 3, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 4, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 5, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 6, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 7, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 8, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 9, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 10, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 11, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 12, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 13, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 14, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 15, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 16, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 17, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 18, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 19, "title": "Test Post", "image": "/img/blogtest3.gif" }, - { "id": 20, "title": "Test Post", "image": "/img/blogtest3.gif" } + { "id": 1, "slug": "hello-world", "title": "Hello, World!", "image": "/img/blogtest1.gif" }, + { "id": 2, "slug": "hardware", "title": "Hardware", "image": "/img/blogtest2.gif" }, + { "id": 3, "slug": "test-post", "title": "Test Post", "image": "/img/blogtest3.gif" } ] diff --git a/src/lib/components/Blog/ListedPost.svelte b/src/lib/components/Blog/ListedPost.svelte index 5bc833f..95a58ef 100644 --- a/src/lib/components/Blog/ListedPost.svelte +++ b/src/lib/components/Blog/ListedPost.svelte @@ -1,14 +1,13 @@
-
+ diff --git a/src/lib/components/Icons/Back.svelte b/src/lib/components/Icons/Back.svelte new file mode 100644 index 0000000..4d9da10 --- /dev/null +++ b/src/lib/components/Icons/Back.svelte @@ -0,0 +1,12 @@ + diff --git a/src/lib/components/Icons/First.svelte b/src/lib/components/Icons/First.svelte deleted file mode 100644 index 9578755..0000000 --- a/src/lib/components/Icons/First.svelte +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/lib/components/Icons/Last.svelte b/src/lib/components/Icons/Last.svelte deleted file mode 100644 index 0b919bd..0000000 --- a/src/lib/components/Icons/Last.svelte +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/lib/components/Icons/Next.svelte b/src/lib/components/Icons/Next.svelte new file mode 100644 index 0000000..7af7309 --- /dev/null +++ b/src/lib/components/Icons/Next.svelte @@ -0,0 +1,10 @@ + diff --git a/src/routes/blog/+page.svelte b/src/routes/blog/+page.svelte index c55358e..dff933b 100644 --- a/src/routes/blog/+page.svelte +++ b/src/routes/blog/+page.svelte @@ -4,26 +4,27 @@ import blog from '$lib/blog.json'; import ListedPost from '$lib/components/Blog/ListedPost.svelte'; - import First from '$lib/components/Icons/First.svelte'; - import Last from '$lib/components/Icons/Last.svelte'; + import Back from '$lib/components/Icons/Back.svelte'; + import Next from '$lib/components/Icons/Next.svelte'; import ScaffoldListedPost from '$lib/components/Blog/ScaffoldListedPost.svelte'; /** @type {any[]} */ let posts = loadPosts(0); - let pages = Math.ceil(blog.length / 12); + let pages = Math.ceil(blog.length / 16); let selectedPage = writable(0); /** @param {number} index */ function loadPosts(index) { let page = Array.from(blog); page.reverse(); - page = page.slice(index * 12, (index + 1) * 12); + page = page.slice(index * 16, (index + 1) * 16); - while (page.length < 12) { + while (page.length < 16) { page.push({ id: -1, title: '', - image: '' + image: '', + slug: '' }); } @@ -39,32 +40,38 @@ {$page.data.discord?.username}/blog -
-
- {#key posts} - {#each posts as post, i} - {#if post.id === -1} - - {:else} - - {/if} - {/each} - {/key} -
-
-

{pages} pages

-

page {$selectedPage + 1}

- - +
+
+
+ {#key posts} + {#each posts as post, i} + {#if post.id === -1} + + {:else} + + {/if} + {/each} + {/key} +
+
+ +

{$selectedPage + 1} / {pages}

+ +