Merge pull request #7 from imprakharshukla/dev

Dev

Author: imprakharshukla

.github/workflows/chrome-e2e.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn-lock.json') }}
+          key: ${{ runner.os }}-node-v2-${{ hashFiles('**/yarn-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
@@ -46,10 +46,9 @@ jobs:
           start: yarn run dev
           parallel: true
           browser: chrome
-          wait-on-timeout: 120
+          wait-on-timeout: 180
           wait-on: 'http://localhost:3000'
 
-
       - name: Uploading Screenshots ☁
         uses: actions/upload-artifact@v1
         if: failure()

components/Base/CounterComponent.vue renamed to components/base/counterComponent.vue

@@ -6,15 +6,14 @@
         <div :class="color">
           <slot></slot>
         </div>
-
       </div>
+
       <div>
         <h3 class="font-extrabold text-white font-extrabold text-3xl mt-4">{{ value }}</h3>
       </div>
     </div>
   </div>
 </template>
-
 <script>
 
 export default {

components/Base/CtaCard.vue renamed to components/base/ctaCard.vue

@@ -13,9 +13,9 @@
             {{ desc }} </p>
         </div>
         <div class="mt-5 flex items-center justify-center">
-          <PrimaryTextButton @click="openLink(buttonLink)"
-                             :backgroundColor="buttonColor"
-                             label="Join now!" :textHoverColor="buttonColor"
+          <primary-text-button @click="openLink(buttonLink)"
+                               :backgroundColor="buttonColor"
+                               label="Join now!" :textHoverColor="buttonColor"
           />
           <!--          <button
                       class="w-1/2 px-3 py-2 rounded mt-6 text-white font-extrabold text-center transition ease-in-out duration-300 shadow-2xl transform hover:scale-105"
@@ -33,7 +33,10 @@
 </template>
 
 <script>
+import PrimaryTextButton from "~/components/base/primaryTextButton";
+
 export default {
+  components: {PrimaryTextButton},
   props: {
     title: {
       type: String,

components/Base/PrimaryIconButton.vue renamed to components/base/primaryIconButton.vue

@@ -1,5 +1,5 @@
 <template>
-    <div @click="$emit('clicked')">
+    <div @click="$emit('click')">
       <div
         :class="`cursor-pointer px-4 py-3 flex items-center space-x-5 justify-center rounded ${backgroundColor} hover:${backgroundHoverColor} hover:translate-y-1.5 transition transform duration-300`"
       >

components/Base/PrimaryTextButton.vue renamed to components/base/primaryTextButton.vue

@@ -1,6 +1,14 @@
 <template>
-  <div @click="$emit('clicked')">
-    <div class="cursor-pointer rounded px-4 py-3 hover:-translate-y-1.5 transition transform duration-300"
+  <div @click="$emit('click')">
+    <a :href="link" v-if="!!link">
+      <div class="cursor-pointer rounded px-4 py-3 hover:-translate-y-1.5 transition transform duration-300"
+           :class="`${backgroundColor?backgroundColor:'bg-primary-600'} hover:${backgroundHoverColor?backgroundHoverColor:'bg-white'}
+         ${textColor?textColor:'text-white'} hover:${textHoverColor?textHoverColor:'text-primary-600'}`"
+      >
+        <p class="text-center text-current font-bold">{{ label }}</p>
+      </div>
+    </a>
+    <div v-else class="cursor-pointer rounded px-4 py-3 hover:-translate-y-1.5 transition transform duration-300"
          :class="`${backgroundColor?backgroundColor:'bg-primary-600'} hover:${backgroundHoverColor?backgroundHoverColor:'bg-white'}
          ${textColor?textColor:'text-white'} hover:${textHoverColor?textHoverColor:'text-primary-600'}`"
     >
@@ -27,6 +35,9 @@ export default {
     label: {
       type: String,
       require: true,
+    },
+    link: {
+      type: String
     }
   },
   name: 'PrimaryTextButton'

components/Global/Footer.vue renamed to components/global/footer.vue

@@ -3,7 +3,7 @@
        :class="!view.atTopOfPage?'bg-gray-800 bg-opacity-80':''"
   >
     <div class="flex pt-4 lg:pt-6 lg:pb-6 px-8 pb-4 items-center justify-end">
-      <div class="xxs:hidden sm:flex justify-self-start mr-auto cursor-pointer" @click="$router.push('/')">
+      <div class="xxs:hidden flex justify-self-start mr-auto cursor-pointer" @click="$router.push('/')">
         <h3 class="text-white font-sans font-bold text-lg">andronix</h3>
         <span class="text-primary-500 font-bold text-lg">.app</span>
       </div>

components/Global/Heading.vue renamed to components/global/heading.vue

@@ -8,7 +8,7 @@
       leave-active-class="ease-out transition-medium"
       leave-to-class="opacity-0"
     >
-      <Overlay v-show="$store.state.drawer.isDrawerOpen"/>
+      <overlay v-show="$store.state.drawer.isDrawerOpen"/>
     </transition>
     <div id="drawer_main"
          class="bg-gray-800 p-8 rounded-r-lg transform top-0 left-0 w-72 fixed h-full overflow-auto ease-in-out transition-all duration-300 z-30"
@@ -108,9 +108,11 @@
 </template>
 
 <script>
-import drawerMenu from '~/static/Data/menu/main-drawer-menu.json'
+import drawerMenu from '~/static/data/menu/main-drawer-menu.json'
+import Overlay from "~/components/global/overlay";
 
 export default {
+  components: {Overlay},
   computed: {
     isLoggedIn: function () {
       return this.$store.getters['auth/isUserLoggedIn']