From ce144849f3fcb6e3269f302c976ec873cba890f8 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 8 Feb 2024 21:50:07 +0100 Subject: [PATCH] More progress --- public/blog/blog-posts.json | 13 ++++--------- src/components/Header.astro | 3 --- src/components/VersionDropdown.astro | 20 ++++++++------------ src/js/modversion.js | 21 ++++++++++++++++----- src/pages/blog/[...page].astro | 9 ++++++--- src/pages/blog/[post].astro | 6 ++++-- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/public/blog/blog-posts.json b/public/blog/blog-posts.json index e92f521..465bb01 100644 --- a/public/blog/blog-posts.json +++ b/public/blog/blog-posts.json @@ -1,14 +1,9 @@ [ { - "userId": 1, - "id": 1, + "userId": "Martin Prokoph", + "date": "08.02.2024", "title": "So... I have a new website now!", - "body": "After years of just having a lame and half broken, useless site, I proudly present my new website.\nIt is built using Astro to achieve blazing fast performance, eye candy and usefulness at the same time." - }, - { - "userId": 1, - "id": 2, - "title": "qui est esse", - "body": "est rerum tempore vitae\nsequi sint nihil reprehenderit dolor beatae ea dolores neque\nfugiat blanditiis voluptate porro vel nihil molestiae ut reiciendis\nqui aperiam non debitis possimus qui neque nisi nulla" + "body": "After years of just having a lame and half broken, useless site, I proudly present my new website.\nIt is built using Astro to achieve blazing fast performance, eye candy and usefulness at the same time.", + "img": "/social-preview-image.png" } ] \ No newline at end of file diff --git a/src/components/Header.astro b/src/components/Header.astro index 073a794..ebb62cc 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -16,9 +16,6 @@ import { Icon } from 'astro-icon/components'
  • diff --git a/src/js/modversion.js b/src/js/modversion.js index 3d16986..135c2f8 100644 --- a/src/js/modversion.js +++ b/src/js/modversion.js @@ -4,18 +4,29 @@ var finishedArray = modInfo.reduce(function(map, value) { value.game_versions.forEach(version => { value.loaders.forEach(loader => { const loaderAndVersion = loader + "+" +version; - if (Object.values(map).includes(loaderAndVersion)) { - console.log("return") - return; + if (!Object.values(map).includes(loaderAndVersion)) { + if (value.featured) map[loaderAndVersion] = value.id; } - if (value.featured) map[loaderAndVersion] = value.id; }); }); return map; }, {}); -console.log(finishedArray); export var selectedLoader = "fabric"; + +export var versionList = []; +var versionMap = await Object.keys(finishedArray).reduce(function(map, value) { + if (value.startsWith(selectedLoader)) { + const version = value.split("+")[1]; + if (!Object.values(map).includes(version)) { + map[version] = ""; + } + } + return map; +}, {}); +versionList = await Object.keys(versionMap).sort().reverse(); + export var selectedVersion = "1.20.4"; + var resultingVersionID = await finishedArray[selectedLoader + "+" + selectedVersion]; export var resultingVersion = "Could not find the latest version!"; resultingVersion = modInfo.find((info) => info.id == resultingVersionID).version_number; diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro index 7d23366..94c2e5d 100644 --- a/src/pages/blog/[...page].astro +++ b/src/pages/blog/[...page].astro @@ -1,10 +1,12 @@ --- import DefaultLayout from '../../layouts/DefaultLayout.astro' import { Card, Pagination } from 'accessible-astro-components' +import blogPosts from '../../../public/blog/blog-posts.json' export async function getStaticPaths({ paginate }) { - const response = await fetch('https://jsonplaceholder.typicode.com/posts') - const data = await response.json() + //const response = await fetch('https://jsonplaceholder.typicode.com/posts') + //const data = await response.json() + const data = blogPosts; return paginate(data, { pageSize: 6 }) } @@ -36,7 +38,8 @@ const { page } = Astro.props {post.body} diff --git a/src/pages/blog/[post].astro b/src/pages/blog/[post].astro index 042991d..4d287c4 100644 --- a/src/pages/blog/[post].astro +++ b/src/pages/blog/[post].astro @@ -1,9 +1,11 @@ --- import DefaultLayout from '../../layouts/DefaultLayout.astro' import { Breadcrumbs, BreadcrumbsItem } from 'accessible-astro-components' +import blogPosts from '../../../public/blog/blog-posts.json' export async function getStaticPaths() { - const data = await fetch('https://jsonplaceholder.typicode.com/posts').then((response) => response.json()) + const data = blogPosts; + //const data = await fetch('https://jsonplaceholder.typicode.com/posts').then((response) => response.json()) return data.map((post) => { return { @@ -29,7 +31,7 @@ const { post } = Astro.props

    {post.title}


    -

    By userId: {post.userId}

    +

    By user: {post.userId}