Revert "Merge branch 'main' into staging"

This reverts commit dfef3ec, reversing changes made to 20b11a3.
SharifAIChallenge · Mar 3, 2021 · de737ef · de737ef
1 parent dfef3ec
commit de737ef
Show file tree

Hide file tree

Showing 56 changed files with 1,806 additions and 3,685 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Node template
 # Logs
-package-lock.json
-yarn.lock
 /logs
 *.log
 npm-debug.log*

diff --git a/api/index.js b/api/index.js
@@ -299,10 +299,6 @@ export const gameStats = axios => {
   return axios.$get(config.url);
 };
 
-/*******************************/
-export const test = axios => {
-  return axios.$get('/ticket');
-};
 export const FAQ = axios => {
   return axios.$get('/faq/questions');
 };

diff --git a/components/EmailCallToAction.vue b/components/EmailCallToAction.vue
@@ -1,25 +1,24 @@
 <template>
   <v-container flat tile class="call_to_action transparent mx-auto" id="CallToAction">
-    <img src="../assets/images/logo/logo__white.svg" class="background-logo" />
+    <img src="logo__white.svg" class="background-logo" />
     <v-row class="mb-16" justify="space-between">
       <v-col cols="12" sm="5" class="align-start justify-center" style="z-index:1">
         <div class="d-flex flex-column align-center align-sm-end justify-center " style="height:100%">
-          <div class="font-weight-bold  text-h4 mb-1">با ما</div>
-          <div class="primary--text font-weight-bold text-sm-h2 text-h3 mb-1">همراه</div>
-          <div class="font-weight-bold  text-h4 mb-1">باشید...</div>
+          <div class="font-weight-bold  text-h4 mb-1">همین حالا</div>
+          <div class="primary--text font-weight-bold text-sm-h2 text-h3 mb-1">ثبت نام</div>
+          <div class="font-weight-bold  text-h4 mb-1">کنید</div>
         </div>
       </v-col>
       <v-col cols="12" sm="5" class="align-start justify-center">
         <v-text-field :label="$t('form.email')" dir="ltr" type="email" outlined v-model="email"></v-text-field>
         <v-btn
           @click="submit"
           :disabled="loading"
-          color="primary"
           tile
           block
           x-large
           style="max-width: 400px; margin: auto"
-          class="white--text my-3 px-sm-1 text-center action-btn"
+          class="black white--text my-3 px-sm-1 text-center"
         >
           عضویت در خبرنامه
         </v-btn>
