Skip to content

Commit 34eea06

Browse files
akhileshdarjeeakhileshdarjee
committed
change password messages updated and fixed for redirection, change password locales updated, bug fixes
1 parent 0f944bc commit 34eea06

File tree

12 files changed

+31
-18
lines changed

12 files changed

+31
-18
lines changed

‎app/Http/Controllers/AppController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function changePassword(Request $request)
5757
$data['msg'] = __('Current Password is invalid');
5858
}
5959
} else {
60-
$data['msg'] = __('Password should be atleast 8 characters including a number, uppercase letter and a lowercase letter and should not contain any blank spaces');
60+
$data['msg'] = __('Password should be at least 8 characters including a number, an uppercase letter and a lowercase letter and should not contain any blank spaces');
6161
}
6262
} else {
6363
$data['msg'] = __('New Password and Confirm New Password does not match');
@@ -70,7 +70,7 @@ public function changePassword(Request $request)
7070
if ($request->ajax()) {
7171
return response()->json($data, 200);
7272
} else {
73-
return redirect()->route('show.app.settings')->with($data);
73+
return back()->with($data);
7474
}
7575
}
7676

‎app/Http/Controllers/CommonController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function createUserSettings($username)
9797
{
9898
$settings = array(
9999
['field_name' => 'home_page', 'field_value' => 'modules', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => Carbon::now('UTC')->format('Y-m-d H:i:s'), "updated_at" => Carbon::now('UTC')->format('Y-m-d H:i:s')],
100-
['field_name' => 'list_view_records', 'field_value' => '15', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => Carbon::now('UTC')->format('Y-m-d H:i:s'), "updated_at" => Carbon::now('UTC')->format('Y-m-d H:i:s')],
100+
['field_name' => 'list_view_records', 'field_value' => '20', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => Carbon::now('UTC')->format('Y-m-d H:i:s'), "updated_at" => Carbon::now('UTC')->format('Y-m-d H:i:s')],
101101
['field_name' => 'theme', 'field_value' => 'light', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => Carbon::now('UTC')->format('Y-m-d H:i:s'), "updated_at" => Carbon::now('UTC')->format('Y-m-d H:i:s')]
102102
);
103103

‎app/Http/Controllers/SettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function save(Request $request)
109109
if ($request->ajax()) {
110110
return response()->json($data, 200);
111111
} else {
112-
return redirect()->route('show.app.settings')->with($data);
112+
return back()->with($data);
113113
}
114114
}
115115

‎app/Http/Middleware/Localization.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function handle($request, Closure $next)
2020
session()->put('locale', auth()->user()->locale);
2121
}
2222

23-
if (session()->has('locale')) {
23+
if (session()->get('locale')) {
2424
app()->setLocale(session()->get('locale'));
2525
}
2626

‎public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"/js/origin/backups.js": "/js/origin/backups.js?id=1a6e72395cc52b9c6f46",
66
"/js/origin/list_view.js": "/js/origin/list_view.js?id=f5fa5be6a397dc558583",
77
"/js/origin/form.js": "/js/origin/form.js?id=44a12482f675871492d5",
8-
"/css/origin/report_view.css": "/css/origin/report_view.css?id=ac85ada4414c7a0be525",
8+
"/css/origin/report_view.css": "/css/origin/report_view.css?id=81a0f9e22b611185cb5b",
99
"/js/origin/report_view.js": "/js/origin/report_view.js?id=2f6085b69d056a74f3f5"
1010
}

