Skip to content

Commit d40b98a

Browse files
imprakharshuklaimprakharshukla
authored
Merge pull request #1 from imprakharshukla/dev
pre-release stage 1
2 parents eddbba6 + 72defd9 commit d40b98a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4154
-496
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
},
77
extends: [
88
'@nuxtjs/eslint-config-typescript',
9-
'plugin:nuxt/recommended'
9+
'plugins:nuxt/recommended'
1010
],
1111
plugins: [
1212
],

‎.github/workflows/chrome-e2e.yaml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Chrome E2E CI
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
10+
jobs:
11+
test:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
containers: [ 1, 2, 3 ]
17+
name: E2E on Chrome
18+
steps:
19+
- name: Checking out code ⚡
20+
uses: actions/checkout@v2
21+
22+
- name: Setting up NodeJS 📐
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: '14.x'
26+
27+
- name: Caching Dependencies 💾
28+
uses: actions/cache@v1
29+
with:
30+
path: ~/.npm
31+
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn-lock.json') }}
32+
restore-keys: |
33+
${{ runner.os }}-node-
34+
35+
- name: Building 🏗
36+
run: |
37+
npm install -g yarn
38+
yarn install --frozen-lockfile
39+
yarn install
40+
41+
42+
- name: E2E Testing 🤖
43+
uses: cypress-io/github-action@v2
44+
env:
45+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
with:
48+
record: true
49+
start: yarn run dev
50+
parallel: true
51+
browser: chrome
52+
wait-on-timeout: 120
53+
wait-on: 'http://localhost:3000'
54+
55+
56+
- name: Uploading Screenshots ☁
57+
uses: actions/upload-artifact@v1
58+
if: failure()
59+
with:
60+
name: cypress-screenshots
61+
path: cypress/screenshots
62+
63+
- name: Uploading Videos ☁
64+
uses: actions/upload-artifact@v1
65+
if: always()
66+
with:
67+
name: cypress-videos
68+
path: cypress/videos

‎.github/workflows/netlify-deploy.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Deploy
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
test:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
containers: [ 1, 2, 3 ]
13+
name: Deploy
14+
steps:
15+
- name: Deploy to Netlify ✅
16+
uses: nwtgck/[email protected]
17+
with:
18+
publish-dir: './dist'
19+
production-branch: master
20+
github-token: ${{ secrets.GITHUB_TOKEN }}
21+
deploy-message: "Deploy from GitHub Actions"
22+
enable-pull-request-comment: false
23+
enable-commit-comment: true
24+
overwrites-pull-request-comment: true
25+
env:
26+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
27+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created by .ignore support plugin (hsz.mobi)
1+
# Created by .ignore support plugins (hsz.mobi)
22
### Node template
33
# Logs
44
/logs
@@ -88,3 +88,5 @@ sw.*
8888

8989
# Vim swap files
9090
*.swp
91+
92+
cypress/

‎assets/css/tailwind.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222

2323
.sub-heading {
24-
@apply font-medium text-center text-base md:text-xl text-center text-gray-300
24+
@apply font-medium text-center text-base md:text-lg text-center text-gray-400
2525
}
2626

