ayo/ayco.io-astro
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix merge conflicts

Browse source
This commit is contained in:
Ayo Ayco 2025-06-10 15:20:31 +02:00
commit 95eb179803
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/constants/links.ts
View file

@ -47,7 +47,7 @@ export const footerLinks: Link[] = [
},
{
text: 'Mastodon',
url: 'https://fosstodon.org/@ayo',
url: 'https://social.ayco.io/public/local',
icon: 'mastodon',
},
{
@ -60,7 +60,9 @@ export const footerLinks: Link[] = [
url: 'https://github.com/ayoayco',
icon: 'github',
},
]
export const socialLinks: Link[] = [
/**
* TODO: add all socials to about page
*/

8
src/pages/now/and-then/index.astro → src/pages/now/and-then.astro
View file

@ -1,12 +1,12 @@
---
import Layout from '../../../layouts/Layout.astro'
import Footer from '../../../components/Footer.astro'
import Posts from '../../../components/Posts.astro'
import Layout from '../../layouts/Layout.astro'
import Footer from '../../components/Footer.astro'
import Posts from '../../components/Posts.astro'
import type { AstroInstance } from 'astro'
// const posts = await Astro.glob('./posts/*.astro')
const posts: AstroInstance[] = Object.values<AstroInstance>(
import.meta.glob('./posts/*.astro', { eager: true })
import.meta.glob('./and-then/posts/*.astro', { eager: true })
)
const title = 'Previously...'
---