‎resources/lang/hi.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"Backup creation failed": "बैकअप निर्माण विफल रहा",
1616
"Backup deleted successfully": "बैकअप सफलतापूर्वक हटा दिया गया",
1717
"Backups": "बैकअप",
18-
"Backups are not enabled. Please enable it from Settings": "बैकअप सक्षम नहीं हैं। कृपया इसे समायोजन से सक्षम करें",
18+
"Backups are not enabled. Please enable it from Settings": "बैकअप सक्षम नहीं हैं। कृपया इसे सेटिंग्स से सक्षम करें",
1919
"Between": "बीच में",
2020
"Cancel filter": "फ़िल्टर रद्द करें",
2121
"Cannot delete system default language: en": "सिस्टम डिफ़ॉल्ट भाषा को हटा नहीं सकता: en",
@@ -25,15 +25,21 @@
2525
"Cannot save translation file. Please try again": "अनुवाद फ़ाइल को सहेज नहीं सकता। कृपया पुन: प्रयास करें",
2626
"Cannot update Module. Please delete and re-create": "मॉड्यूल को अपडेट नहीं किया जा सकता। कृपया हटाएँ और पुनः बनाएँ",
2727
"Change": "बदलें",
28+
"Change Password": "पासवर्ड बदलें",
2829
"Child Table will be shown as Grid in form view": "चाइल्ड टेबल को फॉर्म व्यू में ग्रिड के रूप में दिखाया जाएगा",
2930
"Configuration": "विन्यास",
31+
"Confirm New Password": "पुष्टि नया पासवर्ड",
32+
"Confirm New Password field is required": "पुष्टि नया पासवर्ड फ़ील्ड आवश्यक है",
3033
"Controller Name": "कंट्रलर नाम",
3134
"Copyright": "कॉपीराइट",
3235
"Create": "निर्माण",
3336
"Create Backup": "बैकअप बनाये",
3437
"Create Migration": "प्रवास बनाएँ",
3538
"Created At": "निर्माण समय",
3639
"Creating": "निर्माण हो रहा है",
40+
"Current Password": "वर्तमान पासवर्ड",
41+
"Current Password field is required": "वर्तमान पासवर्ड फ़ील्ड आवश्यक है",
42+
"Current Password is invalid": "वर्तमान पासवर्ड अमान्य है",
3743
"Customization": "अनुकूलन",
3844
"Dark": "डार्क",
3945
"Dark Mode": "डार्क मोड",
@@ -68,6 +74,7 @@
6874
"Form Title": "फॉर्म का शीर्षक",
6975
"From": "से",
7076
"Full Name": "पूरा नाम",
77+
"Global Settings": "वैश्विक सेटिंग्स",
7178
"Guest": "अतिथि",
7279
"Home": "मुख",
7380
"Home Page": "मुख पृष्ठ",
@@ -108,6 +115,10 @@
108115
"Name": "नाम",
109116
"Name of table of your database you want to connect to this Module": "आपके डेटाबेस की टेबल का नाम जिसे आप इस मॉड्यूल से जोड़ना चाहते हैं",
110117
"New": "नया",
118+
"New Password": "नया पासवर्ड",
119+
"New Password & Current Password cannot be same": "नया पासवर्ड और वर्तमान पासवर्ड समान नहीं हो सकता",
120+
"New Password and Confirm New Password does not match": "नया पासवर्ड और पुष्टि नया पासवर्ड मेल नहीं खाता है",
121+
"New Password field is required": "नया पासवर्ड फ़ील्ड आवश्यक है",
111122
"Next": "अगला",
112123
"No": "नहीं",
113124
"No Data": "डेटा उपलब्ध नहीं",
@@ -128,10 +139,13 @@
128139
"Page": "पृष्ठ",
129140
"Page Not Found": "पृष्ठ नहीं मिला",
130141
"Password": "पासवर्ड",
142+
"Password has been changed successfully": "पासवर्ड सफलतापूर्वक बदल दिया गया है",
143+
"Password should be at least 8 characters including a number, an uppercase letter and a lowercase letter and should not contain any blank spaces": "पासवर्ड में कम से कम 8 अक्षर होने चाहिए, जिसमें एक नंबर, एक अपरकेस अक्षर और एक लोअरकेस अक्षर शामिल हैं और इसमें कोई खाली स्थान नहीं होना चाहिए",
131144
"Please attach import template to import data": "कृपया डेटा आयात करने के लिए आयात टेम्पलेट जोडे",
132145
"Please enter": "कृपया दर्ज करें",
133146
"Please enter two-letter ISO 639-1 code": "कृपया दो-अक्षर ISO 639-1 कोड दर्ज करें",
134147
"Please enter two-letter ISO 639-1 code from": "कृपया दो-अक्षर ISO 639-1 कोड दर्ज करें",
148+
"Please provide Current Password, New Password and Confirm New Password": "कृपया वर्तमान पासवर्ड, नया पासवर्ड और पुष्टि नया पासवर्ड प्रदान करें",
135149
"Please provide Language, From & To": "कृपया भाषा, से तथा तक प्रदान करें",
136150
"Please provide Module": "कृपया मॉड्यूल प्रदान करें",
137151
"Please provide backup filename to delete": "कृपया हटाने के लिए बैकअप फ़ाइल नाम प्रदान करें",
@@ -174,7 +188,7 @@
174188
"Selected": "चयनित",
175189
"Separate multiple columns with comma": "कॉमा के साथ कई कॉलम अलग करें",
176190
"Sequence No": "क्रम संख्या",
177-
"Settings": "समायोजन",
191+
"Settings": "सेटिंग्स",
178192
"Should be without spaces and any special characters": "रिक्त स्थान और किसी विशेष वर्ण के बिना होना चाहिए",
179193
"Show": "प्रदर्शन",
180194
"Show filters": "फिल्टर दिखाएं",

