Skip to content

Commit 5397592

Browse files
andnordaandnorda
committed
shared layout for log and blog
1 parent 33b287f commit 5397592

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+73
-195
lines changed

‎src/routes/(pages)/+layout.svelte

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<script lang="ts">
2+
</script>
3+
4+
<div class="wrapper">
5+
<slot />
6+
</div>
7+
8+
<style>
9+
.wrapper {
10+
font-size: 1.125rem;
11+
padding: min(4vw, 3.6rem);
12+
display: flex;
13+
flex-direction: column;
14+
align-items: center;
15+
}
16+
</style>

‎src/routes/blog/+page.server.ts ‎src/routes/(pages)/blog/+page.server.ts

File renamed without changes.

‎src/routes/blog/+page.svelte ‎src/routes/(pages)/blog/+page.svelte

+15-24
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,23 @@
55
let { data }: { data: PageData } = $props();
66
</script>
77

8-
<div class="wrapper">
9-
<ul class="list">
10-
{#each data.posts as post}
11-
<li class="item">
12-
<h2 class="heading">
13-
<a class="link" href={`/blog/posts/${post.slug}`}>
14-
{post.metadata.title}
15-
</a>
16-
</h2>
17-
<div class="byline">
18-
{format(post.metadata.date, "MMMM d, yyyy")} by {post.metadata.author}
19-
</div>
20-
<div class="description">{post.metadata.description}</div>
21-
</li>
22-
{/each}
23-
</ul>
24-
</div>
8+
<ul class="list">
9+
{#each data.posts as post}
10+
<li class="item">
11+
<h2 class="heading">
12+
<a class="link" href={`/blog/posts/${post.slug}`}>
13+
{post.metadata.title}
14+
</a>
15+
</h2>
16+
<div class="byline">
17+
{format(post.metadata.date, "MMMM d, yyyy")} by {post.metadata.author}
18+
</div>
19+
<div class="description">{post.metadata.description}</div>
20+
</li>
21+
{/each}
22+
</ul>
2523

2624
<style>
27-
.wrapper {
28-
font-size: 1.125rem;
29-
padding: min(4vw, 3.6rem);
30-
display: flex;
31-
flex-direction: column;
32-
align-items: center;
33-
}
3425
.description {
3526
max-width: 60ch;
3627
}

‎src/routes/blog/posts/changing-service-mesh/+page.md ‎src/routes/(pages)/blog/posts/changing-service-mesh/+page.md

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-1.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-1.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-2.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-2.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-3.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-3.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-4.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-4.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-5.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-5.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/changing-service-mesh-6.png ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/changing-service-mesh-6.png

File renamed without changes.

‎src/routes/blog/posts/changing-service-mesh/images/service-mesh-experience.jpg ‎src/routes/(pages)/blog/posts/changing-service-mesh/images/service-mesh-experience.jpg

File renamed without changes.

‎src/routes/blog/posts/data_mesh_governance/+page.md ‎src/routes/(pages)/blog/posts/data_mesh_governance/+page.md

‎src/routes/blog/posts/elm/+page.md ‎src/routes/(pages)/blog/posts/elm/+page.md

‎src/routes/blog/posts/fido2/+page.md ‎src/routes/(pages)/blog/posts/fido2/+page.md

‎src/routes/blog/posts/fido2/images/fido2_authentication.png ‎src/routes/(pages)/blog/posts/fido2/images/fido2_authentication.png

File renamed without changes.

‎src/routes/blog/posts/fido2/images/fido2_protocols.png ‎src/routes/(pages)/blog/posts/fido2/images/fido2_protocols.png

File renamed without changes.

‎src/routes/blog/posts/fido2/images/fido2_registration.png ‎src/routes/(pages)/blog/posts/fido2/images/fido2_registration.png

File renamed without changes.

‎src/routes/blog/posts/fido2/images/fido_logo.png ‎src/routes/(pages)/blog/posts/fido2/images/fido_logo.png

File renamed without changes.

‎src/routes/blog/posts/hybrid-work/+page.md ‎src/routes/(pages)/blog/posts/hybrid-work/+page.md

‎src/routes/blog/posts/hybrid-work/images/hybrid.png ‎src/routes/(pages)/blog/posts/hybrid-work/images/hybrid.png

File renamed without changes.

‎src/routes/blog/posts/internal-technology-platform/+page.md ‎src/routes/(pages)/blog/posts/internal-technology-platform/+page.md

‎src/routes/blog/posts/internal-technology-platform/images/GettyImages-1159293076.jpg ‎src/routes/(pages)/blog/posts/internal-technology-platform/images/GettyImages-1159293076.jpg

File renamed without changes.

‎src/routes/blog/posts/internal-technology-platform/images/deployments-per-week.png ‎src/routes/(pages)/blog/posts/internal-technology-platform/images/deployments-per-week.png

File renamed without changes.

‎src/routes/blog/posts/layout.svelte ‎src/routes/(pages)/blog/posts/layout.svelte

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020
<title>{title} — Nais blog</title>
2121
</svelte:head>
2222

23-
<div class="wrapper">
24-
<div class="article">
25-
<h1>{title}</h1>
26-
{#if date && author}
27-
<p class="byline">{format(date, "MMMM d, yyyy")} by {author}</p>
28-
{/if}
29-
{@render children()}
30-
</div>
23+
<div class="article">
24+
<h1>{title}</h1>
25+
{#if date && author}
26+
<p class="byline">{format(date, "MMMM d, yyyy")} by {author}</p>
27+
{/if}
28+
{@render children()}
3129
</div>
3230

3331
<style>
@@ -51,11 +49,4 @@
5149
font-style: italic;
5250
font-size: 1rem;
5351
}
54-
.wrapper {
55-
font-size: 1.125rem;
56-
padding: min(4vw, 3.6rem);
57-
display: flex;
58-
flex-direction: column;
59-
align-items: center;
60-
}
6152
</style>

‎src/routes/blog/posts/oauth-del3-pkce/+page.md ‎src/routes/(pages)/blog/posts/oauth-del3-pkce/+page.md

‎src/routes/blog/posts/oauth-del3-pkce/images/auth_code.png ‎src/routes/(pages)/blog/posts/oauth-del3-pkce/images/auth_code.png

File renamed without changes.

‎src/routes/blog/posts/oauth-del3-pkce/images/oauth2.png ‎src/routes/(pages)/blog/posts/oauth-del3-pkce/images/oauth2.png

File renamed without changes.

‎src/routes/blog/posts/oauth1/+page.md ‎src/routes/(pages)/blog/posts/oauth1/+page.md

‎src/routes/blog/posts/oauth2/+page.md ‎src/routes/(pages)/blog/posts/oauth2/+page.md

‎src/routes/blog/posts/oauth2/images/exchange.png ‎src/routes/(pages)/blog/posts/oauth2/images/exchange.png

File renamed without changes.

‎src/routes/blog/posts/oauth2/images/oauth2.png ‎src/routes/(pages)/blog/posts/oauth2/images/oauth2.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/+page.md ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/+page.md

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-adoption.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-adoption.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-client-to-backend.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-client-to-backend.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-collector.svg ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-collector.svg

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-noisy-spans.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-noisy-spans.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-rappids-and-rivers.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-rappids-and-rivers.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-span-rate.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-span-rate.png

File renamed without changes.

‎src/routes/blog/posts/otel-from-0-to-100/images/otel-tempo.png ‎src/routes/(pages)/blog/posts/otel-from-0-to-100/images/otel-tempo.png

File renamed without changes.

‎src/routes/blog/posts/project-structure-on-gcp/+page.md ‎src/routes/(pages)/blog/posts/project-structure-on-gcp/+page.md

‎src/routes/blog/posts/project-structure-on-gcp/images/team_projects.png ‎src/routes/(pages)/blog/posts/project-structure-on-gcp/images/team_projects.png

File renamed without changes.

‎src/routes/blog/posts/slsa/+page.md ‎src/routes/(pages)/blog/posts/slsa/+page.md

‎src/routes/blog/posts/slsa/images/jenkins-security-warnings.png ‎src/routes/(pages)/blog/posts/slsa/images/jenkins-security-warnings.png

File renamed without changes.

‎src/routes/blog/posts/slsa/images/react-hello-world-deps.png ‎src/routes/(pages)/blog/posts/slsa/images/react-hello-world-deps.png

File renamed without changes.

‎src/routes/blog/posts/slsa/images/salsa.webp ‎src/routes/(pages)/blog/posts/slsa/images/salsa.webp

File renamed without changes.

‎src/routes/blog/posts/table.svelte ‎src/routes/(pages)/blog/posts/table.svelte

File renamed without changes.

‎src/routes/blog/posts/teams-test/+page.md ‎src/routes/(pages)/blog/posts/teams-test/+page.md

‎src/routes/blog/posts/teams-test/images/hacker.jpg ‎src/routes/(pages)/blog/posts/teams-test/images/hacker.jpg

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/+page.md ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/+page.md

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-1.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-1.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-2.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-2.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-3.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-3.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-4.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-4.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-5.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-5.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-6.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-6.png

File renamed without changes.

‎src/routes/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-7.png ‎src/routes/(pages)/blog/posts/zero-trust-networking-in-gcp/images/zero-trust-7.png

File renamed without changes.

‎src/routes/(pages)/log/+page.svelte

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<script lang="ts">
2+
import { format } from "date-fns";
3+
import type { PageData } from "./$types";
4+
5+
const { data }: { data: PageData } = $props();
6+
</script>
7+
8+
<div class="content">
9+
{#each data.posts as { metadata, default: Post }}
10+
<h2 class="heading">{metadata.title}</h2>
11+
<p class="byline">{format(metadata.date, "MMMM d, yyyy")} by {metadata.author}</p>
12+
<div class="post">
13+
<Post />
14+
</div>
15+
{/each}
16+
</div>
17+
18+
<style>
19+
.content {
20+
max-width: 67ch;
21+
}
22+
.heading {
23+
margin-top: 1.75em;
24+
margin-bottom: 0.5em;
25+
}
26+
.byline {
27+
font-style: italic;
28+
font-size: 1rem;
29+
}
30+
</style>

‎src/routes/log/+page.ts ‎src/routes/(pages)/log/+page.ts

File renamed without changes.

‎src/routes/log/post.svelte ‎src/routes/(pages)/log/post.svelte

File renamed without changes.

‎src/routes/log/posts/2024-11-06-nais-debug.md ‎src/routes/(pages)/log/posts/2024-11-06-nais-debug.md

‎src/routes/log/posts/2024-11-12-nais-redirects.md ‎src/routes/(pages)/log/posts/2024-11-12-nais-redirects.md

‎src/routes/log/posts/2024-11-15-influx-pa-aiven-eol.md ‎src/routes/(pages)/log/posts/2024-11-15-influx-pa-aiven-eol.md

‎src/routes/log/posts/2024-11-18-rotering-av-kafka-secrets.md ‎src/routes/(pages)/log/posts/2024-11-18-rotering-av-kafka-secrets.md

‎src/routes/+layout.svelte

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script lang="ts">
22
import { browser } from "$app/environment";
3+
import { page } from "$app/stores";
34
import Header from "$lib/Header.svelte";
45
import "../styles/app.css";
56
import * as amplitude from "@amplitude/analytics-browser";
@@ -18,6 +19,8 @@
1819
defaultTracking: true,
1920
});
2021
}
22+
23+
console.log($page.url.pathname);
2124
</script>
2225

2326
<Header />

‎src/routes/log/+page.svelte

-40
This file was deleted.

‎src/routes/logg/+page.svelte

-101
This file was deleted.

‎src/routes/status/+page.svelte

-12
This file was deleted.

‎svelte.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ const config = {
2020
extensions: [".svx", ".md", ".mdx"],
2121
remarkPlugins: [remarkRelativeImages],
2222
layout: {
23-
log: "/src/routes/log/post.svelte",
24-
blog: "/src/routes/blog/posts/layout.svelte",
25-
_: "/src/routes/blog/posts/layout.svelte",
23+
log: "/src/routes/(pages)/log/post.svelte",
24+
blog: "/src/routes/(pages)/blog/posts/layout.svelte",
25+
_: "/src/routes/(pages)/blog/posts/layout.svelte",
2626
},
2727
highlight: {
2828
highlighter: async (code, lang = "text") => {

0 commit comments

Comments
 (0)