fix upload code condition

SharifAIChallenge · Apr 27, 2021 · 78a213a · 78a213a
1 parent 90b20c9
commit 78a213a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/components/dashboard/submission/CodeSubmission.vue b/components/dashboard/submission/CodeSubmission.vue
@@ -51,7 +51,7 @@
       <v-btn
         tile
         block
-        :disabled="!valid || !canSubmitAnotherCode || !profile || !profile.is_finalist"
+        :disabled="!file || !canSubmitAnotherCode || !profile || !profile.is_finalist || !isFinalPayed"
         :loading="loading"
         type="submit"
         v-bind="primaryButtonProps"
@@ -86,8 +86,14 @@ export default {
       fileHint: 'zip',
       fileRules: [v => !!v || ''],
       loading: false,
+      mode: 0,
+      isFinalPayed: false,
     };
   },
+  async fetch() {
+    let res = await this.$axios.$get('team');
+    this.isFinalPayed = res.final_payed;
+  },
   computed: {
     ...mapState({
       profile: state => state.auth.user,

diff --git a/components/dashboard/submission/SubmissionsList.vue b/components/dashboard/submission/SubmissionsList.vue
@@ -5,7 +5,7 @@
       center
       :items="submissions"
       :page.sync="page"
-      :items-per-page="itemsPerPage"
+      :items-per-page="20"
       hide-default-footer
       item-key="id"
       locale="fa"
@@ -16,7 +16,7 @@
       <template v-slot:[`item.is_final`]="{ item }">
         <v-btn icon @click="changeFinal(item)">
           <v-icon>
-            {{ item.is_final ? 'mdi-checkbox-marked' : 'mdi-checkbox-blank-outline' }}
+            {{ item.is_final || item.is_mini_game_final ? 'mdi-checkbox-marked' : 'mdi-checkbox-blank-outline' }}
           </v-icon>
         </v-btn>
       </template>
@@ -44,7 +44,7 @@
         </v-btn>
       </template>
     </v-data-table>
-            <v-pagination v-model="page" :length="pageCount" :total-visible="5" class="my-3" />
+    <v-pagination v-model="page" :length="pageCount" :total-visible="5" class="my-3" />
 
     <v-dialog v-model="dialog" hide-overlay transition="dialog-bottom-transition" width="500">
       <div class="pa-4 bg-color-12">

diff --git a/layouts/dashboard.vue b/layouts/dashboard.vue
@@ -147,6 +147,14 @@ export default {
           disabled: false,
           gard: false,
         },
+        live: {
+          title: 'لایو',
+          icon: 'mdi-presentation-play',
+          hover: 'mdi-presentation-play',
+          link: '/live',
+          disabled: false,
+          gard: false,
+        },
       },
       bottomRoute: {
         settings: {

diff --git a/pages/dashboard/submissions.vue b/pages/dashboard/submissions.vue
@@ -30,7 +30,7 @@
           <v-chip filter outlined>اصلی</v-chip>
           <v-chip filter outlined>مینی‌گیم</v-chip>
         </v-chip-group>
-        <submissions-list class="py-6 py-md-12" :submissions="submissions" />
+        <submissions-list class="py-6 py-md-12" :submissions="submissions.filter(s => mode == s.is_mini_game)" />
 
         <!-- </SectionContainer> -->
       </v-card>
@@ -43,16 +43,14 @@ import SectionHeader from '~/components/SectionHeader';
 import SectionContainer from '~/components/SectionContainer';
 import CodeSubmission from '../../components/dashboard/submission/CodeSubmission';
 import SubmissionsList from '../../components/dashboard/submission/SubmissionsList';
-import { viewSubmissions } from '~/api/index';
-import { mapState } from 'vuex';
 
 export default {
   components: { CodeSubmission, SubmissionsList, SectionHeader, SectionContainer },
   layout: 'dashboard',
   transition: 'fade-transition',
 
   async fetch() {
-    let data = await this.$axios.$get(`/team/submissions?is_mini=0`);
+    let data = await this.$axios.$get(`/team/submission`);
     this.submissions = data.submissions;
     this.calculateTimeInterval();
   },
@@ -67,7 +65,7 @@ export default {
   },
   methods: {
     async getData() {
-      let data = await this.$axios.$get(`/team/submissions?is_mini=${this.mode}`);
+      let data = await this.$axios.$get(`/team/submission`);
       this.submissions = data.submissions;
     },
     calculateTimeInterval() {
@@ -86,11 +84,6 @@ export default {
   destroyed() {
     clearInterval(this.interval);
   },
-  watch: {
-    mode: function() {
-      this.getData();
-    },
-  },
 };
 </script>