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.

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

Admin change password issue fixed #595

Merged
merged 3 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions app/Http/Controllers/Backend/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@ public function changePasswordUpdate(Request $request, $id)
$module_model = $this->module_model;
$module_name_singular = Str::singular($module_name);

$module_action = 'Change Password Update';

if (! auth()->user()->can('edit_users')) {
$id = auth()->user()->id;
}
Expand Down
19 changes: 19 additions & 0 deletions lang/bn.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
{
"Home": "প্রথম পাতা",
"Contact": "যোগাযোগ",
"Login": "লগইন",
"Log in": "লগইন",
"Register": "নিবন্ধন",

"About": "আমাদের সম্পর্কে",
"Privacy": "গোপনীয়তা",
"Terms": "শর্তসমূহ",
"FAQs": "বজিপ্র",
"FAQ": "বজিপ্র",

"Remember me": "লগইন মনে রাখুন",
"Forgot your password?": "পাসওয়ার্ড ভুলে গিয়েছেন?",
"Create an account?": "অ্যাকাউন্ট তৈরী করবেন?",
"Already registered?": "আগে নিবন্ধন করেছেন? লগইন করুন",
"Email Password Reset Link": "পাসওয়ার্ড রিসেট লিংক ইমেইল করুন",

"Welcome to": ":name অ্যাডমিন ড্যাশবোর্ডে স্বাগতম",
"Dashboard": "ড্যাশবোর্ড",
"Admin Dashboard": "অ্যাডমিন ড্যাশবোর্ড",
Expand All @@ -7,6 +25,7 @@
"Email": "ইমেইল",
"Password": "পাসওয়ার্ড",
"Password Confirmation": "পাসওয়ার্ড (পুনরায়)",
"Confirm Password": "পাসওয়ার্ড (পুনরায়)",

"Value": "Value",
"Index": "Index",
Expand Down
1 change: 1 addition & 0 deletions public/build/assets/app-frontend-94qmPxMy.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/assets/app-frontend-z-gZaMA-.css

This file was deleted.

2 changes: 1 addition & 1 deletion public/build/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2"
},
"resources/css/app-frontend.css": {
"file": "assets/app-frontend-z-gZaMA-.css",
"file": "assets/app-frontend-94qmPxMy.css",
"src": "resources/css/app-frontend.css",
"isEntry": true
},
Expand Down
32 changes: 16 additions & 16 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@
<!-- Email Address -->
<div>
<x-input-label for="email" :value="__('Email')" />
<x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="email" />
<x-input-error :messages="$errors->get('email')" class="mt-2" />
<x-text-input class="mt-1 block w-full" id="email" name="email" type="email" :value="old('email')" required
autocomplete="email" />
<x-input-error class="mt-2" :messages="$errors->get('email')" />
</div>

<!-- Password -->
<div class="mt-4">
<x-input-label for="password" :value="__('Password')" />

<x-text-input id="password" class="block mt-1 w-full"
type="password"
name="password"
required autocomplete="current-password" />

<x-input-error :messages="$errors->get('password')" class="mt-2" />
<x-text-input class="mt-1 block w-full" id="password" name="password" type="password" required
autocomplete="current-password" />
<x-input-error class="mt-2" :messages="$errors->get('password')" />
</div>

<!-- Remember Me -->
<div class="block mt-4">
<label for="remember_me" class="inline-flex items-center">
<input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
<div class="mt-4 block">
<label class="inline-flex items-center" for="remember_me">
<input
class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800"
id="remember_me" name="remember" type="checkbox">
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
</label>
</div>

<div class="flex items-center justify-end mt-4">
<div class="mt-4 flex items-center justify-end">
@if (Route::has('password.request'))
<a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('password.request') }}">
<a class="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:text-gray-400 dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
href="{{ route('password.request') }}">
{{ __('Forgot your password?') }}
</a>
@endif
Expand All @@ -44,8 +44,8 @@
</x-primary-button>
</div>
</form>

<div class="py-2 text-gray-600 dark:text-gray-400">
Create an account? <a href="{{ route('register') }}" class="underline">Register</a>
{{ __('Create an account?') }} <a class="underline" href="{{ route('register') }}">{{ __('Register') }}</a>
</div>
</x-guest-layout>
13 changes: 5 additions & 8 deletions resources/views/frontend/includes/footer.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,19 @@
</p>
<ul class="mb-6 flex flex-wrap items-center justify-center text-gray-900 dark:text-white">
<li>
<a class="mr-4 hover:underline md:mr-6" href="#">About</a>
<a class="mx-2 hover:underline md:mx-3" href="#">@lang('About')</a>
</li>
<li>
<a class="mr-4 hover:underline md:mr-6" href="#">Blog</a>
<a class="mx-2 hover:underline md:mx-3" href="{{ route('privacy') }}" wire:navigate.hover>@lang('Privacy')</a>
</li>
<li>
<a class="mr-4 hover:underline md:mr-6" href="{{ route('privacy') }}" wire:navigate.hover>Privacy</a>
<a class="mx-2 hover:underline md:mx-3" href="{{ route('terms') }}" wire:navigate.hover>@lang('Terms')</a>
</li>
<li>
<a class="mr-4 hover:underline md:mr-6" href="{{ route('terms') }}" wire:navigate.hover>Terms</a>
<a class="mx-2 hover:underline md:mx-3" href="#">@lang('FAQs')</a>
</li>
<li>
<a class="mr-4 hover:underline md:mr-6" href="#">FAQs</a>
</li>
<li>
<a class="mr-4 hover:underline md:mr-6" href="#">Contact</a>
<a class="mx-2 hover:underline md:mx-3" href="#">@lang('Contact')</a>
</li>
</ul>

Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -740,9 +740,9 @@ jquery@^3.7.1:
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==

laravel-vite-plugin@^1.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz#97575181a1f870532b39ab3b423b53f01385feba"
integrity sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==
version "1.0.3"
resolved "https://registry.yarnpkg.com/laravel-vite-plugin/-/laravel-vite-plugin-1.0.3.tgz#76b33b11535cccd6612de178289e9c2ea4ede933"
integrity sha512-PIAOwL50f7GtC6rE7yfPf/35ho8Yd5GjVosfP/mEw1P9g2Pkz5TYkHpm2RdCYTqhohPd4WIsa1RutxJf0xIBEg==
dependencies:
picocolors "^1.0.0"
vite-plugin-full-reload "^1.1.0"
Expand Down
Loading