Skip to content

Commit 6597ade

Browse files
fix: SH admin dashboard setting and onboarding page cleanups (hoppscotch#5290)
Co-authored-by: jamesgeorge007 <[email protected]>
1 parent 56fa953 commit 6597ade

File tree

10 files changed

+360
-274
lines changed

10 files changed

+360
-274
lines changed

packages/hoppscotch-common/src/components/firebase/Login.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
@click="provider.action"
2828
/>
2929

30-
<hr v-if="additionalLoginItems.length > 0" />
30+
<hr
31+
v-if="
32+
additionalLoginItems.length > 0 && allowedAuthProviders.length
33+
"
34+
/>
3135

3236
<HoppSmartItem
3337
v-for="loginItem in additionalLoginItems"
@@ -58,7 +62,7 @@
5862
</form>
5963

6064
<div
61-
v-if="!allowedAuthProviders?.length"
65+
v-if="!allowedAuthProviders?.length && !additionalLoginItems.length"
6266
class="flex flex-col items-center text-center"
6367
>
6468
<p>{{ t("state.require_auth_provider") }}</p>

packages/hoppscotch-sh-admin/locales/en.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@
176176
},
177177
"onboarding": {
178178
"add_atleast_one_auth_provider": "Please add at least one authentication provider to continue.",
179-
"add_configurations": "Please add the configurations for the selected authentication methods.",
179+
"add_configurations": "Add Configurations",
180+
"add_configurations_description": "Please add the configurations for the selected authentication methods.",
180181
"add_oauth_config": "Add Auth Configurations",
181182
"auth_setup": "Authentication Setup",
182183
"auth_successfully_configured": "authentication has been successfully configured.",
@@ -214,7 +215,8 @@
214215
"title": "SMTP"
215216
},
216217
"smtp_advanced_config_enable": "Enable to configure your own SMTP credentials",
217-
"select_auth_provider": "Please select the authentication methods you want to set up.",
218+
"select_auth_methods": "Please select authentications",
219+
"select_auth_provider": "You can select one or more authentication providers to continue.",
218220
"select_atleast_one": "Please select at least one authentication provider to continue.",
219221
"start_onboarding": "Start Onboarding",
220222
"welcome": "Welcome",
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<template>
2+
<div
3+
class="flex flex-col justify-between space-y-2 p-5 w-56 h-46 cursor-pointer border-2 rounded-lg shadow transition bg-primaryLight border-primaryDark hover:border-accent"
4+
:class="{
5+
'!bg-primary !border-accentDark': selected,
6+
}"
7+
@click="$emit('click')"
8+
>
9+
<div class="flex flex-col space-y-2">
10+
<div class="flex items-center justify-between">
11+
<span class="text-[0.9rem] text-secondaryDark">
12+
{{ t(title) }}
13+
</span>
14+
<icon-lucide-check
15+
v-if="selected"
16+
class="svg-icons h-4 w-4 text-accent"
17+
/>
18+
</div>
19+
20+
<span class="text-secondaryLight w-32">
21+
{{ t(description) }}
22+
</span>
23+
</div>
24+
25+
<div>
26+
<div class="flex items-center -space-x-2">
27+
<slot />
28+
</div>
29+
</div>
30+
</div>
31+
</template>
32+
33+
<script lang="ts" setup>
34+
import IconLucideCheck from '~icons/lucide/check';
35+
import { useI18n } from '~/composables/i18n';
36+
37+
defineProps<{
38+
title: string;
39+
description: string;
40+
selected: boolean;
41+
}>();
42+
43+
const emit = defineEmits(['click']);
44+
45+
const t = useI18n();
46+
</script>

0 commit comments

Comments
 (0)