feat: add time info for endless levels

Baiqiang · Dec 3, 2023 · 5cc1587 · 5cc1587
1 parent aa8b328
commit 5cc1587
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/messages/en.ts b/messages/en.ts
@@ -305,6 +305,8 @@ export default {
       rollingAo5: 'Best Rolling Ao5',
       rollingAo12: 'Best Rolling Ao12',
     },
+    openAt: 'Open at {time}.',
+    kickedAt: 'Kicked at {time}.',
   },
   result: {
     rank: 'Rank',

diff --git a/messages/zh-CN.ts b/messages/zh-CN.ts
@@ -305,6 +305,8 @@ export default {
       rollingAo5: '最佳滚动 Ao5',
       rollingAo12: '最佳滚动 Ao12',
     },
+    openAt: '{time}开放。',
+    kickedAt: '{time}破关。',
   },
   result: {
     rank: '排名',

diff --git a/pages/endless/[season]/[level].vue b/pages/endless/[season]/[level].vue
@@ -44,16 +44,24 @@ async function updateData(submission: Submission) {
       {{ $t('endless.level', { level: params.level }) }}
     </h2>
     <div class="mb-2">
-      <div class="font-bold text-lg">
-        {{ $t('endless.kickedBy') }}
+      <div class="mb-2">
+        {{ $t('endless.openAt', { time: $dayjs(progress.scramble.createdAt).locale($i18n.locale).format('LLL') }) }}
       </div>
-      <div class="flex flex-col md:flex-row gap-2">
-        <div v-for="{ user, submission } in progress.kickedBy" :key="user.id" class="flex items-center">
-          <UserAvatarName :user="user">
-            ({{ formatResult(submission.moves) }})
-          </UserAvatarName>
+      <template v-if="progress.kickedBy.length > 0">
+        <div class="mb-2">
+          {{ $t('endless.kickedAt', { time: $dayjs(progress.kickedBy[0].createdAt).locale($i18n.locale).format('LLL') }) }}
         </div>
-      </div>
+        <div class="font-bold text-lg">
+          {{ $t('endless.kickedBy') }}
+        </div>
+        <div class="flex flex-col md:flex-row gap-2">
+          <div v-for="{ user, submission } in progress.kickedBy" :key="user.id" class="flex items-center">
+            <UserAvatarName :user="user">
+              ({{ formatResult(submission.moves) }})
+            </UserAvatarName>
+          </div>
+        </div>
+      </template>
     </div>
     <div class="font-bold text-lg">
       {{ $t('if.scramble.label') }}

diff --git a/utils/competition.ts b/utils/competition.ts
@@ -1,5 +1,10 @@
 import type { User } from './user'
 
+export interface Time {
+  createdAt: string
+  updatedAt: string
+}
+
 export interface Competition {
   id: number
   alias: string
@@ -26,13 +31,13 @@ export interface Result {
   rollingStart: number
 }
 
-export interface Scramble {
+export interface Scramble extends Time {
   id: number
   number: number
   scramble: string
 }
 
-export interface Submission {
+export interface Submission extends Time {
   id: number
   solution: string
   comment: string
@@ -92,10 +97,10 @@ export interface Progress {
   level: number
   scramble: Scramble
   submission?: Submission
-  kickedBy?: Kickoff[]
+  kickedBy: Kickoff[]
 }
 
-export interface Kickoff {
+export interface Kickoff extends Time {
   id: number
   user: User
   submission: Submission