btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

perf: template literals

Browse Source
This commit is contained in:
liyasthomas
2021-09-18 16:09:58 +05:30
parent 4236d1179c
commit e1e763575d
64 changed files with 425 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/hoppscotch-app/components/firebase/Login.vue
View File

@@ -1,7 +1,7 @@
<template>
<SmartModal
v-if="show"
:title="$t('auth.login_to_hoppscotch')"
:title="`${$t('auth.login_to_hoppscotch')}`"
dialog
@close="hideModal"
>
@@ -10,18 +10,18 @@
<SmartItem
:loading="signingInWithGitHub"
svg="auth/github"
:label="$t('auth.continue_with_github')"
:label="`${$t('auth.continue_with_github')}`"
@click.native="signInWithGithub"
/>
<SmartItem
:loading="signingInWithGoogle"
svg="auth/google"
:label="$t('auth.continue_with_google')"
:label="`${$t('auth.continue_with_google')}`"
@click.native="signInWithGoogle"
/>
<SmartItem
icon="mail"
:label="$t('auth.continue_with_email')"
:label="`${$t('auth.continue_with_email')}`"
@click.native="mode = 'email'"
/>
</div>
@@ -55,7 +55,7 @@
: true
"
type="button"
:label="$t('auth.send_magic_link')"
:label="`${$t('auth.send_magic_link')}`"
@click.native="signInWithEmail"
/>
</div>
@@ -108,7 +108,7 @@
/>
<SmartAnchor
class="link"
:label="$t('action.dismiss')"
:label="`${$t('action.dismiss')}`"
@click.native="hideModal"
/>
</p>
@@ -161,7 +161,7 @@ export default defineComponent({
},
methods: {
showLoginSuccess() {
this.$toast.success(this.$t("auth.login_success").toString(), {
this.$toast.success(`${this.$t("auth.login_success")}`, {
icon: "vpn_key",
})
},
@@ -184,7 +184,7 @@ export default defineComponent({
duration: 0,
closeOnSwipe: false,
action: {
text: this.$t("action.yes").toString(),
text: `${this.$t("action.yes")}`,
onClick: async (_, toastObject) => {
const { user } = await signInUserWithGithub()
await linkWithFBCredential(user, pendingCred)
@@ -196,7 +196,7 @@ export default defineComponent({
},
})
} else {
this.$toast.error(this.$t("error.something_went_wrong").toString(), {
this.$toast.error(`${this.$t("error.something_went_wrong")}`, {
icon: "error_outline",
})
}
@@ -228,7 +228,7 @@ export default defineComponent({
duration: 0,
closeOnSwipe: false,
action: {
text: this.$t("action.yes").toString(),
text: `${this.$t("action.yes")}`,
onClick: async (_, toastObject) => {
const { user } = await signInUserWithGoogle()
await linkWithFBCredential(user, pendingCred)
@@ -240,7 +240,7 @@ export default defineComponent({
},
})
} else {
this.$toast.error(this.$t("error.something_went_wrong").toString(), {
this.$toast.error(`${this.$t("error.something_went_wrong")}`, {
icon: "error_outline",
})
}

14
packages/hoppscotch-app/components/firebase/Logout.vue
View File

@@ -2,15 +2,17 @@
<div class="flex">
<SmartItem
svg="log-out"
:label="$t('auth.logout')"
:label="`${$t('auth.logout')}`"
@click.native="
$emit('confirm-logout')
confirmLogout = true
() => {
$emit('confirm-logout')
confirmLogout = true
}
"
/>
<SmartConfirmModal
:show="confirmLogout"
:title="$t('confirm.logout')"
:title="`${$t('confirm.logout')}`"
@hide-modal="confirmLogout = false"
@resolve="logout"
/>
@@ -31,12 +33,12 @@ export default defineComponent({
async logout() {
try {
await signOutUser()
this.$toast.success(this.$t("auth.logged_out").toString(), {
this.$toast.success(`${this.$t("auth.logged_out")}`, {
icon: "vpn_key",
})
} catch (e) {
console.error(e)
this.$toast.error(this.$t("error.something_went_wrong").toString(), {
this.$toast.error(`${this.$t("error.something_went_wrong")}`, {
icon: "error_outline",
})
}