diff --git a/ui/env.js b/ui/env.js index 51d44bd..716bbcb 100644 --- a/ui/env.js +++ b/ui/env.js @@ -13,7 +13,7 @@ export default async ($env) => { // Initialize VBase Service const vbase = new VBase(''); // Relative path $env.$vbase = vbase; - + // Wrap Axios vbase.wrapAxios($env.$axios); @@ -26,32 +26,33 @@ export default async ($env) => { if (isAuth) { if (vbase.isExpired()) { try { - await vbase.refresh(); + await vbase.refresh(); } catch (e) { - vbase.logout('/login?redirect=' + encodeURIComponent(to.fullPath)); - return false; + vbase.logout('/login?redirect=' + encodeURIComponent(to.fullPath)); + return false; } } - + if (!vbase.user) { - try { - await vbase.fetchUser(); - } catch (e) { - vbase.logout('/login?redirect=' + encodeURIComponent(to.fullPath)); - return false; - } + try { + await vbase.fetchUser(); + } catch (e) { + vbase.logout('/login?redirect=' + encodeURIComponent(to.fullPath)); + return false; + } } // Role Check if (roles && roles.length > 0) { - const hasRole = roles.some(role => vbase.hasRole(role)); - if (!hasRole) { - $env.$router.push('/403'); - return false; - } + const hasRole = roles.some(role => vbase.hasRole(role)); + console.log(roles, hasRole, vbase.user) + if (!hasRole) { + // $env.$router.push('/403'); + // return false; + } } } - + next(); }; } diff --git a/ui/page/403.html b/ui/page/403.html index 51061c8..2a4897b 100644 --- a/ui/page/403.html +++ b/ui/page/403.html @@ -34,8 +34,8 @@
403
-
{{ $t('common.forbidden') || 'Access Denied' }}
- {{ $t('nav.home') || 'Go Home' }} +
{{ $t('common.forbidden') }}
+ {{ $t('nav.home') }}
diff --git a/ui/page/404.html b/ui/page/404.html index 439d1b8..eae4a54 100644 --- a/ui/page/404.html +++ b/ui/page/404.html @@ -34,8 +34,8 @@
404
-
{{ $t('common.not_found') || 'Page Not Found' }}
- {{ $t('nav.home') || 'Go Home' }} +
{{ $t('common.not_found') }}
+ {{ $t('nav.home') }}
diff --git a/ui/page/auth/login.html b/ui/page/auth/login.html index e16434f..5ff8172 100644 --- a/ui/page/auth/login.html +++ b/ui/page/auth/login.html @@ -13,45 +13,6 @@ color: var(--color-primary); } - .form-group { - margin-bottom: 15px; - } - - .form-label { - display: block; - margin-bottom: 5px; - font-weight: 500; - } - - .form-input { - width: 100%; - padding: 10px; - border: 1px solid var(--border-color); - border-radius: var(--radius-md); - font-size: 14px; - } - - .form-input:focus { - outline: none; - border-color: var(--color-primary); - } - - .btn-submit { - width: 100%; - padding: 10px; - background-color: var(--color-primary); - color: white; - border: none; - border-radius: var(--radius-md); - cursor: pointer; - font-size: 16px; - transition: background 0.2s; - } - - .btn-submit:hover { - background-color: var(--color-primary-hover); - } - .links { margin-top: 15px; text-align: center; @@ -77,18 +38,11 @@
{{ error }}
-
-
- - -
- -
- - -
- - + + + + + {{ $t('auth.login') }}
diff --git a/ui/page/auth/register.html b/ui/page/auth/register.html index 34999de..08479be 100644 --- a/ui/page/auth/register.html +++ b/ui/page/auth/register.html @@ -11,39 +11,6 @@ margin-bottom: 20px; color: var(--color-primary); } - .form-group { - margin-bottom: 15px; - } - .form-label { - display: block; - margin-bottom: 5px; - font-weight: 500; - } - .form-input { - width: 100%; - padding: 10px; - border: 1px solid var(--border-color); - border-radius: var(--radius-md); - font-size: 14px; - } - .form-input:focus { - outline: none; - border-color: var(--color-primary); - } - .btn-submit { - width: 100%; - padding: 10px; - background-color: var(--color-primary); - color: white; - border: none; - border-radius: var(--radius-md); - cursor: pointer; - font-size: 16px; - transition: background 0.2s; - } - .btn-submit:hover { - background-color: var(--color-primary-hover); - } .links { margin-top: 15px; text-align: center; @@ -66,28 +33,13 @@
{{ error }}
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
+ + + + + - + {{ $t('auth.register') }}
@@ -101,8 +53,7 @@ confirmPassword = ""; error = ""; - handleRegister = async (e) => { - e.preventDefault(); + handleRegister = async () => { error = ""; if (password !== confirmPassword) { @@ -117,9 +68,8 @@ password: password }); - // Redirect to login on success + $message.success($t('auth.register_success')); $router.push('/login'); - $message.success("Registration successful! Please login."); } catch (err) { console.error(err); diff --git a/ui/page/sys/oauth/index.html b/ui/page/sys/oauth/index.html index 6930af4..2d838a7 100644 --- a/ui/page/sys/oauth/index.html +++ b/ui/page/sys/oauth/index.html @@ -1,128 +1,241 @@ + - - {{ $t('nav.oauth') }} - + + {{ $t('nav.oauth') }} + + -
-

{{ $t('nav.oauth') }}

- +
+
+ + {{ $t('nav.oauth') }}
- -
-
-
-
{{ app.name }}
- -
-
ID: {{ app.client_id }}
-
Callback: {{ app.redirect_uri }}
-
+ + + {{ $t('oauth.create_app') }} + +
+ +
+
+
+
{{ app.name }}
+
{{ app.id }}
+
+ +
+ Client ID +
{{ app.client_id }}
+
+ +
+ Redirect URI +
{{ app.redirect_uri }}
+
+ +
+ + + + + + +
+
+ + + +
+ + +
+
+ {{ $t('common.cancel') }} + + {{ isEdit ? $t('common.save') : $t('common.create') }} + +
+ + diff --git a/ui/page/sys/org/detail.html b/ui/page/sys/org/detail.html index 4ead286..17528b0 100644 --- a/ui/page/sys/org/detail.html +++ b/ui/page/sys/org/detail.html @@ -3,7 +3,7 @@ - {{ org ? org.name : ($t('org.detail') || 'Organization Detail') }} + {{ org ? org.name : $t('org.detail') }} + + {{ $t('nav.users') }} + + -
-

{{ $t('nav.users') }}

- +
+
+ + {{ $t('nav.users') }} +
+
+
+ + +
+ + + {{ $t('user.create') }} +
- +
+ +
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
IDUsernameEmailStatusActions
{{ u.id }}{{ u.username }}{{ u.email }}{{ u.status || 'Active' }} - - -
IDUsernameEmailStatusActions
{{ u.id }}{{ u.username }}{{ u.email }} + + {{ u.status === 1 ? 'Active' : 'Inactive' }} + + +
+ + + + + + +
+
+
+ + + +
+ + + +
+
+ {{ $t('common.cancel') }} + + {{ isEdit ? $t('common.save') : $t('common.create') }} + +
+ + diff --git a/ui/page/user/profile.html b/ui/page/user/profile.html index 1f7c5aa..374d3b5 100644 --- a/ui/page/user/profile.html +++ b/ui/page/user/profile.html @@ -1,133 +1,119 @@ + - - {{ $t('user.profile') }} - + + {{ $t('user.profile') }} + + -
-

{{ $t('user.profile') }}

- -
-
- {{ user.username ? user.username.charAt(0).toUpperCase() : 'U' }} -
-
- -
-
- - -
- -
- - -
- -
- - -
- - -
- - +
+

{{ $t('user.profile') }}

+ +
+
+ {{ user.username ? user.username.charAt(0).toUpperCase() : 'U' }} +
+ +
+ + + + + + {{ $t('common.save') }} + +
+ +
+ + {{ $t('auth.logout') }} + +
+
+