CM を外す対応 (一旦暫定対処なので環境変数で分岐すべき)

cniajp · Nov 21, 2024 · 9763b8c · 9763b8c
1 parent 1334062
commit 9763b8c
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 172 deletions.
diff --git a/.env.development b/.env.development
@@ -3,7 +3,7 @@ NEXT_PUBLIC_API_BASE_URL=https://event.cloudnativedays.jp/
 NEXT_PUBLIC_EVENT_ABBR=cndw2024
 # NEXT_PUBLIC_DEBUG='true'
 # BGM の長さを音はめする 長さ全部: 192.03
-NEXT_PUBLIC_TRANS_TIME_PAGE1='65'
-NEXT_PUBLIC_TRANS_TIME_PAGE2='65'
-NEXT_PUBLIC_TRANS_TIME_PAGE3='62.03'
+NEXT_PUBLIC_TRANS_TIME_PAGE1='32.5'
+NEXT_PUBLIC_TRANS_TIME_PAGE2='32.5'
+NEXT_PUBLIC_TRANS_TIME_PAGE3='127.03'
 NEXT_PUBLIC_EXCLUDED_TALKS='2056'
diff --git a/.env.production b/.env.production
@@ -1,7 +1,7 @@
 NEXT_PUBLIC_API_BASE_URL=https://event.cloudnativedays.jp/
 NEXT_PUBLIC_EVENT_ABBR=cndw2024
 # NEXT_PUBLIC_DEBUG='true'
-NEXT_PUBLIC_TRANS_TIME_PAGE1='45.335'
-NEXT_PUBLIC_TRANS_TIME_PAGE2='45.335'
-NEXT_PUBLIC_TRANS_TIME_PAGE3='0'
+NEXT_PUBLIC_TRANS_TIME_PAGE1='32.5'
+NEXT_PUBLIC_TRANS_TIME_PAGE2='32.5'
+NEXT_PUBLIC_TRANS_TIME_PAGE3='127.03'
 NEXT_PUBLIC_EXCLUDED_TALKS='2056'
diff --git a/compose.yaml b/compose.yaml
@@ -7,12 +7,13 @@ services:
     - .env.development
     ports:
     - 3000:3000
-  proxy:
-    image: hrk091/simple-proxy:v0.0.2
-    ports:
-    - 8888:8888
-    environment:
-      TARGET_URL: https://event.cloudnativedays.jp/
-      # CACHE_DIR: /mnt/cache
-    volumes:
-    - ./cache:/mnt/cache
+  # CORS 超えに必要だったが、現在は不要
+  # proxy:
+  #   image: hrk091/simple-proxy:v0.0.2
+  #   ports:
+  #   - 8888:8888
+  #   environment:
+  #     TARGET_URL: https://event.cloudnativedays.jp/
+  #     # CACHE_DIR: /mnt/cache
+  #   volumes:
+  #   - ./cache:/mnt/cache
diff --git a/public/cndw2024/cndw2024_intermission.mp3 b/public/cndw2024/cndw2024_intermission.mp3
diff --git a/src/api/config/apiConfig.ts b/src/api/config/apiConfig.ts
@@ -1,13 +1,8 @@
 // eventAbbrはイベント毎に変更する.
-const eventAbbr = 'cnds2024'
+const eventAbbr = 'cndw2024'
 
