Skip to content

Commit

Permalink
Merge pull request #12 from imprakharshukla/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
imprakharshukla authored Jul 14, 2021
2 parents 2772b20 + 42c15cf commit fdd8da4
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 16 deletions.
12 changes: 9 additions & 3 deletions components/global/footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@
<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-lg">Andronix App</h3>
<p class="text-gray-400 text-sm">©2021 Andronix | Techriz. All Rights Reserved.</p>
<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"
Expand All @@ -161,7 +162,12 @@

<script>
export default {
name: 'Footer'
name: 'Footer',
methods: {
getCurrentYear() {
return new Date().getFullYear()
}
}
}
</script>

Expand Down
12 changes: 6 additions & 6 deletions components/global/navBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</div>

<!-- Download Button -->
<div
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"
<a href="https://play.andronix.app"
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"
>
<svg class="text-current fill-current w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
fill="currentColor"
Expand All @@ -20,8 +20,8 @@
clip-rule="evenodd"
/>
</svg>
<a href="https://play.andronix.app" class="text-current font-bold">Download</a>
</div>
<p class="text-current font-bold">Download</p>
</a>

<!-- Hamburger -->
<div id="nav_hamburger" @click="$store.commit('drawer/toggleDrawer')" class="cursor-pointer ml-5 ">
Expand All @@ -42,13 +42,13 @@
export default {
name: 'NavBar',
// a beforeMount call to add a listener to the window
beforeMount () {
beforeMount() {
window.addEventListener('scroll', this.handleScroll)
},
methods: {
// the function to call when the user scrolls, added as a method
handleScroll () {
handleScroll() {
// when the user scrolls, check the pageYOffset
if (window.pageYOffset > 0) {
// user is scrolled
Expand Down
2 changes: 1 addition & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default {

// Axios module configuration (https://go.nuxtjs.dev/config-axios)
axios: {
baseURL: 'http://localhost:3030/v1'
baseURL: 'https://commerce.andronix.xyz/v1'
},

// Build Configuration (https://go.nuxtjs.dev/config-build)
Expand Down
11 changes: 7 additions & 4 deletions pages/products/modded-os.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
d="M3 1a1 1 0 000 2h1.22l.305 1.222a.997.997 0 00.01.042l1.358 5.43-.893.892C3.74 11.846 4.632 14 6.414 14H15a1 1 0 000-2H6.414l1-1H14a1 1 0 00.894-.553l3-6A1 1 0 0017 3H6.28l-.31-1.243A1 1 0 005 1H3zM16 16.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM6.5 18a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"
/>
</svg>
<p class="text-white font-bold">Buy Now!</p>
<p class="text-white text-center font-bold">Buy Now!</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -178,7 +178,7 @@ import PrimaryTextButton from "~/components/base/primaryTextButton";
export default {
components: {PrimaryTextButton, FeatureCard, CounterComponent, Heading, TestimonialModdedOsCard},
head () {
head() {
return {
title: meta['modded-os'].title,
meta: [{
Expand All @@ -188,7 +188,7 @@ export default {
}]
}
},
async mounted () {
async mounted() {
await this.fetchImages()
},
methods: {
Expand All @@ -199,10 +199,13 @@ export default {
this.$router.push('/auth/login')
}
},
async fetchImages () {
async fetchImages() {
try {
console.log("Fetching images...")
let res = await this.$axios.get('/gen/modded-images')
console.log("log")
let imagesObj = res.data
console.log({imagesObj})
for (let osImageId in imagesObj) {
if (imagesObj.hasOwnProperty(osImageId)) {
Expand Down
10 changes: 8 additions & 2 deletions static/data/misc/teams.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@
},
{
"name": "@raytracingcert07",
"position": "Discord Support",
"quote": "I'm the moderator at the Andronix Discord server, where you'll see a small but friendly and helpful community willing to assist you.",
"position": "Discord",
"quote": "The ease of using Andronix is something that I really like and it was the reason that I joined the team. No-ads, a intuitive user interface.",
"photo_url": "https://cdn.discordapp.com/avatars/472036022927097867/048f9abe7ec9ef972c83c70bd64dcc14.png"
},
{
"name": "@./start-blendy.sh",
"position": "Discord",
"quote": "Andronix is a must have for any power user of their android device, it can be a direct replacement for the now defunct Linux on Dex.",
"photo_url": "https://cdn.discordapp.com/avatars/386375356866887680/100de051e2f188661fba52e5c64a1341.png"
}
],
"specials": [
Expand Down

1 comment on commit fdd8da4

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.