Merge pull request #15 from AndronixApp/dev

proofread and added redirection for older links

components/base/ctaCard.vue

@@ -13,9 +13,13 @@
             {{ desc }} </p>
         </div>
         <div class="mt-5 flex items-center justify-center">
-          <primary-text-button @click="openLink(buttonLink)"
+          <primary-text-button v-if="!buttonInternalLink" :link="buttonLink"
                                :backgroundColor="buttonColor"
-                               label="Join now!" :textHoverColor="buttonColor"
+                               :label="buttonText ? buttonText: `Join now!`" :textHoverColor="buttonColor"
+          />
+          <primary-text-button v-else @click="$router.push(buttonInternalLink)"
+                               :backgroundColor="buttonColor"
+                               :label="buttonText ? buttonText: `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"
@@ -55,8 +59,12 @@ export default {
     },
     buttonLink: {
       type: String,
-      required: true
     },
+    buttonInternalLink: {
+      type: String,
+    }, buttonText: {
+      type: String,
+    }
   },
   name: 'CtaCard'
 }

components/global/footer.vue

@@ -142,17 +142,22 @@
       <!--  Copyright and stuff    -->
       <div class="text-white text-center lg:justify-self-end lg:mt-8"
       >
-        <h3 class="font-extrabold text-3xl pb-8">andronix<strong class="text-primary-400">.app</strong></h3>
+        <!--        <h3 class="font-extrabold text-3xl pb-8">andronix<strong class="text-primary-400">.app</strong></h3>-->
+        <img
+          class="mx-auto w-48 lg:w-56 -m-3"
+          src="~assets/images/logo_new_semi_fhd_dark.png"
+          alt=""
+        />
+        <a href="https://devriz.com"
+           class="text-gray-400  text-sm">A
+          product of
+          <strong class="underline cursor-pointer text-gray-200">Devriz Technologies
+            LLP</strong></a>
         <p class="text-gray-400 text-sm">©{{ getCurrentYear() }} All rights reserved.</p>
-        <p class="text-gray-400 text-sm">A product of <strong class="underline cursor-pointer">Devriz Technologies
-          LLP</strong></p>
         <p class="mt-3 text-xs text-gray-400 w-10/12 text-center mx-auto">
-          Made with <a href="https://tailwindcss.com" class="underline font-bold text-gray-200"
-        >Tailwind</a>, <a href="https://nuxtjs.org" class="underline font-bold text-gray-200"
-        >NuxtJS</a> by <a
-          href="https://github.com/imprakharshukla"
-          class="underline font-bold text-gray-100"
-        >imprakharshukla</a> in 🇮🇳
+          Made with <a href="https://tailwindcss.com" class="underline font-bold text-gray-400"
+        >Tailwind</a>, <a href="https://nuxtjs.org" class="underline font-bold text-gray-400"
+        >NuxtJS</a>.
         </p>
       </div>
 

components/landing/deLogoGrid.vue

@@ -6,8 +6,7 @@
           <div class="flex-col text-white font-sans">
             <h2 class="font-extrabold text-primary">ANDRONIX</h2>
             <h2 class="font-bold text-4xl">Desktop Environments</h2>
-            <p class="text-sm mt-3">Do you like to have a customizable UI? We have most reknowned Desktop Environments to choose from so that
-              you always have an option to customize your desktop according to your needs. </p>
+            <p class="text-sm mt-3">Do you like to have a customizable UI? Then, we have the most prominent Window Managers to select from so that you can flex your Linux rice on Android. </p>
           </div>
         </div>
       </div>

components/landing/distroLogoGrid.vue

@@ -6,9 +6,8 @@
           <div class="flex-col text-white font-sans">
             <h2 class="font-extrabold text-primary">ANDRONIX</h2>
             <h2 class="font-bold text-4xl">Distributions</h2>
-            <p class="text-sm mt-3">Ever thought of trying out new distros? We provide a large variety of distros to
-              choose from.
-              Just choose any of your favourite distro and you are ready to roll.
+            <p class="text-sm mt-3">Ever thought of trying out new distributions? We provide a large variety of
+              distribution to choose from. Just select any of your favorite distributions, and you are ready to roll.
             </p>
           </div>
         </div>

components/landing/wmLogoGrid.vue

@@ -6,8 +6,8 @@
           <div class="flex-col text-white font-sans">
             <h2 class="font-extrabold text-primary">ANDRONIX</h2>
             <h2 class="font-bold text-4xl">Window Managers</h2>