-// export const apiConfig = {
-//     talksEndpoint: `https://event.cloudnativedays.jp/api/v1/talks?eventAbbr=${eventAbbr}`,
-//     talkEndpoint: `https://event.cloudnativedays.jp/api/v1/talks/`,
-//     speakersEndpoint:  `https://event.cloudnativedays.jp/api/v1/speakers?eventAbbr=${eventAbbr}`,
-// };
 export const apiConfig = {
-  talksEndpoint: `https://dreamkast-dk-2147.dev.cloudnativedays.jp/api/v1/talks?eventAbbr=${eventAbbr}`,
-  talkEndpoint: `https://dreamkast-dk-2147.dev.cloudnativedays.jp/api/v1/talks/`,
-  speakersEndpoint: `https://dreamkast-dk-2147.dev.cloudnativedays.jp/api/v1/speakers?eventAbbr=${eventAbbr}`,
-}
+    talksEndpoint: `https://event.cloudnativedays.jp/api/v1/talks?eventAbbr=${eventAbbr}`,
+    talkEndpoint: `https://event.cloudnativedays.jp/api/v1/talks/`,
+    speakersEndpoint:  `https://event.cloudnativedays.jp/api/v1/speakers?eventAbbr=${eventAbbr}`,
+};
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -5,8 +5,8 @@ import { Inter } from 'next/font/google'
 const inter = Inter({ subsets: ['latin'] })
 
 export const metadata: Metadata = {
-  title: 'Web Interlude PoC',
-  description: 'Test core requirements for the web interlude.',
+  title: 'EMTEC Intermission',
+  description: 'EMTEC Intermission is a web application for generating Intermission for use in streaming.',
 }
 
 export default function RootLayout({
@@ -17,7 +17,7 @@ export default function RootLayout({
   folder1: React.ReactNode
 }) {
   return (
-    <html lang="en">
+    <html lang="ja">
       <body className={inter.className}>{children}</body>
     </html>
   )

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -5,65 +5,65 @@ import Link from 'next/link'
 export default function Home() {
   return (
     <main className="flex min-h-screen flex-col items-center justify-evenly p-24">
-      <h1 className={`text-4xl`}>Web Interlude PoC</h1>
-      <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
+      <h1 className={`text-4xl`}>EMTEC Intermission</h1>
+      <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-2 lg:text-left">
         <Link
-          href="/video"
+          href="/break-dk/menu/0"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>
-            Video{' '}
+          Dreamkast で利用(Day1分){' '}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Playing a video using video.js.
+            CloudNativeDays イベントのインタミはこちら.
           </p>
         </Link>
 
         <Link
-          href="/video-playlist"
+          href="/break-dk/menu/1"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>
-            Playlist{' '}
+          Dreamkast で利用(Day2分){' '}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Playing a video playlist using videojs-playlist.
+          CloudNativeDays イベントのインタミはこちら.
           </p>
         </Link>
 
         <Link
-          href="/animation"
+          href="/break/menu/0"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>
-            Animation{' '}
+           TS ファイルをソースとして利用(Day1分){' '}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            2D animation with React Pixi.
+          src/data/talks.ts に書き込んだ トーク情報からインタミを生成する場合はこちら.
           </p>
         </Link>
 
         <Link
-          href="/player"
+          href="/break/menu/0"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>
-            Player{' '}
+          TS ファイルをソースとして利用(Day2分){' '}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Switching multi media sources automatically.
+          src/data/talks.ts に書き込んだ トーク情報からインタミを生成する場合はこちら.
           </p>
         </Link>
       </div>

diff --git a/src/app/player/@videoPlaylist/page.tsx b/src/app/player/@videoPlaylist/page.tsx
@@ -8,47 +8,48 @@ import { Playlist } from '../../../components/VideoPlaylist'
 
 const VideoPlaylist = dynamic(() => import('../../../components/VideoPlaylist'))
 
+// CNDW2024 は CM スポンサーなしのためコメントアウト
 const playlist: Playlist = [
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm1.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm2.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm3.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm4.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm5.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm1.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm2.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm3.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm4.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm5.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
 ]
 
 export default function Page() {

diff --git a/src/app/video-playlist/page.tsx b/src/app/video-playlist/page.tsx
@@ -7,46 +7,46 @@ import { Playlist } from '@/components/VideoPlaylist'
 const VideoPlaylist = dynamic(() => import('../../components/VideoPlaylist'))
 
 const playlist: Playlist = [
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm1.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm2.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm3.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm4.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
-  {
-    sources: [
-      {
-        src: 'https://web-intermission.s3.isk01.sakurastorage.jp/pek2024/cm5.mp4',
-        type: 'video/mp4',
-      },
-    ],
-  },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm1.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm2.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm3.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm4.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
+  // {
+  //   sources: [
+  //     {
+  //       src: 'https://web-intermission.s3.isk01.sakurastorage.jp/cndw2024/cm5.mp4',
+  //       type: 'video/mp4',
+  //     },
+  //   ],
+  // },
 ]
 
 export default function Page() {