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.

Sign up for GitHub

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

Jump to bottom

refactor: layout of login related page #5413

Merged
merged 2 commits into from Feb 27, 2024
Merged

refactor: layout of login related page #5413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc06f45
refactor: layout of login related page
ruibaby Feb 27, 2024
59e85e1
Merge branch 'main' into refactor/login-page-layout
ruibaby Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions ui/console-src/layouts/GatewayLayout.vue
View file
Open in desktop
@@ -0,0 +1,13 @@
<script lang="ts" setup>
import IconLogo from "~icons/core/logo?width=5rem&height=2rem";
</script>

<template>
<div
class="flex h-screen flex-col items-center overflow-auto bg-white/90 pt-[30vh]"
>
<IconLogo class="mb-8 flex-none" />

<RouterView />
</div>
</template>
98 changes: 0 additions & 98 deletions ui/console-src/modules/system/users/Login.vue
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions ui/console-src/modules/system/users/module.ts
View file
Open in desktop
Expand Up @@ -3,10 +3,8 @@ import BasicLayout from "@console/layouts/BasicLayout.vue";
import UserStatsWidget from "./widgets/UserStatsWidget.vue";
import UserList from "./UserList.vue";
import UserDetail from "./UserDetail.vue";
import Login from "./Login.vue";
import { IconUserSettings } from "@halo-dev/components";
import { markRaw } from "vue";
import Binding from "./Binding.vue";
import NotificationWidget from "./widgets/NotificationWidget.vue";

export default definePlugin({
Expand All @@ -15,22 +13,6 @@ export default definePlugin({
NotificationWidget,
},
routes: [
{
path: "/login",
name: "Login",
component: Login,
meta: {
title: "core.login.title",
},
},
{
path: "/binding/:provider",
name: "Binding",
component: Binding,
meta: {
title: "core.binding.title",
},
},
{
path: "/users",
name: "UsersRoot",
Expand Down
63 changes: 53 additions & 10 deletions ui/console-src/router/routes.config.ts
View file
Open in desktop
Expand Up @@ -2,10 +2,13 @@ import type { RouteRecordRaw } from "vue-router";
import NotFound from "@/views/exceptions/NotFound.vue";
import Forbidden from "@/views/exceptions/Forbidden.vue";
import BasicLayout from "@console/layouts/BasicLayout.vue";
import GatewayLayout from "@console/layouts/GatewayLayout.vue";
import Setup from "@console/views/system/Setup.vue";
import Redirect from "@console/views/system/Redirect.vue";
import SetupInitialData from "@console/views/system/SetupInitialData.vue";
import ResetPassword from "@console/views/system/ResetPassword.vue";
import Login from "@console/views/system/Login.vue";
import Binding from "@console/views/system/Binding.vue";

export const routes: Array<RouteRecordRaw> = [
{
Expand All @@ -24,13 +27,47 @@ export const routes: Array<RouteRecordRaw> = [
},
],
},
{
path: "/login",
component: GatewayLayout,
children: [
{
path: "",
name: "Login",
component: Login,
meta: {
title: "core.login.title",
},
},
],
},
{
path: "/binding/:provider",
component: GatewayLayout,
children: [
{
path: "",
name: "Binding",
component: Binding,
meta: {
title: "core.binding.title",
},
},
],
},
{
path: "/setup",
name: "Setup",
component: Setup,
meta: {
title: "core.setup.title",
},
component: GatewayLayout,
children: [
{
path: "",
name: "Setup",
component: Setup,
meta: {
title: "core.setup.title",
},
},
],
},
{
path: "/setup-initial-data",
Expand All @@ -47,11 +84,17 @@ export const routes: Array<RouteRecordRaw> = [
},
{
path: "/reset-password",
name: "ResetPassword",
component: ResetPassword,
meta: {
title: "core.reset_password.title",
},
component: GatewayLayout,
children: [
{
path: "",
name: "ResetPassword",
component: ResetPassword,
meta: {
title: "core.reset_password.title",
},
},
],
},
];

Expand Down
66 changes: 31 additions & 35 deletions ...sole-src/modules/system/users/Binding.vue → ui/console-src/views/system/Binding.vue
View file
Open in desktop
@@ -1,7 +1,6 @@
<script lang="ts" setup>
import { computed, onBeforeMount, onMounted } from "vue";
import router from "@console/router";
import IconLogo from "~icons/core/logo?width=5rem&height=2rem";
import { useUserStore } from "@/stores/user";
import LoginForm from "@/components/login/LoginForm.vue";
import { useRoute } from "vue-router";
Expand Down Expand Up @@ -51,41 +50,38 @@ function handleChangeType() {
const isLoginType = computed(() => type.value !== "signup");
</script>
<template>
<div class="flex h-screen flex-col items-center bg-white/90 pt-[30vh]">
<IconLogo class="mb-8" />
<div class="flex w-72 flex-col">
<SignupForm
v-if="type === 'signup'"
button-text="core.binding.operations.signup_and_bind.button"
@succeed="handleBinding"
/>
<LoginForm
v-else
button-text="core.binding.operations.login_and_bind.button"
@succeed="handleBinding"
/>
<div
v-if="globalInfo?.allowRegistration"
class="flex justify-center gap-1 pt-3.5 text-xs"
<div class="flex w-72 flex-col">
<SignupForm
v-if="type === 'signup'"
button-text="core.binding.operations.signup_and_bind.button"
@succeed="handleBinding"
/>
<LoginForm
v-else
button-text="core.binding.operations.login_and_bind.button"
@succeed="handleBinding"
/>
<div
v-if="globalInfo?.allowRegistration"
class="flex justify-center gap-1 pt-3.5 text-xs"
>
<span class="text-slate-500">
{{
isLoginType
? $t("core.login.operations.signup.label")
: $t("core.login.operations.return_login.label")
}}
</span>
<span
class="cursor-pointer text-secondary hover:text-gray-600"
@click="handleChangeType"
>
<span class="text-slate-500">
{{
isLoginType
? $t("core.login.operations.signup.label")
: $t("core.login.operations.return_login.label")
}}
</span>
<span
class="cursor-pointer text-secondary hover:text-gray-600"
@click="handleChangeType"
>
{{
isLoginType
? $t("core.login.operations.signup.button")
: $t("core.login.operations.return_login.button")
}}
</span>
</div>
{{
isLoginType
? $t("core.login.operations.signup.button")
: $t("core.login.operations.return_login.button")
}}
</span>
</div>
</div>
</template>