Merge branch 'main' into ch2/sec3/test

traPtitech · Jul 20, 2024 · 920b4be · 920b4be
2 parents 82183db + 10dbc0e
commit 920b4be
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/docs/chapter2/section2/0_router-setup.md b/docs/chapter2/section2/0_router-setup.md
@@ -81,7 +81,7 @@ Vue Router を読み込むように`src/main.ts`を以下のように変更し
 
 <<<@/chapter2/section2/src/1/routes.ts{typescript:line-numbers}
 
-この後、皆さんにはいくつかのページとその`path`の対応を追加してもらうわけですが、どの`path`にもマッチしなかった場合、任意の`path`にマッチする`/:path(.*)`がマッチし、NotFound ページが表示されます。
+この後、皆さんにはいくつかのページとその`path`の対応を追加してもらうわけですが、どの`path`にもマッチしなかった場合、任意の`path`にマッチする`/:path(.*)*`がマッチし、NotFound ページが表示されます。
 
 `src/pages/NotFound.vue`を以下の内容で作成してください。
 

diff --git a/docs/chapter2/section2/2_fetch.md b/docs/chapter2/section2/2_fetch.md
@@ -26,6 +26,10 @@
 
 <<<@/chapter2/section2/src/2/router.ts{typescript:line-numbers}
 
+また併せて、`src/App.vue`にリンクを追加します。
+
+<<<@/chapter2/section2/src/2/App.vue{vue:line-numbers}
+
 `http://localhost:5173/ping`にアクセスすると以下のような画面が表示されれば OK です。
 
 ![](images/2/ping.png)

diff --git a/docs/chapter2/section2/src/1/router.ts b/docs/chapter2/section2/src/1/router.ts
@@ -4,7 +4,7 @@ import NotFound from './pages/NotFound.vue'
 
 const routes = [
   { path: '/', name: 'home', component: HomePage },
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
 
 const router = createRouter({

diff --git a/docs/chapter2/section2/src/1/routes.ts b/docs/chapter2/section2/src/1/routes.ts
@@ -1,4 +1,4 @@
 export const routes = [
   { path: '/', name: 'home', component: HomePage },
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
diff --git a/docs/chapter2/section2/src/1/vite.config.ts b/docs/chapter2/section2/src/1/vite.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
       '/api': {
         target: 'http://localhost:8080',
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '/')
+        rewrite: (path: string) => path.replace(/^\/api/, '/')
       }
     }
   }

diff --git a/docs/chapter2/section2/src/2/router.ts b/docs/chapter2/section2/src/2/router.ts
@@ -6,7 +6,7 @@ import PingPage from './pages/PingPage.vue' //[!code ++]
 const routes = [
   { path: '/', name: 'home', component: HomePage },
   { path: '/ping', name: 'ping', component: PingPage }, //[!code ++]
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
 
 const router = createRouter({

diff --git a/docs/chapter2/section2/src/2/router_2.ts b/docs/chapter2/section2/src/2/router_2.ts
@@ -8,7 +8,7 @@ const routes = [
   { path: '/', name: 'home', component: HomePage },
   { path: '/ping', name: 'ping', component: PingPage },
   { path: '/login', name: 'login', component: LoginPage }, //[!code ++]
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
 
 const router = createRouter({

diff --git a/docs/chapter2/section2/src/2/router_3.ts b/docs/chapter2/section2/src/2/router_3.ts
@@ -10,7 +10,7 @@ const routes = [
   { path: '/ping', name: 'ping', component: PingPage },
   { path: '/login', name: 'login', component: LoginPage },
   { path: '/city/:cityName', name: 'city', component: CityPage, props: true }, //[!code ++]
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
 
 const router = createRouter({

diff --git a/docs/chapter2/section2/src/2/router_4.ts b/docs/chapter2/section2/src/2/router_4.ts
@@ -10,7 +10,7 @@ const routes = [
   { path: '/ping', name: 'ping', component: PingPage },
   { path: '/login', name: 'login', component: LoginPage },
   { path: '/city/:cityName', name: 'city', component: CityPage, props: true },
-  { path: '/:path(.*)', component: NotFound }
+  { path: '/:path(.*)*', component: NotFound }
 ]
 
 const router = createRouter({

diff --git a/docs/chapter2/section2/src/2/router_5.ts b/docs/chapter2/section2/src/2/router_5.ts
@@ -7,15 +7,15 @@ import CityPage from './pages/CityPage.vue'
 
 const routes = [
   { path: '/', name: 'home', component: HomePage, meta: { isPublic: true } },
-  { path: '/ping', name: 'ping', component: PingPage },
+  { path: '/ping', name: 'ping', component: PingPage, meta: { isPublic: true } },
   {
     path: '/login',
     name: 'login',
     component: LoginPage,
     meta: { isPublic: true }
   },
   { path: '/city/:cityName', name: 'city', component: CityPage, props: true },
-  { path: '/:path(.*)', component: NotFound, meta: { isPublic: true } }
+  { path: '/:path(.*)*', component: NotFound, meta: { isPublic: true } }
 ]
 
 const router = createRouter({