Merge pull request #99 from yeonjulee1005/stage

🚗 [version: 1.31.0] push to master
yeonjulee1005 · Jan 5, 2024 · 532efec · 532efec
2 parents 39afc7a + 0b2e464
commit 532efec
Show file tree

Hide file tree

Showing 14 changed files with 141 additions and 51 deletions.
diff --git a/app.vue b/app.vue
@@ -16,9 +16,10 @@
 
 <script setup lang="ts">
 
+const route = useRoute()
+
 const { loadMenuData } = useFetchComposable()
 
-const seoTitle = 'Developer Dewdew | 개발자 이연주'
 const seoDescription = '안녕하세요. FE 개발자 이연주입니다.'
 const seoUrl = 'https://www.dewdew.dev'
 const seoImage = 'https://api.dewdew.dev/storage/v1/object/public/assets/banner/main_banner.webp'
@@ -27,27 +28,97 @@ loadMenuData('root')
 loadMenuData('sub')
 loadMenuData('sns')
 
-useSeoMeta({
-  viewport: 'width=device-width, initial-scale=1.0, viewport-fit=cover',
-  formatDetection: 'telephone=no',
-  themeColor: '#705757',
-  keywords: 'developer,develop,web,portfolio,개발자,FE웹개발자,웹개발자,포트폴리오,개발자 포트폴리오,프론트앤드 포트폴리오',
-  title: seoTitle,
-  author: 'Dewdew',
-  description: seoDescription,
-  ogType: 'website',
-  ogTitle: seoTitle,
-  ogDescription: seoDescription,
-  ogUrl: seoUrl,
-  ogImage: seoImage,
-  ogImageSecureUrl: seoImage,
-  ogImageType: 'image/png',
-  ogImageWidth: '410',
-  ogImageHeight: '200',
-  twitterCard: 'summary_large_image',
-  twitterTitle: seoTitle,
-  twitterDescription: seoDescription,
-  twitterImage: seoImage
-})
+if (process.server) {
+  useServerHead({
+    meta: () => [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1.0, viewport-fit=cover' },
+      { name: 'author', content: 'Dewdew' },
+      { name: 'format-detection', content: 'telephone=no' },
+      { name: 'theme-color', content: '#705757' },
+      { name: 'msapplication-TileColor', content: '#705757' },
+      { name: 'keywords', content: 'developer,develop,web,portfolio,개발자,FE웹개발자,웹개발자,포트폴리오,개발자 포트폴리오,프론트앤드 포트폴리오' },
+      { name: 'naver-site-verification', content: '7c406de71b03c1e444a4fe2630a29bd7a8e17559' },
+      { property: 'og:type', content: 'website' },
+      { property: 'og:url', content: seoUrl },
+      {
+        property: 'og:image',
+        content: seoImage,
+        key: 'og:image'
+      },
+      { property: 'og:image:width', content: '410' },
+      { property: 'og:image:height', content: '200' },
+      { property: 'og:image:type', content: 'image/png' },
+      {
+        property: 'og:title',
+        content: (route.meta.title as string) || '개발자 이연주 Dewdew'
+      },
+      {
+        name: 'description',
+        content:
+          (route.meta.description as string) ||
+          seoDescription
+      },
+      {
+        property: 'og:description',
+        content:
+          (route.meta.description as string) ||
+          seoDescription
+      }
+    ],
+    link: [
+      ...[
+        '/fonts/Pretendard-Thin.otf',
+        '/fonts/Pretendard-ExtraLight.otf',
+        '/fonts/Pretendard-Light.otf',
+        '/fonts/Pretendard-Regular.otf',
+        '/fonts/Pretendard-Medium.otf',
+        '/fonts/Pretendard-SemiBold.otf',
+        '/fonts/Pretendard-Bold.otf',
+        '/fonts/Pretendard-ExtraBold.otf',
+        '/fonts/Pretendard-Black.otf',
+        'https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2'
+      ].map(href => ({
+        rel: 'preload',
+        as: 'font',
+        type: href.includes('woff2') ? 'font/woff2' : 'font/otf',
+        crossorigin: '',
+        href
+      }) as const
+      ),
+      { rel: 'canonical', href: route.fullPath },
+      { rel: 'mask-icon', color: '#5bbad5', href: '/safari-pinned-tab.svg' },
+      { rel: 'icon', type: 'image/png', href: '/icon.png' },
+      { rel: 'alternate', type: 'application/rss+xml', href: '/rss.xml' },
+      {
+        rel: 'apple-touch-icon',
+        sizes: '180x180',
+        href: '/apple-touch-icon.png'
+      },
+      {
+        rel: 'icon',
+        type: 'image/png',
+        sizes: '32x32',
+        href: '/favicon-32x32.png'
+      },
+      {
+        rel: 'icon',
+        type: 'image/png',
+        sizes: '16x16',
+        href: '/favicon-16x16.png'
+      },
+      { rel: 'manifest', href: '/site.webmanifest' },
+      { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }
+    ],
+    script: [
+      {
+        hid: 'spiine-viewer',
+        src: 'https://unpkg.com/@splinetool/viewer@1.0.17/build/spline-viewer.js',
+        type: 'module',
+        async: true
+      }
+    ]
+  })
+}
 
 </script>
diff --git a/assets/scss/basic/fonts.scss b/assets/scss/basic/fonts.scss
@@ -3,63 +3,63 @@
 */
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Thin.otf');
+  src: local('/fonts/Pretendard-Thin.otf');
   font-weight: 100;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-ExtraLight.otf');
