Merge fix

This commit is contained in:
Firq 2023-03-09 11:44:18 +01:00
commit a2ee3564bc
Signed by: Firq
GPG key ID: 3ACC61C8CEC83C20
26 changed files with 1125 additions and 1039 deletions
src/layouts

View file

@ -1,69 +1,76 @@
---
import Navbar from '../components/navbar.astro';
import NavbarEntry from '../components/navbarEntry.astro';
import Navbar from '../components/navbar.astro'
import NavbarEntry from '../components/navbarEntry.astro'
import navdata from '../../static/_navdata.json'
export interface Props {
title: string;
currentpage: string;
descriptionOverride?: string;
title: string
currentpage: string
descriptionOverride?: string
}
const { descriptionOverride, currentpage, title } = Astro.props;
let description;
const { descriptionOverride, currentpage, title } = Astro.props
let description
if(descriptionOverride === undefined) {
description = "Firqs own site!";
if (descriptionOverride === undefined) {
description = 'Firqs own site!'
} else {
description = descriptionOverride;
description = descriptionOverride
}
let currPage = "https://firq.dev/"
if (currentpage !== "home") {
currPage += currentpage;
let currPage = 'https://firq.dev/'
if (currentpage !== 'home') {
currPage += currentpage
}
---
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/ico" href="/favicon.ico" />
<meta name="generator" content={Astro.generator} />
<meta property="og:title" content={title} />
<meta property="og:url" content={currPage} />
<meta name="description" content={description}/>
<meta property="og:description" content={description}/>
<meta property="og:image" content="https://firq.dev/embed.png" />
<meta property="og:type" content="website" />
<meta property="og:locale" content="en_US" />
<title>{title}</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css">
</head>
<body>
<Navbar>
{navdata.map((item) => (<NavbarEntry currentPage={currentpage} {...item}/>))}
</Navbar>
<slot />
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/ico" href="/favicon.ico" />
<meta name="generator" content={Astro.generator} />
<meta property="og:title" content={title} />
<meta property="og:url" content={currPage} />
<meta name="description" content={description} />
<meta property="og:description" content={description} />
<meta property="og:image" content="https://firq.dev/embed.png" />
<meta property="og:type" content="website" />
<meta property="og:locale" content="en_US" />
<title>{title}</title>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css"
/>
</head>
<body>
<Navbar>
{
navdata.map((item) => (
<NavbarEntry currentPage={currentpage} {...item} />
))
}
</Navbar>
<slot />
</body>
</html>
<style is:global>
:root {
--hover-scale: 1.05;
--speed: 50%;
--ease: 50%;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
--c-darkgray: #1e1e1e;
--c-duskgray: #242424;
--c-gray: #2e2e2e;
--c-lightgray: #3e3e3e;
--c-darkpurple: #b86cff;
--c-purplepink: #c105ff;
--c-darkergray: #1b1b1b;
}
body {
background: var(--c-lightgray);
margin: 0px;
}
:root {
--hover-scale: 1.05;
--speed: 50%;
--ease: 50%;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
--c-darkgray: #1e1e1e;
--c-duskgray: #242424;
--c-gray: #2e2e2e;
--c-lightgray: #3e3e3e;
--c-darkpurple: #b86cff;
--c-purplepink: #c105ff;
--c-darkergray: #1b1b1b;
}
body {
background: var(--c-lightgray);
margin: 0px;
}
</style>