From 467ab06a4e7bf460def614847f510792000f70b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E9=91=AB?= <1219654535@qq.com>
Date: Tue, 30 May 2023 15:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/header/nav.vue                     |  18 +++++++++---------
 components/model/content.vue                  |   3 ++-
 components/model/model.vue                    |   5 +++--
 nuxt.config.ts                                |   4 ++++
 package.json                                  |   5 +++--
 pages/index.vue                               |   6 ++----
 .../model/house/{scene.bin => Night-City.bin} | Bin
 .../house/{scene.gltf => Night-City.gltf}     |   0
 uno.config.ts                                 |   2 +-
 9 files changed, 24 insertions(+), 19 deletions(-)
 rename public/model/house/{scene.bin => Night-City.bin} (100%)
 rename public/model/house/{scene.gltf => Night-City.gltf} (100%)

diff --git a/components/header/nav.vue b/components/header/nav.vue
index 188e9d0..54c0ac3 100644
--- a/components/header/nav.vue
+++ b/components/header/nav.vue
@@ -11,15 +11,15 @@ const availableLocales = computed(() => {
   return (locales.value).filter(i => i.code !== locale.value)
 })
 
-// const flag: any = {
-//   en: 'i-flag-gb-4x3',
-//   zh: 'i-flag-cn-4x3',
-// }
-
 const flag: any = {
-  en: 'En',
-  zh: '中',
+  en: 'i-flag-gb-4x3',
+  zh: 'i-flag-cn-4x3',
 }
+
+// const flag: any = {
+//   en: 'En',
+//   zh: '中',
+// }
 </script>
 
 <template>
@@ -58,8 +58,8 @@ const flag: any = {
       <ABtn
         variant="text"
       >
-        <!-- <span :class="flag[locale.code]" /> -->
-        {{ flag[locale.code] }}
+        <span :class="flag[locale.code]" />
+        <!-- {{ flag[locale.code] }} -->
       </ABtn>
     </LocaleNuxtLink>
   </nav>
diff --git a/components/model/content.vue b/components/model/content.vue
index 9ebc69b..0b6bae6 100644
--- a/components/model/content.vue
+++ b/components/model/content.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 $defineProps<{
   src: string
+  width:number
 }>()
 </script>
 
 <template>
   <ClientOnly>
-    <Model :src="src" />
+    <Model :src="src" :width="width" />
   </ClientOnly>
 </template>
diff --git a/components/model/model.vue b/components/model/model.vue
index 197c06e..3509ec0 100644
--- a/components/model/model.vue
+++ b/components/model/model.vue
@@ -3,16 +3,17 @@ import { Model as LingoModel, OrbitCamera, World, useAnimation } from 'lingo3d-v
 
 $defineProps<{
   src: string
+  width:number
 }>()
 
 const anim = useAnimation({ from: 180, to: 0, duration: 5000 })
 </script>
 
 <template>
-  <div class="relative h-96 w-full bg-transparent">
+  <div class="relative h-96 w-500px bg-transparent" style="width:width+'px'">
     <World color="transparent" default-light="studio">
       <LingoModel :src="src" :y="0" :rotation-z="anim" :box-visible="false" />
-      <OrbitCamera active :z="100" :y="80" :zoom="1" auto-rotate enable-damping />
+      <OrbitCamera active :z="100" :y="80" :zoom="0.8" auto-rotate enable-damping />
     </World>
   </div>
 </template>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index ec93d7b..0dbec82 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -16,8 +16,12 @@ export default defineNuxtConfig({
     '@nuxt/content',
     '@nuxtjs/color-mode',
     '@vite-pwa/nuxt',
+    '@aceforth/nuxt-optimized-images',
     '@nuxt/devtools',
   ],
+  optimizedImages: {
+    optimizeImages: true
+  },
   experimental: {
     // when using generate, payload js assets included in sw precache manifest
     // but missing on offline, disabling extraction it until fixed
diff --git a/package.json b/package.json
index ba7de18..c91660a 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "start:generate": "npx serve .output/public"
   },
   "dependencies": {
+    "@aceforth/nuxt-optimized-images": "^1.4.0",
     "@anu-vue/nuxt": "^0.13.1",
     "@jiaminghi/color": "^1.1.3",
     "lingo3d-vue": "1.0.118",
@@ -32,6 +33,8 @@
     "@nuxtjs/i18n": "8.0.0-beta.11",
     "@nuxtjs/strapi": "^1.9.1",
     "@pinia/nuxt": "^0.4.8",
+    "@unocss/eslint-config": "0.52.4",
+    "@unocss/nuxt": "0.52.4",
     "@vite-pwa/nuxt": "^0.0.7",
     "@vue-macros/nuxt": "^1.2.8",
     "@vueuse/nuxt": "^9.13.0",
@@ -40,8 +43,6 @@
     "nuxt": "^3.4.0",
     "pinia": "^2.0.34",
     "typescript": "^4.9.5",
-    "@unocss/nuxt": "0.52.4",
-    "@unocss/eslint-config": "0.52.4",
     "unocss-preset-extra": "^0.5.2",
     "unocss-preset-scrollbar": "^0.2.1",
     "unocss-preset-scrollbar-hide": "^1.0.1"
diff --git a/pages/index.vue b/pages/index.vue
index e5790ab..f52b2b8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -204,11 +204,9 @@ const sectionNine = useSectionNine()
 
   <!-- Section Nine -->
   <Section class="my-10 flex bg-gradient-pink">
-    <Typography :title="$t(sectionNine.title)" :topic=" $t(sectionNine.topic)" :description=" $t(sectionNine.description)" class="text-start" />
+    <Typography :title="$t(sectionNine.title)" :topic=" $t(sectionNine.topic)" :description=" $t(sectionNine.description)" class="text-start max-w-720px" />
 
-    <div class="w-96">
-      <ModelContent src="/model/house/scene.gltf" />
-    </div>
+      <ModelContent src="/model/house/Night-City.gltf" :width="300" />
   </Section>
   <Divider />
 </template>
diff --git a/public/model/house/scene.bin b/public/model/house/Night-City.bin
similarity index 100%
rename from public/model/house/scene.bin
rename to public/model/house/Night-City.bin
diff --git a/public/model/house/scene.gltf b/public/model/house/Night-City.gltf
similarity index 100%
rename from public/model/house/scene.gltf
rename to public/model/house/Night-City.gltf
diff --git a/uno.config.ts b/uno.config.ts
index c7e6e81..c7fd0d6 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -86,7 +86,7 @@ export default defineConfig({
     presetAttributify(),
     presetIcons({
       scale: 1.2,
-      // cdn: 'https://esm.sh/',
+      cdn: 'https://esm.sh/',
       // cdn:'https://cdn.skypack.dev/',
       // cdn:'https://api.iconify.design/',
       extraProperties: presetIconExtraProperties,