‎resources/views/admin/layouts/origin/settings.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</div>
9494
</div>
9595
</form>
96-
<form method="POST" action="{{ route('change.password') }}" name="change-password-form" id="change-password-form" accept-charset="UTF-8">
96+
<form method="POST" action="{{ route('password.change') }}" name="change-password-form" id="change-password-form" accept-charset="UTF-8">
9797
{!! csrf_field() !!}
9898
<div class="card form-section elevation-2" id="password-details">
9999
<div class="card-header">
@@ -153,7 +153,7 @@
153153
<div class="row">
154154
<div class="col-md-12">
155155
<small class="text-muted">
156-
{{ __('Password should be atleast 8 characters including a number, uppercase letter and a lowercase letter and should not contain any blank spaces') }}
156+
{{ __('Password should be at least 8 characters including a number, an uppercase letter and a lowercase letter and should not contain any blank spaces') }}
157157
</small>
158158
</div>
159159
</div>

‎resources/views/admin/templates/headers.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
33
<meta http-equiv="Content-Language" content="{{ app()->getLocale() }}">
44
<meta http-equiv="X-UA-Compatible" content="IE=edge">
5-
<meta name="referrer" content="origin">
65
<meta name="description" content="{{ config('app.brand.name') }}">
76
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
87
<meta name="csrf-token" content="{{ csrf_token() }}">

‎resources/views/admin/templates/navbar.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
<div class="collapse navbar-collapse order-3" id="navbarCollapse">
1717
<ul class="navbar-nav">
1818
<li class="nav-item app-nav text-center">
19-
<a href="{{ route('show.app.modules') }}" class="nav-link" title="{{ __('Modules') }}">
19+
<a class="nav-link" href="{{ route('show.app.modules') }}" title="{{ __('Modules') }}">
2020
<i class="fas fa-gem fa-sm"></i> {{ __('Modules') }}
2121
</a>
2222
</li>
2323
<li class="nav-item app-nav text-center">
24-
<a href="{{ route('show.app.reports') }}" class="nav-link" title="{{ __('Reports') }}">
24+
<a class="nav-link" href="{{ route('show.app.reports') }}" title="{{ __('Reports') }}">
2525
<i class="fas fa-sitemap fa-sm"></i> {{ __('Reports') }}
2626
</a>
2727
</li>
2828
@if (auth()->user()->role == "Administrator" && auth()->user()->username == "admin")
2929
<li class="nav-item app-nav text-center">
30-
<a href="{{ route('show.app.backups') }}" class="nav-link" title="{{ __('Backups') }}">
30+
<a class="nav-link" href="{{ route('show.app.backups') }}" title="{{ __('Backups') }}">
3131
<i class="fas fa-hdd fa-sm"></i> {{ __('Backups') }}
3232
</a>
3333
</li>

‎resources/views/auth/passwords/email.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@endif
3737
{!! csrf_field() !!}
3838
<div class="form-group mb-3">
39-
<input type="text" class="form-control" name="email" placeholder="{{ __('Email Address') }}" />
39+
<input type="email" class="form-control" name="email" placeholder="{{ __('Email Address') }}" />
4040
</div>
4141
<div class="row">
4242
<div class="col-12">

‎resources/views/auth/passwords/reset.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<input type="hidden" name="token" value="{{ $token }}">
3939
<div class="form-group mb-3">
4040
@if ($email)
41-
<input type="text" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="{{ $email }}" required autofocus readonly>
41+
<input type="email" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="{{ $email }}" required autofocus readonly>
4242
@else
43-
<input type="text" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="" required autofocus>
43+
<input type="email" name="email" class="form-control" placeholder="{{ __('Email Address') }}" value="" required autofocus>
4444
@endif
4545
</div>
4646
<div class="form-group mb-3">

‎routes/web.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
Route::get('/app/activity', 'ActivityController@show')->name('show.app.activity');
4141
Route::get('/app/settings', 'SettingsController@show')->name('show.app.settings');
4242
Route::post('/app/settings', 'SettingsController@save')->name('save.app.settings');
43-
Route::post('/app/change-password', 'AppController@changePassword')->name('change.password');
43+
Route::post('/app/change-password', 'AppController@changePassword')->name('password.change');
4444
Route::post('/update-module-sequence', 'ModuleController@updateSequence')->name('update.module.sequence');
4545
Route::post('/import-from-csv', 'ImportController@import')->name('import.from.csv');
4646
Route::post('/update-list-sorting', 'ListViewController@updateSorting')->name('update.list.sorting');

0 commit comments

Comments
 (0)