Skip to content

Commit 982354e

Browse files
committed
Enhance login/signup flow by preserving next parameter and update version to 1.0.7
1 parent 7a1d625 commit 982354e

File tree

8 files changed

+20
-10
lines changed

8 files changed

+20
-10
lines changed

Changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- added ability to refresh menu item badge from the backend using websocket publish
1717
- fix bugs when e.g. UR (urdu) can't be recognized by LLM (define names explicitly)
1818
- make user menu switch shorter
19-
- next param support on login route
19+
- next param support on login route (also preserve next param between login/signup navigation)
20+
2021

2122
# Improved
2223

adminforth/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adminforth",
3-
"version": "1.5.8-next.21",
3+
"version": "1.5.8-next.22",
44
"description": "OpenSource Vue3 powered forth-generation admin panel",
55
"main": "dist/index.js",
66
"module": "dist/index.js",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
3+
4+
## [v1.0.7]
5+
6+
# Added
7+
- next param support

adminforth/plugins/open-signup/custom/SignupPage.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
{{$t('Please check your email at')}} {{ sentToEmail }} {{$t('to confirm your email address.')}}
122122
</div>
123123
<p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
124-
{{$t('or')}} <Link to="/login">{{ toLoginText }}</Link>
124+
{{$t('Already have an account?')}} <Link :to="`/login${route.query.next ? `?next=${route.query.next}` : ''}`">{{ $t('login here') }}</Link>
125125
</p>
126126
</div>
127127
</div>
@@ -161,7 +161,6 @@ const sentToEmail: Ref<string> = ref('');
161161
162162
const requestEmailConfirmation = computed(() => route.meta.requestEmailConfirmation);
163163
const verifyToken = computed(() => route.query.token);
164-
const toLoginText = computed(() => verifyToken.value ? t('Go to login') : t('Back to login'));
165164
const isPasswordNeeded = computed(() => !requestEmailConfirmation.value || (requestEmailConfirmation.value && verifyToken.value));
166165
167166
const user = useUserStore();
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<template>
22
<p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3">
33
{{$t('Have no account?')}}
4-
<Link to="/signup">
4+
<Link :to="`/signup${route.query.next ? `?next=${route.query.next}` : ''}`">
55
{{$t('sign up now')}}
66
</Link>
77
</p>
88
</template>
99

1010
<script setup>
1111
import Link from '@/afcl/Link.vue';
12+
import { useRoute } from 'vue-router';
13+
14+
const route = useRoute();
1215
1316
</script>

adminforth/plugins/open-signup/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/plugins/open-signup/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adminforth/open-signup",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"main": "dist/index.js",
55
"types": "dist/index.d.ts",
66
"type": "module",

0 commit comments

Comments
 (0)