feat: Upgrade to [email protected].

xiCO2k · Jan 3, 2024 · 843c4a4 · 843c4a4
1 parent 991d8f7
commit 843c4a4
Show file tree

Hide file tree

Showing 12 changed files with 448 additions and 463 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -3,7 +3,7 @@ module.exports = {
         'eslint:recommended',
         'plugin:vue/vue3-recommended',
     ],
-    ignorePatterns: ['node_modules/**/*', 'vendor/**/*', 'public/**/*'],
+    ignorePatterns: ['node_modules/**/*', 'vendor/**/*', 'public/**/*', 'bootstrap/**/*'],
     parserOptions: {
         ecmaVersion: 12,
         sourceType: 'module',

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/js/Pages/Error.vue b/resources/js/Pages/Error.vue
@@ -1,18 +1,3 @@
-<template>
-    <Head :title="title" />
-    <h1 class="text-lg sm:text-2xl md:text-4xl lg:text-5xl font-bold text-center mt-8 mb-8">
-        {{ title }}
-    </h1>
-    <div class="text-center">
-        {{ description }}
-    </div>
-    <div class="mt-8 text-center">
-        <Link :href="route('home')" class="link-underline">
-            &larr; Go Back
-        </Link>
-    </div>
-</template>
-
 <script setup>
 const props = defineProps({ status: Number });
 
@@ -30,3 +15,18 @@ const description = {
     403: 'Sorry, you are forbidden from accessing this page.',
 }[props.status];
 </script>
+
+<template>
+    <Head :title="title" />
+    <h1 class="text-lg sm:text-2xl md:text-4xl lg:text-5xl font-bold text-center mt-8 mb-8">
+        {{ title }}
+    </h1>
+    <div class="text-center">
+        {{ description }}
+    </div>
+    <div class="mt-8 text-center">
+        <Link :href="route('home')" class="link-underline">
+            &larr; Go Back
+        </Link>
+    </div>
+</template>
diff --git a/resources/js/Pages/GivenTalks.vue b/resources/js/Pages/GivenTalks.vue
@@ -1,3 +1,11 @@
+<script setup>
+import Markdown from '@/Shared/Markdown.vue'
+
+defineProps({
+    posts: Object,
+})
+</script>
+
 <template>
     <Head title="Given Talks">
         <meta property="og:title" content="Given Talks">
@@ -27,11 +35,3 @@
         <Markdown>{{ post.text }}</Markdown>
     </article>
 </template>
-
-<script setup>
-import Markdown from '@/Shared/Markdown.vue'
-
-defineProps({
-    posts: Object,
-})
-</script>
diff --git a/resources/js/Pages/Post.vue b/resources/js/Pages/Post.vue
@@ -1,3 +1,9 @@
+<script setup>
+import Markdown from '@/Shared/Markdown.vue'
+
+defineProps({ post: Object })
+</script>
+
 <template>
     <Head :title="post.title">
         <meta property="og:title" :content="post.title">
@@ -19,8 +25,3 @@
         <Markdown>{{ post.text }}</Markdown>
     </article>
 </template>
-<script setup>
-import Markdown from '@/Shared/Markdown.vue'
-
-defineProps({ post: Object })
-</script>
diff --git a/resources/js/Shared/CodeSnippet.vue b/resources/js/Shared/CodeSnippet.vue
@@ -1,3 +1,34 @@
+<script setup>
+import { ref, onMounted, useSlots, watch, inject } from 'vue';
+
+const props = defineProps({
+    lang: String,
+    name: String,
+    lineNumbers: Boolean,
+})
+
+const lines = ref('');
+const slots = useSlots();
+const highlighter = inject('highlighter');
+
+highlighter.install();
+onMounted(() => setCode());
+watch(highlighter.loaded, () => setCode());
+
+const setCode = () => {
+    lines.value = highlighter.getLines(
+        slots.default().map(element => element.children).join('').replace(/\n$/, ''),
+        props.lang,
+    );
+}
+
+const tokenFontStyle = ({ fontStyle }) => ({
+    2: 'font-bold',
+    1: 'italic',
+    4: 'underline',
+})[fontStyle];
+</script>
+
 <template>
     <div class="code-snippet w-full">
         <div class="px-6 pt-4 pb-2 bg-black rounded-lg bg-opacity-60 w-full">
@@ -37,33 +68,3 @@
         </div>
     </div>
 </template>
-<script setup>
-import { ref, onMounted, useSlots, watch, inject } from 'vue';
-
-const props = defineProps({
-    lang: String,
-    name: String,
-    lineNumbers: Boolean,
-})
-
-const lines = ref('');
-const slots = useSlots();
-const highlighter = inject('highlighter');
-
-highlighter.install();
-onMounted(() => setCode());
-watch(highlighter.loaded, () => setCode());
-
-const setCode = () => {
-    lines.value = highlighter.getLines(
-        slots.default().map(element => element.children).join('').replace(/\n$/, ''),
-        props.lang,
-    );
-}
-
-const tokenFontStyle = ({ fontStyle }) => ({
-    2: 'font-bold',
-    1: 'italic',
-    4: 'underline',
-})[fontStyle];
-</script>
diff --git a/resources/js/Shared/HomeHeader.vue b/resources/js/Shared/HomeHeader.vue
@@ -1,3 +1,9 @@
+<script setup>
+import squareImgWebp from 'img/square.webp';
+import squareImg from 'img/square.jpg';
+import MainNav from './MainNav.vue'
+</script>
+
 <template>
     <header class="flex flex-col items-center pt-4 sm:pt-8 px-4">
         <picture>
@@ -28,9 +34,3 @@
         <MainNav class="mt-8" />
     </header>
 </template>
-
-<script setup>
-import squareImgWebp from 'img/square.webp';
-import squareImg from 'img/square.jpg';
-import MainNav from './MainNav.vue'
-</script>
diff --git a/resources/js/Shared/MainFooter.vue b/resources/js/Shared/MainFooter.vue
@@ -1,9 +1,9 @@
+<script setup>
+const year = (new Date()).getFullYear()
+</script>
+
 <template>
     <footer class="px-8 my-12 w-full max-w-7xl text-xs text-white text-opacity-50 text-center">
         © {{ year }}. No tracking or ads.
     </footer>
 </template>
-
-<script setup>
-const year = (new Date()).getFullYear()
-</script>
diff --git a/resources/js/Shared/MainHeader.vue b/resources/js/Shared/MainHeader.vue
@@ -1,3 +1,9 @@
+<script setup>
+import squareImgWebp from 'img/square.webp';
+import squareImg from 'img/square.jpg';
+import MainNav from './MainNav.vue'
+</script>
+
 <template>
     <header class="pt-6 sm:pt-8 px-6 sm:px-8 flex flex-col sm:flex-row w-full max-w-7xl items-center sm:justify-between mb-4 sm:mb-8">
         <Link
@@ -21,9 +27,3 @@
         <MainNav />
     </header>
 </template>
-
-<script setup>
-import squareImgWebp from 'img/square.webp';
-import squareImg from 'img/square.jpg';
-import MainNav from './MainNav.vue'
-</script>
diff --git a/resources/js/Shared/MainLayout.vue b/resources/js/Shared/MainLayout.vue
@@ -1,3 +1,8 @@
+<script setup>
+import MainHeader from './MainHeader.vue'
+import MainFooter from './MainFooter.vue'
+</script>
+
 <template>
     <MainHeader />
     <div class="flex-1">
@@ -7,8 +12,3 @@
     </div>
     <MainFooter />
 </template>
-
-<script setup>
-import MainHeader from './MainHeader.vue'
-import MainFooter from './MainFooter.vue'
-</script>
diff --git a/resources/js/Shared/PostCard.vue b/resources/js/Shared/PostCard.vue
@@ -1,3 +1,7 @@
+<script setup>
+defineProps({ post: Object })
+</script>
+
 <template>
     <article>
         <Link
@@ -16,7 +20,3 @@
         </Link>
     </article>
 </template>
-
-<script setup>
-defineProps({ post: Object })
-</script>