Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

283 signup cannot be clicked when authenticating a new account #285

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ NODE_VERSION=v18.17.1
#VITE_WS_TENDERMINT_FALLBACK=https://cardchain2.crowdcontrol.network/tendermint/
#VITE_APP_FAUCET_FALLBACK=https://cardchain2.crowdcontrol.network/faucet/claimTokens

VITE_API_COSMOS="http://lxgr.xyz:1317"
VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"
#VITE_API_COSMOS="http://lxgr.xyz:1317"
#VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
#VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"
50 changes: 50 additions & 0 deletions src/components/elements/Login/SignupComponent.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<template>
<div>
<BaseCCButton v-if="!isSignUpRequired" @click="login">
Login with keplr
</BaseCCButton>
<div v-else>
<div v-if="isKeplrAvailable" class="flex flex-col justify-center">
<p class="p-7">You have to sign up first</p>
<vue-hcaptcha
:sitekey="state.siteKey"
class="mx-auto"
@verify="onVerify"
/>
</div>
<div v-else>
<p class="p-7">
To log in you first need download and install the
<a href="https://www.keplr.app" class="underline">keplr wallet</a>
browser extension
</p>
<a href="https://www.keplr.app/download" class="mx-auto">
<BaseCCButton :type="ButtonType.TEAL"> Download Keplr</BaseCCButton>
</a>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
import VueHcaptcha from "@hcaptcha/vue3-hcaptcha";
import useKeplr from "@/def-composables/useKeplr";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
import { useLogin } from "@/def-composables/useLogin";
import { onMounted, reactive } from "vue";
import { env } from "@/env";
import SignupComponent from "@/components/elements/Login/SignupComponent.vue";

const { isKeplrAvailable } = useKeplr();
const { checkSignUpRequired, login, isSignUpRequired, onVerify } = useLogin();

const initialState: {
siteKey: string;
} = {
siteKey: env.faucetSiteKey,
};

const state = reactive(initialState);

onMounted(checkSignUpRequired);
</script>
2 changes: 1 addition & 1 deletion src/components/partials/PageMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import Menu from "@/assets/figma/Menu.svg";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
import { reactive } from "vue";
import RouterCCButton from "@/components/elements/CCButton/RouterCCButton.vue";
import LoginComponent from "@/components/elements/LoginComponent.vue";
import LoginComponent from "@/components/elements/Login/LoginComponent.vue";

type NavigationElement = {
routeName: string;
Expand Down
3 changes: 2 additions & 1 deletion src/def-composables/useLogin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ const useLoginInstance = () => {
if (!required) {
login()
} else {
router.push("Login")}
router.push({name:"Login"})
}
})
}

Expand Down
4 changes: 2 additions & 2 deletions src/views/GameClientAuthzPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
</div>
<div v-else>
<p>Please log in to authenticate</p>
<SignupComponent />
</div>
</template>
</HeadingContentComponent>
Expand All @@ -46,7 +47,6 @@
<script setup lang="ts">
import { useLoggedIn } from "@/def-composables/useLoggedIn";
import { useTx } from "@/def-composables/useTx";
import { useAddress } from "@/def-composables/useAddress";
import { useRoute, useRouter } from "vue-router";
import { onMounted, reactive } from "vue";
import { validAddress } from "@/utils/validation";
Expand All @@ -55,6 +55,7 @@ import FadeTeaserSmall from "@/components/elements/Teaser/FadeTeaserSmall.vue";
import spinner from "@/assets/spinner.svg";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
import HeadingContentComponent from "@/components/elements/Teaser/TeaserHeader.vue";
import SignupComponent from "@/components/elements/Login/SignupComponent.vue";

enum CurrentState {
NONE,
Expand All @@ -63,7 +64,6 @@ enum CurrentState {
}

const { loggedIn } = useLoggedIn();
const { address } = useAddress();
const { authzGameclient } = useTx();
const route = useRoute();
const router = useRouter();
Expand Down
64 changes: 5 additions & 59 deletions src/views/LoginPage.vue
Original file line number Diff line number Diff line change
@@ -1,72 +1,18 @@
<template>
<div class="bg-black flex flex-col h-[80vh] sm:h-[85vh]">
<div class="text-center my-auto">
<div class="-mt-40">
<h2 class="text-white text-5xl font-bold p-7">
<div class="-mt-40 text-white">
<h2 class="text-5xl font-bold p-7">
{{ isSignUpRequired ? "Sign up" : "Log in" }}
</h2>
<BaseCCButton
v-if="!isSignUpRequired"
@click="login"
>
Login with keplr
</BaseCCButton>
<div v-else>
<div
v-if="isKeplrAvailable"
class="flex flex-col justify-center"
>
<p class="text-white p-7">
You have to sign up first
</p>
<vue-hcaptcha
:sitekey="state.siteKey"
class="mx-auto"
@verify="onVerify"
/>
</div>
<div v-else>
<p class="text-white p-7">
To log in you first need download and install the
<a
href="https://www.keplr.app"
class="underline"
>keplr wallet</a>
browser extension
</p>
<a
href="https://www.keplr.app/download"
class="mx-auto"
>
<BaseCCButton :type="ButtonType.TEAL">
Download Keplr
</BaseCCButton>
</a>
</div>
</div>
<SignupComponent />
</div>
</div>
</div>
</template>
<script setup lang="ts">
import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
import VueHcaptcha from "@hcaptcha/vue3-hcaptcha";
import useKeplr from "@/def-composables/useKeplr";
import { ButtonType } from "@/components/elements/CCButton/ButtonType";
import SignupComponent from "@/components/elements/Login/SignupComponent.vue";
import { useLogin } from "@/def-composables/useLogin";
import { onMounted, reactive } from "vue";
import { env } from "@/env";

const { isKeplrAvailable } = useKeplr();
const { checkSignUpRequired, login, isSignUpRequired, onVerify } = useLogin();

const initialState: {
siteKey: string;
} = {
siteKey: env.faucetSiteKey,
};

const state = reactive(initialState);

onMounted(checkSignUpRequired);
const { isSignUpRequired } = useLogin();
</script>
Loading