fix: challenge and track UI changes releated to carla feedback

guardstrikelab · Apr 17, 2024 · de56b58 · de56b58
1 parent caade52
commit de56b58
Show file tree

Hide file tree

Showing 9 changed files with 1,903 additions and 1,125 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -93,7 +93,7 @@ export default {
     login: 'Log In',
   },
   challenge: {
-    challenge: 'Challenge',
+    challenge: 'Challenges',
     participate: 'Participate',
     ongoing: 'ongoing',
     eventDetails: 'Event details',
@@ -137,7 +137,7 @@ export default {
     modifyPic: 'Modify profile picture',
     firstName: 'First Name',
     lastName: 'Last Name',
-    affilliate: 'Affilliate To',
+    affiliatedTo: 'Affiliated To',
     profileCompleted: 'Profile Completed',
     password: 'Password',
     changePassword: 'Change Password',
@@ -287,7 +287,7 @@ export default {
     titlePH: 'Autonomous Driving Algorithms Challenge',
     shortDesc: 'Short description',
     shortDescPH: 'Autonomous Driving Algorithm Challenge for each submission',
-    desc: 'Description',
+    desc: 'Overview',
     evaluation: 'Evaluation details',
     termsConditions: 'Terms and conditions',
     image: 'Image',
@@ -309,9 +309,12 @@ export default {
     editTrack: 'Edit Track',
     name: 'Name',
     desc: 'Description',
-    lbPublic: 'Leaderboard public',
-    isPublic: 'Is public',
-    isSubmiPublic: 'Is submission public',
+    lbPublic: 'Is leaderboard public',
+    isLeaderboardPublicNote: 'When this switch is turned on, the Track Leaderboard will be open to the public',
+    isPublic: 'Is track public',
+    isTrackPublicNote: 'When this switch is turned on, participant can make submission on this track',
+    isSubmiPublic: 'Is submission default public',
+    isSubmissionDefaultPublicNote: 'When this switch is turned on, the Submission on this Track will be open to public as default',
     startDate: 'Start date',
     endDate: 'End date',
     codename: 'Codename',

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -137,7 +137,7 @@ export default {
     modifyPic: '编辑头像',
     firstName: '名字',
     lastName: '姓氏',
-    affilliate: '单位',
+    affiliatedTo: '单位',
     profileCompleted: '简介完成度',
     password: '密码',
     changePassword: '更改密码',
@@ -310,6 +310,9 @@ export default {
     lbPublic: '公开排行',
     isPublic: '是否公开',
     isSubmiPublic: '提交是否公开?',
+    isLeaderboardPublicNote: '当打开这个开关，这个阶段下的排行版会被所有人查看',
+    isTrackPublicNote: '当打开这个开关，这个阶段会开放',
+    isSubmissionDefaultPublicNote: '当大开这个开关，这个阶段下的提交默认会被公开',
     startDate: '开始日期',
     endDate: '结束日期',
     codename: '代号',

diff --git a/src/views/challenge/Approval.vue b/src/views/challenge/Approval.vue
@@ -7,8 +7,8 @@
           <el-table :data="row.members">
             <el-table-column label="Name" prop="member_name" />
             <el-table-column label="Email" prop="email" />
-            <el-table-column label="Affilliate To" prop="profile.affiliation" />
-            <el-table-column label="GITHUB" prop="profile.github_url" />
+            <el-table-column label="Affiliated To" prop="profile.affiliation" />
+            <!-- <el-table-column label="GITHUB" prop="profile.github_url" /> -->
           </el-table>
         </div>
       </template>

diff --git a/src/views/host/AddChallenge.vue b/src/views/host/AddChallenge.vue
@@ -16,15 +16,6 @@
         <el-form-item :label="$t('addChall.shortDesc')" prop="short_description">
           <editor v-model="ruleForm.short_description"></editor>
         </el-form-item>
-        <el-form-item :label="$t('addChall.desc')" prop="description">
-          <editor v-model="ruleForm.description"></editor>
-        </el-form-item>
-        <el-form-item :label="$t('addChall.evaluation')" prop="evaluation_details">
-          <editor v-model="ruleForm.evaluation_details"></editor>
-        </el-form-item>
-        <el-form-item :label="$t('addChall.termsConditions')" prop="terms_and_conditions">
-          <editor v-model="ruleForm.terms_and_conditions"></editor>
-        </el-form-item>
         <el-form-item :label="$t('addChall.image')" prop="image">
           <el-upload class="avatar-uploader" name="image" :show-file-list="false" :on-change="onFileChange" :auto-upload="false">
             <img v-if="ruleForm.image" :src="ruleForm.imageUrl || ruleForm.image" class="avatar" />
@@ -36,6 +27,15 @@
             </span>
           </el-upload>
         </el-form-item>
+        <el-form-item :label="$t('addChall.desc')" prop="description">
+          <editor v-model="ruleForm.description"></editor>
+        </el-form-item>
+        <el-form-item :label="$t('addChall.evaluation')" prop="evaluation_details">
+          <editor v-model="ruleForm.evaluation_details"></editor>
+        </el-form-item>
+        <el-form-item :label="$t('addChall.termsConditions')" prop="terms_and_conditions">
+          <editor v-model="ruleForm.terms_and_conditions"></editor>
+        </el-form-item>
 
         <el-form-item :label="$t('addChall.SubmiGuide')" prop="submission_guidelines">
           <editor v-model="ruleForm.submission_guidelines"></editor>

diff --git a/src/views/host/AddTrack.vue b/src/views/host/AddTrack.vue
@@ -17,18 +17,6 @@
         <el-form-item :label="$t('addChall.desc')" prop="description">
           <editor v-model="ruleForm.description"></editor>
         </el-form-item>
-        <el-form-item prop="leaderboard_public">
-          <span class="inline-title">{{ $t('addTrack.lbPublic') }}</span>
-          <el-switch v-model="ruleForm.leaderboard_public" size="small" />
-        </el-form-item>
-        <el-form-item prop="is_public">
-          <span class="inline-title">{{ $t('addTrack.isPublic') }}</span>
-          <el-switch v-model="ruleForm.is_public" size="small" />
-        </el-form-item>
-        <el-form-item prop="is_submission_public">
-          <span class="inline-title">{{ $t('addTrack.isSubmiPublic') }}</span>
-          <el-switch v-model="ruleForm.is_submission_public" size="small" />
-        </el-form-item>
         <el-form-item>
           <div class="flex-between" style="width: 100%">
             <el-form-item :label="$t('addTrack.startDate')" prop="start_date" required>
@@ -61,6 +49,36 @@
         <el-form-item :label="$t('addTrack.maxSubmissions')" prop="max_submissions" required>
           <el-input v-model="ruleForm.max_submissions" maxlength="32" />
         </el-form-item>
+        <el-form-item prop="leaderboard_public">
+          <span class="inline-title">{{ $t('addTrack.lbPublic') }}</span>
+          <el-switch v-model="ruleForm.leaderboard_public" size="small" />
+          <span class="note ml16">
+            <svg class="icon" aria-hidden="true" style="font-size: 12px">
+              <use xlink:href="#icon-zhushi"></use>
+            </svg>
+            {{ $t('addTrack.isLeaderboardPublicNote') }}
+          </span>
+        </el-form-item>
+        <el-form-item prop="is_public">
+          <span class="inline-title">{{ $t('addTrack.isPublic') }}</span>
+          <el-switch v-model="ruleForm.is_public" size="small" />
+          <span class="note ml16">
+            <svg class="icon" aria-hidden="true" style="font-size: 12px">
+              <use xlink:href="#icon-zhushi"></use>
+            </svg>
+            {{ $t('addTrack.isTrackPublicNote') }}
+          </span>
+        </el-form-item>
+        <el-form-item prop="is_submission_public">
+          <span class="inline-title">{{ $t('addTrack.isSubmiPublic') }}</span>
+          <el-switch v-model="ruleForm.is_submission_public" size="small" />
+          <span class="note ml16">
+            <svg class="icon" aria-hidden="true" style="font-size: 12px">
+              <use xlink:href="#icon-zhushi"></use>
+            </svg>
+            {{ $t('addTrack.isSubmissionDefaultPublicNote') }}
+          </span>
+        </el-form-item>
         <el-form-item prop="is_restricted_to_select_one_submission">
           <span class="inline-title">{{ $t('addTrack.isRestrictedToSelectOneSubmission') }}</span>
           <el-switch v-model="ruleForm.is_restricted_to_select_one_submission" size="small" />
@@ -109,7 +127,7 @@ const ruleForm = reactive({
   max_submissions_per_month: '',
   max_submissions: '',
   is_restricted_to_select_one_submission: false,
-  is_partial_submission_evaluation_enabled: false,
+  is_partial_submission_evaluation_enabled: true,
   allowed_submission_file_types: '',
 });
 
@@ -225,6 +243,10 @@ onMounted(() => {
       min-width: 260px;
       display: inline-block;
     }
+    .note {
+      color: #7f889a;
+      font-size: 12px;
+    }
   }
 }
 </style>
diff --git a/src/views/host/Index.vue b/src/views/host/Index.vue
@@ -52,11 +52,16 @@
             <div class="title mb16">Challenge Tracks：</div>
             <el-table :data="props.row.trackList" :show-header="false">
               <el-table-column label="Name" prop="name" width="250" />
-              <el-table-column label="Description" prop="description">
+              <el-table-column label="Time">
                 <template #default="{ row }">
-                  <div v-html="row.description"></div>
+                  <div>{{ formatTime(row.start_date) }} - {{ formatTime(row.end_date) }}  </div>
                 </template>
               </el-table-column>
+              <!-- <el-table-column label="Description" prop="description">
+                <template #default="{ row }">
+                  <div v-html="row.description"></div>
+                </template>
+              </el-table-column> -->
               <el-table-column :label="$t('operate')" width="100">
                 <template #default="{ row }">
                   <div class="flex">
@@ -123,7 +128,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="is_registration_open" :label="$t('host.isRegistrationOpen')" width="150">
+      <!-- <el-table-column prop="is_registration_open" :label="$t('host.isRegistrationOpen')" width="150">
         <template #default="{ row }">
           <span class="round-status success" v-if="row.is_registration_open">
             <svg class="icon" aria-hidden="true">
@@ -150,7 +155,7 @@
             </svg>
           </span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('operate')" width="150">
         <template #default="{ row }">
           <div class="flex">

diff --git a/src/views/user/Profile.vue b/src/views/user/Profile.vue
@@ -48,13 +48,13 @@
         <el-input v-model.trim="form.last_name" placeholder="-" maxlength="150"></el-input>
       </div>
       <div class="flex-between item">
-        <div class="label">{{ $t('user.affilliate') }}</div>
+        <div class="label">{{ $t('user.affiliatedTo') }}</div>
         <el-input v-model.trim="form.affiliation" placeholder="-" maxlength="512"></el-input>
       </div>
-      <div class="flex-between item">
+      <!-- <div class="flex-between item">
         <div class="label">GITHUB</div>
         <el-input v-model.trim="form.github_url" placeholder="-" maxlength="200"></el-input>
-      </div>
+      </div> -->
     </div>
     <div class="footer">
       <el-button type="primary" @click="save"> {{ $t('save') }} </el-button>