-            <p class="text-sm mt-3">Do you like to rice your setups and want to have a minimalistic and lightweight workspace? 
-              We have most prominent Window Managers to select from so that you can flex your Linux rice on Android. </p>
+            <p class="text-sm mt-3">Do you like to rice your setups and want to have a minimalistic and lightweight workspace?
+              Then, we have the most renowned Desktop Environments to choose from so that you always have an option to customize your desktop according to your needs. </p>
           </div>
         </div>
       </div>

middleware/redirect.js

@@ -0,0 +1,30 @@
+export default function ({route, redirect}) {
+
+  let path = route.fullPath
+  /*removing any extra "/"*/
+  if (path.endsWith("/"))
+    path = path.slice(0, path.length - 1)
+
+  console.log("Redirecting the older link to the new version ✅")
+
+  switch (path) {
+    case "/commands":
+      return redirect('/products/commands')
+    case "/premium":
+      return redirect('/products/premium')
+    case "/premium-support":
+      return redirect('/products/premium')
+    case "/modded-os":
+      return redirect('/products/modded-os')
+    case "/refund-policy":
+      return redirect('/legal/refund-policy')
+    case "/privacy-policy":
+      return redirect('/legal/privacy-policy')
+    case "/terms-conditions":
+      return redirect('/legal/terms-conditions')
+    case "/restore-purchases/":
+      return redirect('/')
+    case "/modded-os-gallery":
+      return redirect('/products/modded-os')
+  }
+}

nuxt.config.js