2727
.input {

‎assets/images/background/final_edited.svg

Lines changed: 1356 additions & 0 deletions
Loading

‎components/Global/Footer.vue

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
<div class="text-gray-400 text-sm text-center">
7979
<h3 class="font-bold text-lg text-gray-300">Policies</h3>
8080
<ul class="flex-col space-y-2 pt-3 ">
81-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Refund Policy
81+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/legal/refund-policy">Refund Policy
8282
</NuxtLink>
83-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">T&C
83+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/legal/terms-condition">T&C
8484
</NuxtLink>
85-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Privacy policy
85+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/legal/privacy-policy">Privacy policy
8686
</NuxtLink>
8787
</ul>
8888
</div>
@@ -95,28 +95,40 @@
9595
>
9696
Products</h3>
9797
<ul class="flex-col space-y-2 pt-3 ">
98-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Modded OS
98+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/products/modded-os">
99+
Modded OS
99100
</NuxtLink>
100-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Premium
101+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/products/premium">
102+
Premium
101103
</NuxtLink>
102-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Commands
104+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/products/commands">
105+
Commands
103106
</NuxtLink>
104-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Pricing
105-
</NuxtLink>
106-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Documentation
107+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/pricing">Pricing
107108
</NuxtLink>
109+
<li>
110+
<a class="block hover:text-white duration-200 transition hover:underline"
111+
href="https://docs.andronix.app"
112+
>Documentation
113+
</a>
114+
</li>
108115
</ul>
109116
</div>
110117
<!-- Policies -->
111118
<div class="text-gray-400 text-sm text-center md:order-2 order-1">
112119
<h3 class="font-bold text-lg text-gray-300">Know us</h3>
113120
<ul class="flex-col space-y-2 pt-3 ">
114-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Help
115-
</NuxtLink>
116-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">About us
121+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/help">Help
117122
</NuxtLink>
118-
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/">Translate
123+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/about">About us
119124
</NuxtLink>
125+
<li>
126+
<a
127+
class="block hover:text-white duration-200 transition hover:underline"
128+
href="https://translate.andronix.app"
129+
>Translate
130+
</a>
131+
</li>
120132
</ul>
121133
</div>
122134
</div>
@@ -130,9 +142,11 @@
130142
<h3 class="font-extrabold text-lg">Andronix App</h3>
131143
<p class="text-gray-400 text-sm">©2021 Andronix | Techriz. All Rights Reserved.</p>
132144
<p class="mt-3 text-xs text-gray-400 w-10/12 text-center mx-auto">
133-
Made with <strong class="font-bold text-gray-300">Tailwind, NuxtJS and NodeJS</strong> by <a
145+
Made with <a href="https://tailwindcss.com" class="underline font-bold text-gray-200"
146+
>Tailwind</a>, <a href="https://nuxtjs.org" class="underline font-bold text-gray-200"
147+
>NuxtJS</a> by <a
134148
href="https://github.com/imprakharshukla"
135-
class="font-bold text-gray-200"
149+
class="underline font-bold text-gray-100"
136150
>imprakharshukla</a> in 🇮🇳
137151
</p>
138152
</div>

‎components/Global/Heading.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<XyzTransition :appear-visible="true" duration="auto">
3-
<div class="px-10 py-5 pb-16 md:pb-24"
3+
<div class="px-10 py-5 pb-16 md:pb-24 lg:max-w-screen-md mx-auto"
44
>
55
<div class="flex-col space-y-4" xyz="fade flip-down duration-10 delay-2 stagger ease-out-back">
66
<h2 class="deco-heading xyz-nested">{{ deco_heading }}</h2>

‎components/Global/NavBar.vue

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<template>
2-
<div>
3-
<div class="flex pt-6 md:pt-6 lg:pt-8 px-8 items-center justify-end">
2+
<nav class="z-10 fixed w-full transition transform duration-100 ease-in-out"
3+
:class="!view.atTopOfPage?'bg-gray-800 bg-opacity-80':''"
4+
>
5+
<div class="flex pt-4 lg:pt-6 lg:pb-6 px-8 pb-4 items-center justify-end">
46
<XyzTransition appear-visible xyz="fade left-100% small">
57
<div class="flex justify-self-start mr-auto cursor-pointer" @click="$router.push('/')">
68
<h3 class="text-white font-sans font-bold text-lg">andronix</h3>
@@ -10,41 +12,65 @@
1012

1113
<!-- Download Button -->
1214
<div
13-
class="invisible md:invisible lg:visible cursor-pointer px-3 py-1 bg-primary-500 flex items-center space-x-5 justify-center rounded hover:bg-primary-600 hover:scale-105 transition transform duration-300"
15+
class="text-white invisible md:invisible lg:visible cursor-pointer px-3 py-2 bg-primary-600 flex items-center space-x-5 justify-center rounded hover:bg-white hover:text-primary-600 hover:-translate-y-1.5 transition transform duration-300"
1416
>
15-
<svg class="text-white fill-current w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
17+
<svg class="text-current fill-current w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
1618
fill="currentColor"
1719
>
1820
<path fill-rule="evenodd"
1921
d="M6 2a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V7.414A2 2 0 0015.414 6L12 2.586A2 2 0 0010.586 2H6zm5 6a1 1 0 10-2 0v3.586l-1.293-1.293a1 1 0 10-1.414 1.414l3 3a1 1 0 001.414 0l3-3a1 1 0 00-1.414-1.414L11 11.586V8z"
2022
clip-rule="evenodd"
2123
/>
2224
</svg>
23-
<a href="https://play.andronix.app" class="text-white font-bold">Download</a>
25+
<a href="https://play.andronix.app" class="text-current font-bold">Download</a>
2426
</div>
2527

26-
<div @click="$store.commit('drawer/toggleDrawer')" class="cursor-pointer ml-5">
27-
<svg class="stroke-current text-white w-8" xmlns="http://www.w3.org/2000/svg" width="31" height="21">
28-
<g data-name="Group 393" fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="3">
29-
<path data-name="Line 9" d="M1.5 1.5h28"/>
30-
<path data-name="Line 10" d="M1.5 10.5h17"/>
31-
<path data-name="Line 11" d="M1.5 19.5h22"/>
28+
<!-- Hamburger -->
29+
<div id="nav_hamburger" @click="$store.commit('drawer/toggleDrawer')" class="cursor-pointer ml-5">
30+
<svg class="stroke-current text-white w-8" xmlns="http://www.w3.org/2000/svg" width="31" height="15">
31+
<g fill="none" stroke="#fff" stroke-width="3">
32+
<path d="M0 1.5h31M0 13.5h31"/>
3233
</g>
3334
</svg>
3435
</div>
3536

3637
</div>
37-
</div>
38+
</nav>
3839
</template>
3940

4041

4142
<script>
4243
4344
export default {
4445
name: 'NavBar',
46+
// a beforeMount call to add a listener to the window
47+
beforeMount () {
48+
window.addEventListener('scroll', this.handleScroll)
49+
},
50+
51+
methods: {
52+
// the function to call when the user scrolls, added as a method
53+
handleScroll () {
54+
// when the user scrolls, check the pageYOffset
55+
if (window.pageYOffset > 0) {
56+
// user is scrolled
57+
if (this.view.atTopOfPage) {
58+
this.view.atTopOfPage = false
59+
}
60+
} else {
61+
// user is at top of page
62+
if (!this.view.atTopOfPage) {
63+
this.view.atTopOfPage = true
64+
}
65+
}
66+
}
67+
},
4568
data: function () {
4669
return {
47-
userData: this.$store.getters['auth/getUserData']
70+
userData: this.$store.getters['auth/getUserData'],
71+
view: {
72+
atTopOfPage: true
73+
}
4874
}
4975
}
5076
}

‎components/Overlay.vue renamed to ‎components/Global/Overlay.vue

File renamed without changes.

‎components/Global/SideBar.vue

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
>
1111
<Overlay v-show="$store.state.drawer.isDrawerOpen"/>
1212
</transition>
13-
<div
14-
class="bg-background2 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"
15-
:class="this.$store.state.drawer.isDrawerOpen ? 'translate-x-0' : '-translate-x-full'"
13+
<div id="drawer_main"
14+
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"
15+
:class="this.$store.state.drawer.isDrawerOpen ? 'translate-x-0' : '-translate-x-full'"
1616
>
17-
<div class="flex justify-between mb-10">
18-
<h2 class="font-extrabold text-primary-500">ANDRONIX</h2>
19-
<svg @click="$store.commit('drawer/toggleDrawer')" class="stroke-current text-white w-5"
17+
<div
18+
class="flex cursor-pointer hover:-translate-y-0.5 hover:text-primary-400 transition text-white transform duration-100 justify-end mb-10"
19+
>
20+
<svg @click="$store.commit('drawer/toggleDrawer')" class="stroke-current text-current w-5"
2021
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
2122
stroke="currentColor"
2223
>
@@ -25,11 +26,11 @@
2526
</div>
2627

2728
<!-- Account Details -->
28-
<div v-if="isLoggedIn"
29+
<div id="drawer_account" v-if="isLoggedIn"
2930
class="my-10 text-white"
3031
>
3132
<div @click="$store.commit('drawer/toggleDrawer');$router.push('/user/profile')"
32-
class="flex-col bg-background bg-opacity-40 px-4 py-4 rounded-lg justify-center items-center cursor-pointer hover:scale-105 duration-200 transform transition"
33+
class="flex-col bg-gray-700 bg-opacity-40 px-4 py-4 rounded-lg justify-center items-center cursor-pointer hover:scale-105 duration-200 transform transition"
3334
>
3435
<div class="rounded-full mx-auto overflow-hidden w-8 h-8">
3536
<img class="object-cover"
@@ -38,7 +39,7 @@
3839
>
3940
</div>
4041
<p class="font-medium mt-2 text-sm text-center overflow-ellipsis line-clamp-1">
41-
{{ userData.name ? userData.name : 'Anonymous' }}</p>
42+
{{ userData.name ? userData.name : 'Email Sign-in' }}</p>
4243
<p class="mt-1 text-xs text-center overflow-ellipsis line-clamp-1">{{
4344
userData.email ? userData.email : 'Not Logged In'
4445
}}</p>
@@ -47,16 +48,23 @@
4748

4849

4950
<!-- Menu -->
50-
<div
51-
class="text-white font-medium flex-col space-y-5 mt-6"
51+
<div id="drawer_menu"
52+
class="text-white font-medium flex-col space-y-5 mt-6"
5253
>
5354
<div v-for="(items, index) in menu" :key="items.color">
5455
<hr v-if="index !== 0" class="border-dashed border-t-1 mr-3 my-4 border-opacity-50 border-gray-700">
55-
<div class="flex space-x-6 items-center" @click="$store.commit('drawer/toggleDrawer')">
56+
<div
57+
class="cursor-pointer text-white flex space-x-6 items-center px-2"
58+
@click="$store.commit('drawer/toggleDrawer')"
59+
>
5660
<div>
5761
<div v-html="items.icon"></div>
5862
</div>
59-
<NuxtLink :class="`hover:${items.color}`" :to="items.to">{{ items.title }}</NuxtLink>
63+
<NuxtLink :class="`hover:${items.color}`" :id="items.id" v-if="!items.to.includes('https://')"
64+
:to="items.to"
65+
>{{ items.title }}
66+
</NuxtLink>
67+
<a :class="`hover:${items.color}`" :id="items.id" v-else :href="items.to">{{ items.title }}</a>
6068
</div>
6169
</div>
6270
</div>
@@ -67,7 +75,7 @@
6775
<!-- Logout Button -->
6876

6977
<div v-if="isLoggedIn" class="mt-10">
70-
<div @click="logout"
78+
<div id="drawer_logout_button" @click="logout"
7179
class="cursor-pointer px-3 -mt-4 py-2 bg-card_background flex items-center space-x-5 justify-center rounded hover:bg-background hover:scale-105 transition transform duration-300"
7280
>
7381
<svg class="text-white stroke-current w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
@@ -83,7 +91,9 @@
8391

8492

8593
<!-- Account Action -->
86-
<div v-if="!isLoggedIn" class="flex flex-wrap space-x-3 mt-8 justify-center items-center text-white">
94+
<div id="drawer_account_action" v-if="!isLoggedIn"
95+
class="flex flex-wrap space-x-3 mt-8 justify-center items-center text-white"
96+
>
8797
<div @click="$store.commit('drawer/toggleDrawer');$router.push('/auth/register')"
8898
class="rounded bg-primary-600 text-center px-4 py-2 hover:scale-105 transition transform duration-300 cursor-pointer"
8999
>Register

0 commit comments

Comments
 (0)