From 7b64c35e35840b946675f0f999c73c6045fd8ff3 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Tue, 11 Aug 2020 21:17:59 +0200 Subject: meritless work --- src/browser/index.html | 3 + src/browser/src/App.vue | 4 +- src/browser/src/api/account.js | 32 ++++----- src/browser/src/components/Alert/Alert.vue | 17 +---- .../src/components/PasswordInput/PasswordInput.js | 44 +++++++++++++ .../components/PasswordInput/PasswordInput.scss | 76 ++++++++++++++++++++++ .../src/components/PasswordInput/PasswordInput.vue | 56 ++++++++++++++++ src/browser/src/views/Forgot.vue | 9 ++- src/browser/src/views/Login.vue | 7 +- src/browser/src/views/Signup.vue | 25 ++++--- 10 files changed, 227 insertions(+), 46 deletions(-) create mode 100644 src/browser/src/components/PasswordInput/PasswordInput.js create mode 100644 src/browser/src/components/PasswordInput/PasswordInput.scss create mode 100644 src/browser/src/components/PasswordInput/PasswordInput.vue diff --git a/src/browser/index.html b/src/browser/index.html index 142b590..b9ccb70 100644 --- a/src/browser/index.html +++ b/src/browser/index.html @@ -4,6 +4,9 @@ + Vite App diff --git a/src/browser/src/App.vue b/src/browser/src/App.vue index e6a9694..c904ec6 100644 --- a/src/browser/src/App.vue +++ b/src/browser/src/App.vue @@ -15,7 +15,5 @@ export default { }; diff --git a/src/browser/src/api/account.js b/src/browser/src/api/account.js index 88522d6..d0041f8 100644 --- a/src/browser/src/api/account.js +++ b/src/browser/src/api/account.js @@ -18,57 +18,59 @@ const userManager = new Oidc.UserManager({ Oidc.Log.logger = console; Oidc.Log.level = Oidc.Log.INFO; +const log = (...args) => console.log(...args); +const error = (...args) => console.error(...args); userManager.events.addUserLoaded(function (user) { store.commit("setProfileData", user); - console.log("New user：", arguments); - console.log("Access_token: ", user.access_token); + log("New user：", arguments); + log("Access_token: ", user.access_token); }); userManager.events.addAccessTokenExpiring(function () { - console.log("AccessToken Expiring", arguments); + log("AccessToken Expiring", arguments); }); userManager.events.addAccessTokenExpired(function () { - console.log("AccessToken Expired", arguments); + log("AccessToken Expired", arguments); userManager .signoutRedirect() .then(function (resp) { - console.log("signed out", resp); + log("signed out", resp); }) .catch(function (err) { - console.log(err); + log(err); }); }); userManager.events.addSilentRenewError(function () { - console.error("Silent Renew Error：", arguments); + error("Silent Renew Error：", arguments); }); userManager.events.addUserSignedOut(function () { - console.log("UserSignedOut：", arguments); + log("UserSignedOut：", arguments); userManager.removeUser(); userManager .signoutRedirect() .then(function (resp) { - console.log("signed out", resp); + log("signed out", resp); }) .catch(function (err) { - console.log(err); + log(err); }); }); export default { signIn() { userManager.signinRedirect().catch(function (err) { - console.log(err); + log(err); }); }, signinRedirectCallback() { userManager.signinRedirectCallback().then( - (res) => console.log(res), - (error) => console.error(error) + (res) => log(res), + (error) => error(error) ); }, @@ -79,7 +81,7 @@ export default { return true; }) .catch(function (err) { - console.error(err); + error(err); return false; }); }, @@ -98,7 +100,7 @@ export default { } }) .catch(function (err) { - console.error(err); + error(err); return reject(err); }); }); diff --git a/src/browser/src/components/Alert/Alert.vue b/src/browser/src/components/Alert/Alert.vue index da7377d..73b26df 100644 --- a/src/browser/src/components/Alert/Alert.vue +++ b/src/browser/src/components/Alert/Alert.vue @@ -16,20 +16,7 @@ @@ -38,6 +25,8 @@ + + diff --git a/src/browser/src/views/Forgot.vue b/src/browser/src/views/Forgot.vue index efe367c..422c902 100644 --- a/src/browser/src/views/Forgot.vue +++ b/src/browser/src/views/Forgot.vue @@ -38,7 +38,7 @@

- ← Back to login + ← Back to login

@@ -52,6 +52,7 @@ import { VueComponent as LoadingIcon } from "../assets/icons/loading.svg"; import { VueComponent as ChevronLeftIcon } from "../assets/icons/chevron_left.svg"; import account from "../api/account"; import router from "../router"; + export default { components: { LoadingIcon, @@ -86,13 +87,15 @@ export default { displayError(errorData.title, errorData.message); } } catch (error) { - console.error(error); + error(error); displayError(); } } } - return { ...toRefs(model), submitForm }; + const login = () => account.signIn(); + + return { ...toRefs(model), submitForm, login }; }, }; diff --git a/src/browser/src/views/Login.vue b/src/browser/src/views/Login.vue index c021fca..3a5d966 100644 --- a/src/browser/src/views/Login.vue +++ b/src/browser/src/views/Login.vue @@ -13,11 +13,12 @@ import account from "../api/account"; export default { mounted() { - if (!store.state.profile.profile.sub) { + let user = account.getUser().then((res) => res); + if (user) { account .signIn() - .then((user) => console.log(user)) - .catch((err) => console.error(err)); + .then((user) => log(user)) + .catch((err) => error(err)); } else { account.getUser().then((res) => { store.commit("checkForAuthState"); diff --git a/src/browser/src/views/Signup.vue b/src/browser/src/views/Signup.vue index 2f5854f..ee07734 100644 --- a/src/browser/src/views/Signup.vue +++ b/src/browser/src/views/Signup.vue @@ -3,6 +3,7 @@

dough - signup

+

Already have an account? Log in

@@ -14,6 +15,7 @@ id="name" :disabled="isLoading == true" v-model.trim="input.name" + autofocus />
@@ -34,14 +36,11 @@ - @@ -62,7 +61,10 @@
-

Have an account? Log in

+

+ By joining, you agree to our Terms and + Privacy Policy. +

@@ -72,9 +74,15 @@ import { toRefs, reactive } from "vue"; import router from "../router"; import { VueComponent as LoadingIcon } from "../assets/icons/loading.svg"; +import account from "../api/account"; +import Alert from "../components/Alert/Alert.vue"; +import PasswordInput from "../components/PasswordInput/PasswordInput.vue"; + export default { components: { LoadingIcon, + Alert, + PasswordInput, }, setup() { const model = reactive({ @@ -91,10 +99,11 @@ export default { }, }); - const login = () => router.replace("/login"); + const login = () => account.signIn(); async function submitForm() { - return; + model.isLoading = !model.isLoading; + console.log(model.input); } return { ...toRefs(model), login, submitForm }; -- cgit v1.3