+  src: local('/fonts/Pretendard-ExtraLight.otf');
   font-weight: 200;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Light.otf');
+  src: local('/fonts/Pretendard-Light.otf');
   font-weight: 300;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Regular.otf');
+  src: local('/fonts/Pretendard-Regular.otf');
   font-weight: 400;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Medium.otf');
+  src: local('/fonts/Pretendard-Medium.otf');
   font-weight: 500;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-SemiBold.otf');
+  src: local('/fonts/Pretendard-SemiBold.otf');
   font-weight: 600;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Bold.otf');
+  src: local('/fonts/Pretendard-Bold.otf');
   font-weight: 700;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-ExtraBold.otf');
+  src: local('/fonts/Pretendard-ExtraBold.otf');
   font-weight: 800;
   font-style: normal;
   font-display: swap;
 }
 @font-face {
   font-family: Pretendard;
-  src: local('~/assets/fonts/Pretendard-Black.otf');
+  src: local('/fonts/Pretendard-Black.otf');
   font-weight: 900;
   font-style: normal;
   font-display: swap;

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -16,23 +16,7 @@ export default defineNuxtConfig({
         lang: 'ko'
       },
       meta: [
-        { property: 'Imagetoolbar', content: 'no' },
-        { name: 'naver-site-verification', content: '7c406de71b03c1e444a4fe2630a29bd7a8e17559' }
-      ],
-      script: [
-        {
-          hid: 'spline-viewer',
-          src: 'https://unpkg.com/@splinetool/viewer@1.0.17/build/spline-viewer.js',
-          type: 'module',
-          async: true
-        }
-      ],
-      link: [
-        { rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' },
-        { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' },
-        { rel: 'canonical', href: 'https://www.dewdew.dev' },
-        { rel: 'icon', type: 'image/png', sizes: '16x16', href: '/favicon-16x16.png' },
-        { rel: 'icon', type: 'image/png', sizes: '32x32', href: '/favicon-32x32.png' }
+        { property: 'Imagetoolbar', content: 'no' }
       ]
     }
   },
@@ -110,13 +94,34 @@ export default defineNuxtConfig({
   },
   content: {
     highlight: {
+      preload: ['js', 'ts', 'json', 'vue'],
       theme: {
         default: 'github-light',
         dark: 'github-dark',
         sepia: 'dracula-soft'
       }
     }
   },
+  htmlValidator: {
+    failOnError: true,
+    options: {
+      rules: {
+        'wcag/h37': 'warn',
+        'element-permitted-content': 'warn',
+        'element-required-attributes': 'warn',
+        'attribute-empty-style': 'off'
+      }
+    }
+  },
+  fontMetrics: {
+    fonts: [
+      {
+        fallbackName: 'Pretendard fallback',
+        family: 'Pretendard',
+        fallbacks: ['Arial']
+      }
+    ]
+  },
   pwa: {
     registerType: 'autoUpdate',
     manifest: {
@@ -139,7 +144,7 @@ export default defineNuxtConfig({
       periodicSyncForUpdates: 20
     },
     devOptions: {
-      enabled: true,
+      enabled: false,
       type: 'module',
       suppressWarnings: true,
       navigateFallbackAllowlist: [/^\/$/]

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "name": "Dewdew",
     "email": "yeonju.lee1005@gmail.com"
   },
-  "version": "1.30.0",
+  "version": "1.31.0",
   "private": true,
   "scripts": {
     "build": "nuxt build",

diff --git a/assets/fonts/Pretendard-Black.otf → public/fonts/Pretendard-Black.otf b/assets/fonts/Pretendard-Black.otf → public/fonts/Pretendard-Black.otf
diff --git a/assets/fonts/Pretendard-Bold.otf → public/fonts/Pretendard-Bold.otf b/assets/fonts/Pretendard-Bold.otf → public/fonts/Pretendard-Bold.otf
diff --git a/assets/fonts/Pretendard-ExtraBold.otf → public/fonts/Pretendard-ExtraBold.otf b/assets/fonts/Pretendard-ExtraBold.otf → public/fonts/Pretendard-ExtraBold.otf
diff --git a/assets/fonts/Pretendard-ExtraLight.otf → public/fonts/Pretendard-ExtraLight.otf b/assets/fonts/Pretendard-ExtraLight.otf → public/fonts/Pretendard-ExtraLight.otf
diff --git a/assets/fonts/Pretendard-Light.otf → public/fonts/Pretendard-Light.otf b/assets/fonts/Pretendard-Light.otf → public/fonts/Pretendard-Light.otf
diff --git a/assets/fonts/Pretendard-Medium.otf → public/fonts/Pretendard-Medium.otf b/assets/fonts/Pretendard-Medium.otf → public/fonts/Pretendard-Medium.otf
diff --git a/assets/fonts/Pretendard-Regular.otf → public/fonts/Pretendard-Regular.otf b/assets/fonts/Pretendard-Regular.otf → public/fonts/Pretendard-Regular.otf
diff --git a/assets/fonts/Pretendard-SemiBold.otf → public/fonts/Pretendard-SemiBold.otf b/assets/fonts/Pretendard-SemiBold.otf → public/fonts/Pretendard-SemiBold.otf
diff --git a/assets/fonts/Pretendard-Thin.otf → public/fonts/Pretendard-Thin.otf b/assets/fonts/Pretendard-Thin.otf → public/fonts/Pretendard-Thin.otf
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1,14 @@
+{
+  "name": "Dewdew",
+  "short_name": "Dewdew",
+  "icons": [
+    {
+      "src": "/icon.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#705757",
+  "background_color": "#705757",
+  "display": "standalone"
+}