Skip to content

Develop #294

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

Merged
CropWatchDevelopment merged 4 commits into from
Jul 14, 2025
Merged

Develop #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8befd1
working sidebar logout finally
CropWatchDevelopment Jul 14, 2025
924fe1f
testing
CropWatchDevelopment Jul 14, 2025
6e5254c
removed annoying google login error message that was a false positive
CropWatchDevelopment Jul 14, 2025
4ff0dde
fixed bad import
CropWatchDevelopment Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/lib/components/GlobalSidebar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,22 @@
<!-- Navigation Items -->
<nav class="z-10 flex flex-1 flex-col overflow-y-auto pr-2" style="z-index: 10000;">
<ul class="space-y-1">
{#if !sidebarStore.isOpen}
<li class="mx-3 border-t {getDarkMode() ? 'border-slate-500/30' : 'border-gray-200/30'}">
<a
onclick={() => {
sidebarStore.toggle();
startLoading();
}}
class="flex items-center justify-center rounded-lg p-2 transition-all duration-200 hover:scale-105
{getDarkMode()
? 'text-slate-400 hover:bg-slate-700/50 hover:text-white'
: 'text-gray-500 hover:bg-gray-100 hover:text-gray-900'}"
>
<MaterialIcon name="menu" size="medium" />
</a>
</li>
{/if}
{#each navigationItems as item, index}
<li>
<a
Expand Down Expand Up @@ -209,23 +225,19 @@
{/each}
</ul>
<span class="flex flex-auto"></span>
<button
onclick={handleLogout}
class="flex items-center gap-3 rounded-lg px-3 py-2 transition-colors duration-200
{#if sidebarStore.isOpen}
<button
onclick={handleLogout}
class="flex items-center gap-3 rounded-lg px-3 py-2 transition-colors duration-200
{getDarkMode() ? 'bg-emerald-600/30 text-emerald-400' : 'bg-emerald-100 text-emerald-700'}
{getDarkMode()
? 'text-slate-300 hover:bg-slate-700/50 hover:text-white'
: 'text-gray-700 hover:bg-gray-100 hover:text-gray-900'}"
>
<!-- {#if sidebarStore.isOpen}
<MaterialIcon name="arrow_menu_close" size="medium" />
<span class="font-medium">{$_('Close')}</span>
{:else}
<MaterialIcon name="arrow_menu_open" size="medium" />
{/if} -->
<MaterialIcon name="logout" size="medium" />
{$_('Logout')}
</button>
? 'text-slate-300 hover:bg-slate-700/50 hover:text-white'
: 'text-gray-700 hover:bg-gray-100 hover:text-gray-900'}"
>
<MaterialIcon name="logout" size="medium" />
{$_('Logout')}
</button>
{/if}
<ul class="space-y-1">
<li class="mx-3 border-t {getDarkMode() ? 'border-slate-500/30' : 'border-gray-200/30'}"></li>
<li>
Expand Down
26 changes: 26 additions & 0 deletions src/lib/i18n/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,32 @@ export const strings = {
'An unexpected error occurred. Please try again.',
'Registration failed. Please try again.': 'Registration failed. Please try again.',

// Password Reset/Update
'Forgot Password': 'Forgot Password',
'Reset Password': 'Reset Password',
'Update Password': 'Update Password',
'New Password': 'New Password',
'Confirm New Password': 'Confirm New Password',
'Enter your new password': 'Enter your new password',
'Confirm your new password': 'Confirm your new password',
'Minimum 8 characters required': 'Minimum 8 characters required',
'Please enter your new password below.': 'Please enter your new password below.',
'Your password has been successfully updated!': 'Your password has been successfully updated!',
'You can now log in with your new password.': 'You can now log in with your new password.',
'Go to login': 'Go to login',
'Updating Password...': 'Updating Password...',
'Password updated successfully! You can now log in with your new password.':
'Password updated successfully! You can now log in with your new password.',
'Failed to update password': 'Failed to update password',
"Enter your email address and we'll send you a link to reset your password.":
"Enter your email address and we'll send you a link to reset your password.",
'Send reset link': 'Send reset link',
'Sending...': 'Sending...',
'Password reset link sent to your email.': 'Password reset link sent to your email.',
'Back to login': 'Back to login',
'If an account exists with the email': 'If an account exists with the email',
"you'll receive a password reset link shortly.": "you'll receive a password reset link shortly.",

// Header
'IoT Dashboard': 'IoT Dashboard',
Welcome: 'Welcome',
Expand Down
25 changes: 23 additions & 2 deletions src/lib/i18n/locales/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,29 @@ export const strings = {
forgot_password: 'パスワードを忘れた',
'Reset Password': 'パスワードをリセット',
reset_password: 'パスワードをリセット',
'Update Password': 'パスワードを更新',
'New Password': '新しいパスワード',
'Confirm New Password': '新しいパスワードを確認',
'Enter your new password': '新しいパスワードを入力してください',
'Confirm your new password': '新しいパスワードを確認してください',
'Minimum 8 characters required': '最低8文字が必要です',
'Please enter your new password below.': '下に新しいパスワードを入力してください。',
'Your password has been successfully updated!': 'パスワードが正常に更新されました！',
'You can now log in with your new password.': '新しいパスワードでログインできます。',
'Go to login': 'ログインに移動',
'Updating Password...': 'パスワード更新中...',
'Password updated successfully! You can now log in with your new password.':
'パスワードが正常に更新されました！新しいパスワードでログインできます。',
'Failed to update password': 'パスワードの更新に失敗しました',
"Enter your email address and we'll send you a link to reset your password.":
'メールアドレスを入力していただければ、パスワードリセット用のリンクをお送りします。',
'Send reset link': 'リセットリンクを送信',
'Sending...': '送信中...',
'Password reset link sent to your email.': 'パスワードリセットリンクがメールに送信されました。',
'Back to login': 'ログインに戻る',
'If an account exists with the email': 'メールでアカウントが存在する場合',
"you'll receive a password reset link shortly.":
'まもなくパスワードリセットリンクを受け取ります。',
Email: 'メール',
email: 'メール',
password: 'パスワード',
Expand Down Expand Up @@ -410,8 +433,6 @@ export const strings = {
'Back to Devices': 'デバイス一覧に戻る',
'Contact Support': 'サポートに連絡',
'Go to Device Settings': 'デバイス設定へ',
'Send reset link': '📧 パスワードリセットリンクを送信',
'Back to login': 'ログインに戻る',
'Authentication Error': '認証エラー',
'There was a problem with your authentication request. Please try signing in again on the login page. If you continue to experience issues, please contact our support team for additional help.':
'認証リクエストに問題が発生しました。再度ログインページからサインインしてください。問題が解決しない場合は、サポートチームまでご連絡ください。',
Expand Down
Loading