@@ -1,4 +1,7 @@
 export default {
+  router: {
+    middleware: 'redirect'
+  },
   generate: {
     fallback: true
   },
@@ -17,7 +20,7 @@ export default {
     ],
     title: 'Andronix App',
     meta: [
-      { charset: 'utf-8' },
+      {charset: 'utf-8'},
       {
         name: 'viewport',
         content: 'width=device-width, initial-scale=1'

pages/about.vue

@@ -6,11 +6,9 @@
       >
         <Heading
           class="px-10"
-          heading="Who we are?"
+          heading="Who are we?"
           deco_heading="ANDRONIX"
-          sub_heading="We are developers from India who like to share our knowledge and try to deliver a platform to
-          mobile users to make them aware of the Linux kernel and distros, providing them a way to use desktop softwares on their Android devices.
-          We are really thankful to all our users and our additional team members for supporting us and bringing us to where we are today."
+          sub_heading="We are developers from India who like to share our knowledge and try to deliver a platform to mobile users to make them aware of the Linux kernel and distributions, providing them a way to use desktop software on their Android devices. We are really thankful to all our users and our additional team members for supporting us and bringing us to where we are today."
         />
 
         <primary-text-button label="TALK TO US" link="https://chat.andronix.app"/>
@@ -53,7 +51,7 @@
         <Heading
           heading="Our Team"
           deco_heading="MEET US"
-          sub_heading="Here's us. We have a specturm of poeple down here, from developers to community moderators to people who support us and much more."
+          sub_heading="Here we are. We have a spectrum of people down here, from developers to community moderators to people who support us and much more."
         />
 
         <div
@@ -98,33 +96,33 @@
           />
         </div>
 
-<!--        &lt;!&ndash; Special mentions &ndash;&gt;
-        <XyzTransition :appear-visible="true" duration="auto">
-          <div class="px-5 py-5 mt-16 pb-16">
-            <div
-              class="flex-col space-y-4"
-              xyz="fade flip-down duration-10 delay-2 stagger ease-out-back"
-            >
-              <h2 class="heading-2 xyz-nested">Special Mentions</h2>
-            </div>
-          </div>
-        </XyzTransition>
-        <div
-          class="grid-cols-1 md:grid-cols-2 grid gap-y-8 gap-x-4 justify-center items-center"
-        >
-          <TeamCard
-            class="justify-self-center"
-            :class="
-              index === 0 ? 'md:justify-self-end' : 'md:justify-self-start'
-            "
-            v-for="(member, index) in teams.specials"
-            :name="member.name"
-            :key="member.name"
-            :position="member.position"
-            :quote="member.quote"
-            :photo_url="member.photo_url"
-          />
-        </div>-->
+        <!--        &lt;!&ndash; Special mentions &ndash;&gt;
+                <XyzTransition :appear-visible="true" duration="auto">
+                  <div class="px-5 py-5 mt-16 pb-16">
+                    <div
+                      class="flex-col space-y-4"
+                      xyz="fade flip-down duration-10 delay-2 stagger ease-out-back"
+                    >
+                      <h2 class="heading-2 xyz-nested">Special Mentions</h2>
+                    </div>
+                  </div>
+                </XyzTransition>
+                <div
+                  class="grid-cols-1 md:grid-cols-2 grid gap-y-8 gap-x-4 justify-center items-center"
+                >
+                  <TeamCard
+                    class="justify-self-center"
+                    :class="
+                      index === 0 ? 'md:justify-self-end' : 'md:justify-self-start'
+                    "
+                    v-for="(member, index) in teams.specials"
+                    :name="member.name"
+                    :key="member.name"
+                    :position="member.position"
+                    :quote="member.quote"
+                    :photo_url="member.photo_url"
+                  />
+                </div>-->
       </div>
     </div>
   </XyzTransition>
@@ -139,7 +137,7 @@ import TeamCard from "~/components/teamCard";
 
 export default {
   components: {TeamCard, PrimaryTextButton, Heading},
-  head () {
+  head() {
     return {
       title: meta.about.title,
       meta: [{

pages/help.vue

@@ -10,7 +10,7 @@
       />
 
       <div
-        class="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-3 lg:max-w-screen-md mx-auto"
+        class="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-3 lg:max-w-screen-xl mx-auto"
       >
         <cta-card
           title="Discord"

pages/index.vue

@@ -37,8 +37,8 @@
     <div class="flex-col bg-no-repeat mx-10 md:mx-20">
       <!-- Features   -->
       <div class="top-section">
-        <Heading heading="What can you do with this?"
-                 sub_heading="Guinean question but this cannot be answered without writing a book. There are infinite uses for Andronix. To keep it in understandable terms, you can almost do 70% of the things that you can do on an actual Linux machine."
+        <Heading heading="What can I do with Andronix?"
+                 sub_heading="Genuine question, but this cannot be answered without writing a book. There are infinite uses for Andronix. To keep it in understandable terms, you can almost do 70% of what you can do on an actual Linux machine."
                  deco_heading="ANDRONIX"
         />
         <div>

pages/policies.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <!-- Testimonials   -->
+    <div class="mt-24 px-12 md:px-24 pb-28 bg-no-repeat">
+      <heading
+        class="px-10"
+        heading="Policies & Terms"
+        sub_heading="Explore our policies about Andronix."
+        deco_heading="ANDRONIX"
+      />
+
+      <div
+
+        class="grid grid-cols-1 md:max-w-md lg:grid-cols-3 gap-x-8 gap-y-3 lg:max-w-screen-xl mx-auto"
+      >
+
+
+        <cta-card
+          title="Privacy Policy"
+          buttonColor="bg-green-400"
+          button-internal-link="/legal/privacy-policy"
+          desc="Know how we handle your data here at Andronix."
+          color="bg-green-400"
+          button-text="Explore"
+        >
+          <svg
+            class="w-10 text-green-400 stroke-current"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                  d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"/>
+          </svg>
+        </cta-card>
+
+        <cta-card
+          title="Terms"
+          buttonColor="bg-blue-400"
+          button-internal-link="/legal/terms-conditions"
+          desc="Know the terms you accept when you sign up."
+          color="bg-blue-400"
+          button-text="Explore"
+        >
+          <svg
+            class="w-10 text-blue-400 stroke-current"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                  d="M12 11c0 3.517-1.009 6.799-2.753 9.571m-3.44-2.04l.054-.09A13.916 13.916 0 008 11a4 4 0 118 0c0 1.017-.07 2.019-.203 3m-2.118 6.844A21.88 21.88 0 0015.171 17m3.839 1.132c.645-2.266.99-4.659.99-7.132A8 8 0 008 4.07M3 15.364c.64-1.319 1-2.8 1-4.364 0-1.457.39-2.823 1.07-4"/>
+          </svg>
+        </cta-card>
+
+        <cta-card
+          title="Refund"
+          buttonColor="bg-primary-400"
+          button-internal-link="/legal/refund-policy"
+          desc="Know when you're eligible for a refund."
+          color="bg-primary-400"
+          button-text="Explore"
+        >
+          <svg
+            class="w-10 text-primary-400 stroke-current"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                  d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
+
+          </svg>
+        </cta-card>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CtaCard from "~/components/base/ctaCard";
+
+export default {
+  name: "policies",
+  components: {CtaCard}
+}
+</script>
+
+<style scoped>
+
+</style>

pages/pricing.vue

@@ -41,6 +41,10 @@
             :slashedPrice="product.slashedPrice"
             :features="product.features"
           />
+
+          <p class="text-gray-400 text-xs mt-6 text-center">
+            ** In-App pricing of the products might be different depending on the region you are using Andronix due to the variation in taxes.
+          </p>
         </div>
       </XyzTransition>
 
@@ -152,7 +156,7 @@ export default {
           this.$router.push('auth/login')
         }
       } else {
-        this.$toast.info('Billing is not yet activated. We\'re working on it!')
+        this.$toast.info('Billing is not yet activated. We\'re working on it! Please buy the product from the Andronix App until then.')
       }
     },
   },