Skip to content

Commit 2d1bce4

Browse files
Merge pull request #21 from AndronixApp/dev
added contact us page
2 parents 6b6c52e + d24fcc0 commit 2d1bce4

File tree

12 files changed

+136
-33
lines changed

12 files changed

+136
-33
lines changed

components/base/ctaCard.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</button>-->
3131
</div>
3232
</div>
33-
<div class="h-1.5 rounded-b-lg" :class="color ? color : 'bg-primary'">
33+
<div class="h-1.5 rounded-b-lg" :class="color ? color : 'bg-primary-400'">
3434
</div>
3535
</div>
3636
</div>
@@ -62,7 +62,8 @@ export default {
6262
},
6363
buttonInternalLink: {
6464
type: String,
65-
}, buttonText: {
65+
},
66+
buttonText: {
6667
type: String,
6768
}
6869
},

components/global/footer.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@
132132
<ul class="flex-col space-y-2 pt-3 ">
133133
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/help">Help
134134
</NuxtLink>
135+
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/contact">Contact us
136+
</NuxtLink>
135137
<NuxtLink class="block hover:text-white duration-200 transition hover:underline" to="/about">About us
136138
</NuxtLink>
137139
<li>

nuxt.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export default {
113113
// Axios module configuration (https://go.nuxtjs.dev/config-axios)
114114
axios: {
115115
baseURL: 'https://commerce.andronix.xyz/v1'
116+
// baseURL: 'http://localhost:3030/v1'
116117
},
117118

118119
// Build Configuration (https://go.nuxtjs.dev/config-build)

pages/checkout/buy/_product_id.vue

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<div class="rounded-t-lg md:rounded-t-lg bg-card_background text-white py-3 px-5">
5757
<h1 class="font-extrabold text-4xl py-3" :class="os.color_text">{{ os.logo_text }}</h1>
5858
<h2 class="text-lg font-bold pb-2">{{ os.name }}</h2>
59-
<p class="pb-2">{{ os.description }}</p>
59+
<p class="mb-2 line-clamp-4">{{ os.description }}</p>
6060
</div>
6161
<div class="h-1.5 rounded-b-lg" :class="os.color_bg">
6262
</div>
@@ -307,14 +307,14 @@ import axios from 'axios'
307307
import Loading from 'vue-loading-overlay'
308308
import 'vue-loading-overlay/dist/vue-loading.css'
309309
import moddedOs from '~/static/data/pricing/modded-os-products.json'
310-
import { getProductNameWithId } from '~/lib/checkout/productHelper'
310+
import {getProductNameWithId} from '~/lib/checkout/productHelper'
311311
import {
312312
generateOrderId,
313313
getCountryName, getPrices,
314314
ProductIdArray,
315315
verifyPurchase
316316
} from '~/lib/checkout/checkoutHelper'
317-
import { database } from '~/plugins/firebase'
317+
import {database} from '~/plugins/firebase'
318318
import Heading from "~/components/global/heading";
319319
320320
const PRODUCT_SELECTION = 'product_selection'
@@ -324,11 +324,11 @@ const SUCCESS = 'success'
324324
const FAILED = 'failed'
325325
326326
export default {
327-
async asyncData ({ params }) {
327+
async asyncData({params}) {
328328
const product_id = params.product_id
329-
return { product_id }
329+
return {product_id}
330330
},
331-
created () {
331+
created() {
332332
this.observeBillingStatus()
333333
if (this.is_billing_active) {
334334
if (this.product_id && ProductIdArray.includes(this.product_id)) {
@@ -343,7 +343,7 @@ export default {
343343
this.$router.push('/pricing')
344344
}
345345
},
346-
head () {
346+
head() {
347347
return {
348348
script: [
349349
{
@@ -354,8 +354,8 @@ export default {
354354
}
355355
},
356356
name: 'buy',
357-
components: {Heading, Loading },
358-
data () {
357+
components: {Heading, Loading},
358+
data() {
359359
return {
360360
currentStep: PRODUCT_SELECTION,
361361
@@ -372,10 +372,10 @@ export default {
372372
}
373373
},
374374
computed: {
375-
is_billing_active () {
375+
is_billing_active() {
376376
return this.$store.getters['checkout/getBillingState']
377377
},
378-
get_payment_status () {
378+
get_payment_status() {
379379
return this.paymentStatus
380380
},
381381
country_list: function () {
@@ -386,7 +386,7 @@ export default {
386386
}
387387
},
388388
methods: {
389-
async observeBillingStatus () {
389+
async observeBillingStatus() {
390390
try {
391391
if (window.Cypress) {
392392
console.log('Running in cypress')
@@ -397,16 +397,17 @@ export default {
397397
console.log({ isBillingActive })
398398
await this.$store.dispatch('checkout/setBillingState', isBillingActive)
399399
})
400+
//await this.$store.dispatch('checkout/setBillingState', true)
400401
}
401402
} catch (e) {
402403
console.log(e)
403404
}
404405
},
405-
removeCoupon () {
406+
removeCoupon() {
406407
this.couponApplied = null
407408
this.setSelectedProduct(this.selectedProductId)
408409
},
409-
async validateCoupon () {
410+
async validateCoupon() {
410411
this.isLoading = true
411412
try {
412413
let couponEntered = this.couponCodeEntered.toUpperCase()
@@ -429,11 +430,11 @@ export default {
429430
this.$toast.error('Coupon validation failed.')
430431
}
431432
},
432-
deleteSelectedProduct () {
433+
deleteSelectedProduct() {
433434
this.selectedProductId = ''
434435
this.currentStep = PRODUCT_SELECTION
435436
},
436-
async setSelectedProduct (id) {
437+
async setSelectedProduct(id) {
437438
438439
this.selectedProductId = id
439440
this.currentStep = DETAILS
@@ -446,7 +447,7 @@ export default {
446447
this.scrollToTop()
447448
this.isLoading = false
448449
},
449-
setCouponedPrices (id, couponPriceObj) {
450+
setCouponedPrices(id, couponPriceObj) {
450451
let price = `$ ${(parseInt(couponPriceObj[id]) / 100).toFixed(2)}`
451452
this.$refs.product_price_text.innerHTML = price
452453
this.$refs.product_total_text.innerHTML = price
@@ -455,7 +456,7 @@ export default {
455456
getStateListOfSelectedCountry: function (country_id) {
456457
return stateList[country_id]
457458
},
458-
async submitForm (data) {
459+
async submitForm(data) {
459460
this.isLoading = true
460461
/* ============== CHECKING FOR COUPON ===============*/
461462
if (this.couponApplied) {
@@ -550,7 +551,7 @@ export default {
550551
rzp1.open()
551552
552553
},
553-
resetIfClosed () {
554+
resetIfClosed() {
554555
this.currentStep = PRODUCT_SELECTION
555556
},
556557
verifyPurchase: async function (data) {
@@ -569,12 +570,12 @@ export default {
569570
console.log(e)
570571
}
571572
},
572-
scrollToTop () {
573+
scrollToTop() {
573574
window.scrollTo(0, 0)
574575
}
575576
576577
},
577-
beforeDestroy () {
578+
beforeDestroy() {
578579
this.$recaptcha.destroy()
579580
}
580581
,

pages/contact.vue

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<template>
2+
<XyzTransition :appear-visible="true" duration="auto">
3+
<div>
4+
<div
5+
class="h-screen m-0 bg-background w-full bg-landing-pattern bg-top flex items-center justify-center flex-col"
6+
>
7+
<Heading
8+
class="px-10"
9+
heading="Connect with us!"
10+
deco_heading="ANDRONIX"
11+
sub_heading="Facing any issues? We are here to help you with all your queries and issues."
12+
/>
13+
</div>
14+
<div class="grid px-12 md:px-24 grid-cols-1 md:grid-cols-2 pb-16 md:pb-24 lg:grid-cols-4 justify-center items-center gap-5">
15+
<cta-card
16+
v-for="platform in contact" :key="platform.color"
17+
:title="platform.param"
18+
:buttonColor="platform.color"
19+
:buttonLink="platform.link"
20+
:desc="platform.value"
21+
:color="platform.color"
22+
:button-text="platform.ctaText"
23+
>
24+
<div v-html="platform.icon"></div>
25+
</cta-card>
26+
</div>
27+
</div>
28+
</XyzTransition>
29+
</template>
30+
31+
<script>
32+
import contact from "../static/data/misc/contact.json"
33+
import CtaCard from "~/components/base/ctaCard";
34+
35+
export default {
36+
name: "contact",
37+
components: {CtaCard},
38+
data: function () {
39+
return {
40+
contact: contact.platforms
41+
}
42+
}
43+
}
44+
</script>
45+
46+
<style scoped>
47+
48+
</style>

pages/help.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
title="Discord"
1717
buttonColor="bg-purple-400"
1818
buttonLink="https://chat.andronix.app"
19-
desc="Join a community of over 5500+ Andronix users on Discord."
19+
desc="Join a community of over 8500+ Andronix users on Discord."
2020
color="bg-purple-400"
2121
>
2222
<svg

pages/legal/refund-policy.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
<p class="text-2xl text-white mt-4 mb-3 font-bold">
1919
Andronix Premium
2020
</p>
21-
<p class="text-red-400 prose font-bold md:prose-lg">We don't offer refunds on Andronix Premium</p>
21+
<p class="text-red-400 prose font-bold md:prose-lg">We don't offer refunds on Andronix Premium when bought from our app.</p>
2222
<p class="text-gray-400 prose md:prose-lg">
2323
Please read carefully
2424
what does it
2525
offer and then make a
2626
purchase.</p>
2727
<br>
28+
<p class="text-green-400 prose font-bold md:prose-lg">We do offer refunds on Andronix Premium when bought from our website.</p>
29+
<br>
2830
<br>
2931
<p class="text-2xl text-white mt-4 mb-3 font-bold">
3032
Andronix Modded OS

pages/pricing.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export default {
131131
console.log({ isBillingActive })
132132
await this.$store.dispatch('checkout/setBillingState', isBillingActive)
133133
})
134+
// await this.$store.dispatch('checkout/setBillingState', true)
134135
}
135136
} catch (e) {
136137
console.log(e)

plugins/firebase.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ app = firebase.apps.length
1616
? firebase.app()
1717
: firebase.initializeApp(config)
1818

19-
/* Inint firebase analytics */
19+
/*/!* Inint firebase analytics *!/
20+
firebase.analytics.isSupported().then((isSupported) => {
21+
if (isSupported) {
2022
app.analytics()
23+
*/
2124

2225
export const firestore = app.firestore()
2326
export const database = app.database()

static/data/menu/main-drawer-menu.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,58 @@
33
{
44
"title": "Premium",
55
"id": "drawer_main_premium",
6-
"icon": " <svg class=\"stroke-current text-green-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z\" />\n</svg>",
6+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-green-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path fill-rule=\"evenodd\" d=\"M6.267 3.455a3.066 3.066 0 001.745-.723 3.066 3.066 0 013.976 0 3.066 3.066 0 001.745.723 3.066 3.066 0 012.812 2.812c.051.643.304 1.254.723 1.745a3.066 3.066 0 010 3.976 3.066 3.066 0 00-.723 1.745 3.066 3.066 0 01-2.812 2.812 3.066 3.066 0 00-1.745.723 3.066 3.066 0 01-3.976 0 3.066 3.066 0 00-1.745-.723 3.066 3.066 0 01-2.812-2.812 3.066 3.066 0 00-.723-1.745 3.066 3.066 0 010-3.976 3.066 3.066 0 00.723-1.745 3.066 3.066 0 012.812-2.812zm7.44 5.252a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z\" clip-rule=\"evenodd\" />\n</svg>",
77
"color": "text-green-400",
88
"to": "/products/premium"
99
},
1010
{
1111
"title": "Modded OS",
1212
"id": "drawer_main_modded_os",
13-
"icon": " <svg class=\"stroke-current text-purple-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z\" />\n</svg>",
13+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-purple-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path d=\"M13 7H7v6h6V7z\" />\n <path fill-rule=\"evenodd\" d=\"M7 2a1 1 0 012 0v1h2V2a1 1 0 112 0v1h2a2 2 0 012 2v2h1a1 1 0 110 2h-1v2h1a1 1 0 110 2h-1v2a2 2 0 01-2 2h-2v1a1 1 0 11-2 0v-1H9v1a1 1 0 11-2 0v-1H5a2 2 0 01-2-2v-2H2a1 1 0 110-2h1V9H2a1 1 0 010-2h1V5a2 2 0 012-2h2V2zM5 5h10v10H5V5z\" clip-rule=\"evenodd\" />\n</svg>",
1414
"color": "text-purple-400",
1515
"to": "/products/modded-os"
1616
},
1717
{
1818
"title": "Documentation",
1919
"id": "drawer_main_docs",
20-
"icon": " <svg class=\"stroke-current text-primary-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253\" />\n</svg>",
20+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-primary-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path d=\"M9 4.804A7.968 7.968 0 005.5 4c-1.255 0-2.443.29-3.5.804v10A7.969 7.969 0 015.5 14c1.669 0 3.218.51 4.5 1.385A7.962 7.962 0 0114.5 14c1.255 0 2.443.29 3.5.804v-10A7.968 7.968 0 0014.5 4c-1.255 0-2.443.29-3.5.804V12a1 1 0 11-2 0V4.804z\" />\n</svg>",
2121
"color": "text-primary-400",
2222
"to": "https://docs.andronix.app"
2323
},
2424
{
2525
"title": "Pricing",
2626
"id": "drawer_main_pricing",
27-
"icon": " <svg class=\"stroke-current text-teal-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z\" />\n</svg>",
27+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-teal-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path d=\"M4 4a2 2 0 00-2 2v1h16V6a2 2 0 00-2-2H4z\" />\n <path fill-rule=\"evenodd\" d=\"M18 9H2v5a2 2 0 002 2h12a2 2 0 002-2V9zM4 13a1 1 0 011-1h1a1 1 0 110 2H5a1 1 0 01-1-1zm5-1a1 1 0 100 2h1a1 1 0 100-2H9z\" clip-rule=\"evenodd\" />\n</svg>",
2828
"color": "text-teal-400",
2929
"to": "/pricing"
3030
},
3131
{
3232
"title": "Get Help",
3333
"id": "drawer_main_help",
34-
"icon": " <svg class=\"stroke-current text-blue-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z\" />\n</svg>",
34+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-blue-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path fill-rule=\"evenodd\" d=\"M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-2 0c0 .993-.241 1.929-.668 2.754l-1.524-1.525a3.997 3.997 0 00.078-2.183l1.562-1.562C15.802 8.249 16 9.1 16 10zm-5.165 3.913l1.58 1.58A5.98 5.98 0 0110 16a5.976 5.976 0 01-2.516-.552l1.562-1.562a4.006 4.006 0 001.789.027zm-4.677-2.796a4.002 4.002 0 01-.041-2.08l-.08.08-1.53-1.533A5.98 5.98 0 004 10c0 .954.223 1.856.619 2.657l1.54-1.54zm1.088-6.45A5.974 5.974 0 0110 4c.954 0 1.856.223 2.657.619l-1.54 1.54a4.002 4.002 0 00-2.346.033L7.246 4.668zM12 10a2 2 0 11-4 0 2 2 0 014 0z\" clip-rule=\"evenodd\" />\n</svg>",
3535
"color": "text-blue-400",
3636
"to": "/help"
3737
},
3838
{
3939
"title": "Andronix Commands",
4040
"id": "drawer_main_command",
41-
"icon": " <svg class=\"stroke-current text-indigo-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z\" />\n</svg>",
41+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-indigo-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path fill-rule=\"evenodd\" d=\"M2 5a2 2 0 012-2h12a2 2 0 012 2v10a2 2 0 01-2 2H4a2 2 0 01-2-2V5zm3.293 1.293a1 1 0 011.414 0l3 3a1 1 0 010 1.414l-3 3a1 1 0 01-1.414-1.414L7.586 10 5.293 7.707a1 1 0 010-1.414zM11 12a1 1 0 100 2h3a1 1 0 100-2h-3z\" clip-rule=\"evenodd\" />\n</svg>",
4242
"color": "text-indigo-400",
4343
"to": "/products/commands"
4444
},
4545
{
4646
"title": "About Us",
4747
"id": "drawer_main_about",
48-
"icon": " <svg class=\"stroke-current text-pink-400 w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\">\n <path stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"2\" d=\"M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z\" />\n</svg>",
48+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-pink-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\">\n <path d=\"M9 6a3 3 0 11-6 0 3 3 0 016 0zM17 6a3 3 0 11-6 0 3 3 0 016 0zM12.93 17c.046-.327.07-.66.07-1a6.97 6.97 0 00-1.5-4.33A5 5 0 0119 16v1h-6.07zM6 11a5 5 0 015 5v1H1v-1a5 5 0 015-5z\" />\n</svg>",
4949
"color": "text-pink-400",
5050
"to": "/about"
51+
},
52+
{
53+
"title": "Contact Us",
54+
"id": "drawer_main_contact",
55+
"icon": "<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"fill-current text-cyan-400 h-5 w-5\" viewBox=\"0 0 20 20\" fill=\"currentColor\"><path fill-rule=\"evenodd\" d=\"M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z\" clip-rule=\"evenodd\"/></svg>",
56+
"color": "text-cyan-400",
57+
"to": "/contact"
5158
}
5259
]
5360
}

0 commit comments

Comments
 (0)