Skip to content

Commit

Permalink
Merge pull request #256 from DecentralCardGame/251-polishing-for-anna…
Browse files Browse the repository at this point in the history
…-yes

251 polishing for anna yes
  • Loading branch information
lxgr-linux authored Jan 25, 2024
2 parents 061efe8 + 6a950d5 commit 22de41d
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 25 deletions.
Binary file added src/assets/figma/GameBoard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/figma/PresentationLogos/ICF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/figma/PresentationLogos/coinlive.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/components/elements/CCButton/LinkCCButton.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<template>
<div>
<a :href="props.to" class="mx-auto">
<BaseCCButton :type="props.type">
<slot></slot>
</BaseCCButton>
</a>
</div>
</template>

<script setup lang="ts">
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
const props = withDefaults(
defineProps<{
to: string;
type: ButtonType;
}>(),
{
to: "dummy",
type: ButtonType.YELLOW,
}
);
import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
</script>
12 changes: 7 additions & 5 deletions src/components/elements/CCButton/RouterCCButton.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<template>
<router-link :to="props.to">
<BaseCCButton :type="props.type">
<slot></slot>
</BaseCCButton>
</router-link>
<div>
<router-link :to="props.to" class="mx-auto">
<BaseCCButton :type="props.type">
<slot></slot>
</BaseCCButton>
</router-link>
</div>
</template>

<script setup lang="ts">
Expand Down
8 changes: 4 additions & 4 deletions src/components/partials/PageMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/></router-link>
<a class="grow" />
<div class="my-auto max-md:hidden">
<RouterCCButton :type="ButtonType.RED"
<RouterCCButton :type="ButtonType.RED" to="/d"
>Download Gameclient</RouterCCButton
>
</div>
Expand Down Expand Up @@ -55,9 +55,9 @@ type NavigationElement = {
};
const elems: NavigationElement[] = [
{ routeName: "/", display: "Abc", highlighted: false },
{ routeName: "def", display: "Def", highlighted: true },
{ routeName: "ghi", display: "Ghi", highlighted: false },
{ routeName: "/g", display: "Gallery", highlighted: false },
{ routeName: "/s", display: "Sets and Boosters", highlighted: true },
{ routeName: "/l", display: "Learn", highlighted: false },
];
const state = reactive({
Expand Down
30 changes: 20 additions & 10 deletions src/views/LandingPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
<div class="absolute top-20 m-auto left-0 right-0">
<div class="flex text-center justify-center z-10">
<div class="w-5/6 md:w-3/6">
<img :src="logoBig" alt="big cc logo" class="w-[100%] drop-shadow-header" />
<img
:src="logoBig"
alt="big cc logo"
class="w-[100%] drop-shadow-header"
/>
<p class="text-4xl text-white font-bold py-6">
A trading card game made by players.
</p>
<br />
<BaseCCButton class="pb-4" :type="ButtonType.YELLOW"
<RouterCCButton class="pb-4" to="/c" :type="ButtonType.YELLOW"
>CREATE CARDS
</BaseCCButton>
<BaseCCButton :type="ButtonType.WHITE">Play the game</BaseCCButton>
</RouterCCButton>
<RouterCCButton :type="ButtonType.WHITE" to="/b"
>Play the game</RouterCCButton
>
</div>
</div>
</div>
Expand All @@ -39,10 +45,10 @@
<div class="justify-self-center">
<p class="text-6xl font-bold pb-6">New Sets and Boosters</p>
<p class="text-3xl pb-6">Promoted Sets and Boosters</p>
<BaseCCButton class="pb-4" :type="ButtonType.BLACK"
<RouterCCButton class="pb-4" to="/b" :type="ButtonType.BLACK"
>Buy Boosters
</BaseCCButton>
<BaseCCButton :type="ButtonType.BLACK">Visit Gallery</BaseCCButton>
</RouterCCButton>
<RouterCCButton to="/g" :type="ButtonType.BLACK">Visit Gallery</RouterCCButton>
</div>
<div>
<img
Expand All @@ -63,7 +69,7 @@
</div>
</div>
<div class="flex pt-20 justify-evenly sm:px-32 flex-wrap gap-4">
<div class="relative" v-for="cardBack in cardBacks">
<div class="relative hover:scale-105" v-for="cardBack in cardBacks">
<img
alt="cardback"
:src="cardBack.cardBack"
Expand All @@ -86,7 +92,9 @@
<p>collaboration. Learn the game and give us your review.</p>
</div>
<br />
<BaseCCButton :type="ButtonType.TEAL">Join Us</BaseCCButton>
<LinkCCButton :type="ButtonType.TEAL" to="https://discord.gg/ZKKbhUs"
>Join Us</LinkCCButton
>
<img
alt="gameboard"
class="object-contain w-[90%] md:w-[50%] drop-shadow-glowTeal mx-auto pt-20"
Expand All @@ -99,7 +107,7 @@
</template>

<script setup lang="ts">
import gameBoard from "@/assets/figma/GameBoard.gif";
import gameBoard from "@/assets/figma/GameBoard.png";
import cardBack1 from "@/assets/figma/Cardbacks/1.png";
import cardBack2 from "@/assets/figma/Cardbacks/2.png";
import cardBack3 from "@/assets/figma/Cardbacks/3.png";
Expand All @@ -114,6 +122,8 @@ import landingBackground from "@/assets/figma/LandingPageBackground/LandingBackg
import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
import FadeTeaser from "@/components/elements/FadeTeaser.vue";
import LinkCCButton from "@/components/elements/CCButton/LinkCCButton.vue";
import RouterCCButton from "@/components/elements/CCButton/RouterCCButton.vue";
type CardBack = {
cardBack: string;
Expand Down
31 changes: 25 additions & 6 deletions src/views/NotFound.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
<template>
<div class="article-temp width-temp">
<div align="center">
<h1>404</h1>
<a>Page not found, return to where you came from!</a>
<div class="bg-black flex text-center justify-center h-[80vh]">
<div class="my-auto">
<p class="text-5xl text-[#FEC560] font-bold">Stay Tuned</p>
<br />
<p class="text-white text-2xl">
We are rebranding!<br /><br />You can still access our old website:<br />
<a href="https://crowdcontrol.network" class="hover:underline">
crowdcontrol.network</a
><br /><br />
In the meantime, join our community on Discord!
</p>
<br />
<LinkCCButton :type="ButtonType.YELLOW" to="https://discord.gg/ZKKbhUs"
>Join Discord
</LinkCCButton>
</div>
</div>
</template>

<script lang=ts>
<script lang="ts">
import LinkCCButton from "@/components/elements/CCButton/LinkCCButton.vue";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
export default {
name: "NotFound",
computed: {
ButtonType() {
return ButtonType
}
},
components: { LinkCCButton },
data() {
return {};
},
mounted() {
this.$router.push({ path: 'NotFound' })
this.$router.push({ path: "NotFound" });
},
};
</script>

0 comments on commit 22de41d

Please sign in to comment.