From c3541210af58b0534f915e92268d7dc0f1e2a8a4 Mon Sep 17 00:00:00 2001
From: Gabriel Cozma <me@gabs.eu.org>
Date: Tue, 4 Jun 2024 12:39:57 +0300
Subject: [PATCH] feat: update layout configuration to make `minimal` an option

---
 CHANGELOG.md       |  2 ++
 Layout.vue         | 15 ++++++---------
 minimal.ts         |  5 -----
 minimal/Layout.vue | 33 ---------------------------------
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 minimal.ts
 delete mode 100644 minimal/Layout.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53272a4..9d5f3f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 
 ### Features
 
+- Make `minimal` layout an option in the configuration, rather then an import
+
 - Provide a non-custom font version of Aplós (`aplos/plain`)
 
 - Provide `style` frontmatter configuration for any page
diff --git a/Layout.vue b/Layout.vue
index 3d920f3..6c89a91 100644
--- a/Layout.vue
+++ b/Layout.vue
@@ -14,17 +14,14 @@ const { site, frontmatter, page, theme } = useData();
 
 <template>
   <Navigation />
-  <main
-    id="content-main"
-    :class="{
-      numeric: frontmatter.style === 'numeric' || theme.style === 'numeric',
-      'icon-links': theme.links === 'icons',
-    }"
-  >
+  <main id="content-main" :class="{
+    numeric: frontmatter.style === 'numeric' || theme.style === 'numeric',
+    'icon-links': theme.links === 'icons',
+  }">
     <div v-if="frontmatter.home">
       <h1>{{ site.title }}</h1>
     </div>
-    <div v-if="frontmatter.layout === 'article'">
+    <div v-if="frontmatter.layout === 'article' || (theme.minimal === true && frontmatter.layout !== 'article')">
       <ArticleHead />
     </div>
     <NotFound v-if="page.isNotFound" />
@@ -32,7 +29,7 @@ const { site, frontmatter, page, theme } = useData();
       <Content />
     </div>
     <HelpfulLayout v-if="frontmatter.layout == 'helpful'" />
-    <div v-if="frontmatter.layout == 'article'">
+    <div v-if="frontmatter.layout === 'article' || (theme.minimal === true && frontmatter.layout !== 'article')">
       <ArticleFooter />
     </div>
   </main>
diff --git a/minimal.ts b/minimal.ts
deleted file mode 100644
index a6bbd30..0000000
--- a/minimal.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import "non.geist/mono";
-import "inter-ui/inter.css";
-import "inter-ui/inter-variable.css";
-import "./styles/index.scss";
-import "./styles/fonts.scss";
diff --git a/minimal/Layout.vue b/minimal/Layout.vue
deleted file mode 100644
index 8d58f66..0000000
--- a/minimal/Layout.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<script setup lang="ts">
-import { useData, Content } from "vitepress";
-
-import SiteFooter from "../components/Footer.vue";
-import Navigation from "../components/Navigation.vue";
-
-import NotFound from "../layouts/NotFound.vue";
-import HelpfulLayout from "../layouts/Helpful.vue";
-
-const { site, frontmatter, page, theme } = useData();
-</script>
-
-<template>
-  <div :class="{ plain: theme.type === 'plain' }">
-    <Navigation />
-    <main
-      id="content-main"
-      :class="{
-        numeric: frontmatter.style === 'numeric' || theme.style === 'numeric',
-      }"
-    >
-      <div v-if="frontmatter.home">
-        <h1>{{ site.title }}</h1>
-      </div>
-      <NotFound v-if="page.isNotFound" />
-      <div v-else :class="frontmatter.pageClass">
-        <Content />
-      </div>
-      <HelpfulLayout v-if="frontmatter.layout == 'helpful'" />
-    </main>
-    <SiteFooter />
-  </div>
-</template>