@@ -38,10 +37,8 @@ export default {
   methods: {
     submit() {
       this.loading = true;
-      this.$axios.$post('homepage/subscribe', { email: this.email }).then(res => {
+      this.$axios.$post('/homepage/subscribe', { email: this.email }).then(res => {
         this.loading = false;
-        this.email = '';
-        console.log(res.status_code);
         if (res.status_code === 200) this.$toast.success('ایمیل شما با موفقیت ثبت شد');
         else this.$toast.error('ایمیل شما تکراری یا نامعتبر است');
       });
@@ -54,24 +51,21 @@ export default {
 @import '../assets/mixins.scss';
 .background-logo {
   position: absolute;
-  top: 0;
+  top: -100px;
   opacity: 0.15;
   z-index: 0;
-}
-.action-btn {
-  position: relative;
-  z-index: 1000;
+  transform: scale(0.7);
+  @include not-md {
+    top: 0px;
+  }
 }
 .call_to_action {
   max-width: 750px;
   position: relative;
-  padding-top: 11rem;
-  padding-bottom: 250px;
-  margin-top: 13rem;
+  padding-top: 10rem;
+  padding-bottom: 200px;
+  margin-top: 14rem;
   overflow: hidden;
-  @include not-md {
-    margin-top: 6rem;
-    padding-top: 6rem;
-  }
+  height: 100vh;
 }
 </style>
diff --git a/components/blog/Post.vue b/components/blog/Post.vue
@@ -1,23 +1,29 @@
 <template>
-  <v-card tile flat class="pb-4" :elevation="cardEval" @mousemove="cardEval = 24" @mouseleave="cardEval = 0" :to="`/blog/${post.id}`">
-    <v-img class="white--text align-end" height="200px" :src="`https://aichallenge.ir${post.image}`"></v-img>
-    <v-card-subtitle class="primary--text pb-1 pt-2 pr-3">
-      {{ new Intl.DateTimeFormat($i18n.locale).format(new Date(post.date)) }}
-    </v-card-subtitle>
-    <div class="my-4 pr-3 text-h6">
-      {{ post.title_fa }}
-    </div>
-  </v-card>
+    <v-card class="mx-auto" max-width="800" tile flat :elevation="cardEval" @mousemove="cardEval=24" @mouseleave="cardEval=0" :to="`/blog/${post.id}`"> 
+      <v-img class="white--text align-end" height="200px" :src="`https://aichallenge.sharif.edu/${post.image}`">
+      </v-img>
+      <v-card-subtitle class="primary--text pb-1 pt-2 pr-1">
+          {{
+              new Intl.DateTimeFormat($i18n.locale).format(
+                new Date(post.date)
+              )
+            }}
+      </v-card-subtitle>
+      <v-card-title class="pr-1">
+        {{post.title_fa}}
+      </v-card-title>
+    </v-card>
 </template>
 
 <script>
 export default {
   props: ['post'],
   data() {
     return {
-      cardEval: 0,
+      cardEval:0
     };
   },
 };
 </script>
-<style scoped></style>
+<style scoped>
+</style>
diff --git a/components/landing/About.vue b/components/landing/About.vue
@@ -60,8 +60,10 @@ div {
 }
 #about {
   max-width: 45%;
+  padding: 120px 30px;
   @include not-md {
     max-width: 90%;
+    padding: 50px 15px;
   }
 }
 </style>
diff --git a/components/landing/Header.vue b/components/landing/Header.vue
@@ -9,13 +9,13 @@
       <div class="d-flex flex-column align-center justify-center" style="height: 85%">
         <v-btn plain :ripple="false" text tile :class="getClass()" to="/">خانه</v-btn>
         <v-btn plain :ripple="false" text tile :class="getClass()" to="/faq">سوالات متداول</v-btn>
-        <v-btn plain :ripple="false" text tile :class="getClass()" to="/blog">اخبار</v-btn>
+        <!-- <v-btn plain :ripple="false" text tile :class="getClass()" to="/blog">اخبار</v-btn> -->
         <v-btn plain text :ripple="false" tile :class="getClass()" to="/history">
           تاریخچه
         </v-btn>
       </div>
     </v-dialog>
-    <v-app-bar flat absolute height="75px" :color="color">
+    <v-app-bar flat absolute :color="color">
       <v-btn icon class="transparent hidden-sm-and-up" @click="showMenu = !showMenu">
         <v-icon>
           mdi-menu
@@ -31,9 +31,12 @@
         <v-btn plain text :ripple="false" tile :class="getClass()" to="/">
           خانه
         </v-btn>
-        <v-btn plain text tile :class="getClass()" to="/blog">
+        <!-- <v-btn plain text tile :class="getClass()" to="/blog">
           اخبار
         </v-btn>
+        <v-btn plain text tile :class="getClass()">
+          تاریخچه
+        </v-btn> -->
         <v-btn plain text :ripple="false" tile :class="getClass()" to="/faq">
           سوالات متداول
         </v-btn>
@@ -100,13 +103,9 @@ export default {
   }
   .logo {
     position: absolute;
-    top: 20px;
-    left: 20px;
-    width: 66px;
-    &:after {
-      content: 'AIC';
-      position: absolute;
-    }
+    top: 10px;
+    left: 10px;
+    width: 56px;
   }
   .navLinks {
     height: calc(100% - 200px);

diff --git a/components/landing/Timeline.vue b/components/landing/Timeline.vue
@@ -72,7 +72,6 @@ export default {
 
 #timeline {
   background-color: #0e1224;
-  position: relative;
 }
 .timelineTitle {
   font-size: 4.2rem;

diff --git a/components/landing/TrophyDesktop.vue b/components/landing/TrophyDesktop.vue
@@ -11,11 +11,13 @@
       },
     }"
   >
-    <div class="font-weight-bold trophyTitle">
-      <h2 class="font-weight-bold" style="font-size: 5rem">جوایز</h2>
-    </div>
-    <v-row>
-      <v-col cols="4" v-for="(trophy, i) in data" :key="i" :style="`margin-top:${trophy.marg}rem`">
+    <v-row justify="end" align="center">
+      <v-col cols="3">
+        <div class="px-3 font-weight-bold trophyTitle" style="padding-bottom:22rem">
+          <h2 style="font-size: 5rem">جوایز</h2>
+        </div>
+      </v-col>
+      <v-col cols="3" v-for="(trophy, i) in data" :key="i" :style="`margin-top:${trophy.marg}rem`">
         <v-card-text class="d-flex flex-column px-10 text-center white--text">
           <span class="font-weight-black price">{{ trophy.prize_fa }}</span>
           <span class="pt-3 text-h4" style="border-top:2px solid white">میلیون تومان</span>
@@ -37,11 +39,9 @@
       <div class="pr-0">
         <v-card-text>
           <span class="white--text d-flex pr-8 plusText">
-            دو جایزه رندوم برای تیم‌های
-            <br />
-            چهارم تا بیستم
+            دو جایزه رندوم برای تیم های چهارم تا بیستم
             <br />
-            دو جایزه ویژه برای مینی‌گیم‌ها
+            دوجایزه ویژه برای مینی گیم ها
           </span>
         </v-card-text>
       </div>
@@ -57,17 +57,17 @@ export default {
         {
           ...this.trophies[1],
           icon: 'mdi-trophy-variant-outline',
-          marg: 17,
+          marg: 38,
         },
         {
           ...this.trophies[0],
           icon: 'mdi-trophy',
-          marg: 0,
+          marg: 10,
         },
         {
           ...this.trophies[2],
           icon: 'mdi-trophy-outline',
-          marg: 9,
+          marg: 24,
         },
       ];
     },
@@ -81,13 +81,13 @@ export default {
 
 <style lang="scss" scoped>
 #trophy {
-  margin: 200px auto;
+  margin: 0 auto;
   .price {
     font-size: 9rem;
     margin-bottom: 65px;
   }
   .trophyTitle {
-    margin-bottom: 100px;
+    transform: translateY(-100px);
   }
   .iconWraper {
     padding-top: 100px;

diff --git a/components/landing/TrophyMobile.vue b/components/landing/TrophyMobile.vue
@@ -42,11 +42,11 @@
         <v-col cols="8" class="pr-0">
           <v-card-text>
             <span class="white--text font-weight-black text-body-1">
-              دو جایزه رندوم برای تیم‌های
+              دو جایزه برای تیم های
               <br />
               چهارم تا بیستم
               <br />
-              دو جایزه ویژه برای مینی‌گیم‌ها
+              دوجایزه ویژه برای مینی گیم ها
             </span>
           </v-card-text>
         </v-col>

diff --git a/components/landing/staff/Staff.vue b/components/landing/staff/Staff.vue
@@ -9,17 +9,12 @@
       },
     }"
   >
-    <div class="mb-12" width="100%">
-      <div class="text-center white--text text-h2 font-weight-bold">
-        تیم ما
-      </div>
-    </div>
+    <div class="mb-12 text-center white--text text-h2 font-weight-bold" width="100%">تیم ما</div>
     <!-- <v-row class="hidden-md-and-down justify-center">
       <v-col cols="12" lg="3" md="4" v-for="(staff, index) in staffs" class="d-flex justify-center mx-2" :key="index">
         <StaffCard :staff="staff" />
       </v-col>
     </v-row> -->
-
     <div class="d-flex pr-2 scroller">
       <!-- <v-col cols="5"> -->
       <StaffCard v-for="(staff, index) in staffs" :staff="staff" class="ml-6 my-3" :key="index" />
@@ -30,9 +25,6 @@
         مشاهده همه تیم ها
       </v-btn>
     </div> -->
-    <v-icon class="arrow" large>
-      mdi-arrow-left
-    </v-icon>
   </v-container>
 </template>
 
@@ -57,26 +49,15 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import '../../../assets/mixins.scss';
 #staff {
   margin: 20vmin auto;
-  position: relative;
-  .arrow {
-    position: absolute;
-    left: 60px;
-    bottom: -10px;
-    @include not-md {
-      left: 20px;
-    }
-  }
-
-  .scroller {
-    overflow-x: auto;
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
+}
+.scroller {
+  overflow-x: auto;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+  &::-webkit-scrollbar {
+    display: none;
   }
 }
 </style>
diff --git a/components/landing/staff/StaffCard.vue b/components/landing/staff/StaffCard.vue
@@ -2,7 +2,7 @@
   <div class="staff_card">
     <div class="staff_img grey darken-3" style="margin:24px 0;height:230px;width:230px;position:relative">
       <a :href="staff.url" target="_blank">
-        <img :src="staff.image" alt="staff image" width="100%" height="100%" style="object-fit: cover; " />
+        <img :src="staff.image" alt="staff image" width="100%" height="100%" style="object-fit: fill; object-position: center center;" />
       </a>
       <div class="primary py-1 text-center white--text font-weight-black" style="position:absolute;width:40%;left:0;bottom:20px">
         {{ staff.group_title }}

diff --git a/components/landing/video.vue b/components/landing/video.vue
@@ -91,7 +91,7 @@ export default {
   align-items: center;
   position: relative;
   padding: 28vmin 0;
-  margin: 30px 0 30px;
+  margin: 120px 0 30px;
   @include not-md {
     padding: 13vmin 0;
   }