Skip to content

Commit 9f36ea7

Browse files
bvipulbvipul
authored
Mailables (#278)
* removed generator resources/vendor files * resolved html flash <br/> in validation messages issue * updated fronted account section to remove address, state, city, ssn and zipcode as we are not using it anywhere * Changes in Role Module * Permission API Changes * Add User's permission in Custom claims * Modified the Blogs Request on web and api to check for publish_datetime #250 Fixed style CI issues * removed generator resources/vendor files * resolved html flash <br/> in validation messages issue * updated fronted account section to remove address, state, city, ssn and zipcode as we are not using it anywhere * Modified the Blogs Request on web and api to check for publish_datetime #250 Fixed style CI issues * Fixed Menu issue * fixed table names from faqs repository * Bug fixes (#255) * removed generator resources/vendor files * resolved html flash <br/> in validation messages issue * updated fronted account section to remove address, state, city, ssn and zipcode as we are not using it anywhere * Modified the Blogs Request on web and api to check for publish_datetime #250 Fixed style CI issues * Fixed Menu issue * Update README.md * fixed table names from faqs repository * Email Templates as a file (#260) * Update README.md * from one line to view format * change in vue version * view file for email template * Changes in Template styling and usage of non-static values in template.blade.php * Email templates abatra (#263) * from one line to view format * change in vue version * view file for email template * Implaement Responsive Email Template * Update package.json * Removed mjml dependency * Add Dynamic Confirmation Link * upgrade to laravel5.7 * upgrade npm * Adding analytics for dashboard * Apply fixes from StyleCI * 1. Fixed Pages Api bug. 2. Added Email Template Mailable for Forgot Password. 3. Added Email Template Mailable for Reset Password. 4. Added Email Template Mailable for Change Password. 5. Updated email template css. * Fixed StyleCI issues * Fixed StyleCI issues
1 parent 553fde6 commit 9f36ea7

File tree

64 files changed

+5127
-10130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+5127
-10130
lines changed

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
APP_NAME="Laravel Admin Panel"
2+
APP_SHORT_NAME="LAP"
23
APP_ENV=local
34
APP_KEY=base64:O+TrollIDwasHEREtMG9kBc+/Q32exQLusNVhnq558w=
45
APP_DEBUG=true

‎app/Http/Controllers/Api/V1/BlogsController.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,15 @@ public function validateBlog(Request $request, $action = 'insert')
121121
{
122122
$featured_image = ($action == 'insert') ? 'required' : '';
123123

124+
$publish_datetime = $request->publish_datetime !== '' ? 'required|date' : 'required';
125+
124126
$validation = Validator::make($request->all(), [
125-
'name' => 'required|max:191',
126-
'featured_image' => $featured_image,
127-
'content' => 'required',
128-
'categories' => 'required',
129-
'tags' => 'required',
127+
'name' => 'required|max:191',
128+
'featured_image' => $featured_image,
129+
'publish_datetime' => $publish_datetime,
130+
'content' => 'required',
131+
'categories' => 'required',
132+
'tags' => 'required',
130133
]);
131134

132135
return $validation;

‎app/Http/Controllers/Api/V1/PagesController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function index(Request $request)
3131
{
3232
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
3333
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
34-
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
34+
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : config('module.pages.table', 'pages').'created_at';
3535

3636
return PagesResource::collection(
3737
$this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)

‎app/Http/Controllers/Backend/DashboardController.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use App\Models\Access\Permission\Permission;
77
use App\Models\Access\Role\Role;
88
use App\Models\Access\User\User;
9+
use App\Models\Settings\Setting;
910
use Illuminate\Http\Request;
1011

1112
/**
@@ -18,7 +19,10 @@ class DashboardController extends Controller
1819
*/
1920
public function index()
2021
{
21-
return view('backend.dashboard');
22+
$settingData = Setting::first();
23+
$google_analytics = $settingData->google_analytics;
24+
25+
return view('backend.dashboard', compact('google_analytics', $google_analytics));
2226
}
2327

2428
/**

‎app/Http/Controllers/Frontend/Auth/ResetPasswordController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,12 @@ protected function validationErrorMessages()
9595
/**
9696
* Get the response for a successful password reset.
9797
*
98-
* @param string $response
98+
* @param \Illuminate\Http\Request $request
99+
* @param string $response
99100
*
100101
* @return \Illuminate\Http\RedirectResponse
101102
*/
102-
protected function sendResetResponse($response)
103+
protected function sendResetResponse($request, $response)
103104
{
104105
return redirect()->route(homeRoute())->withFlashSuccess(trans($response));
105106
}

‎app/Http/Requests/Backend/Blogs/StoreBlogsRequest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ public function authorize()
2727
public function rules()
2828
{
2929
return [
30-
'name' => 'required|max:191',
31-
'featured_image' => 'required',
32-
'content' => 'required',
33-
'categories' => 'required',
34-
'tags' => 'required',
30+
'name' => 'required|max:191',
31+
'featured_image' => 'required',
32+
'publish_datetime' => 'required|date',
33+
'content' => 'required',
34+
'categories' => 'required',
35+
'tags' => 'required',
3536
];
3637
}
3738

‎app/Http/Requests/Backend/Blogs/UpdateBlogsRequest.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ public function authorize()
2727
public function rules()
2828
{
2929
return [
30-
'name' => 'required|max:191|unique:blogs,name,'.$this->segment(3),
31-
'content' => 'required',
32-
'categories' => 'required',
33-
'tags' => 'required',
30+
'name' => 'required|max:191|unique:blogs,name,'.$this->segment(3),
31+
'publish_datetime' => 'required|date',
32+
'content' => 'required',
33+
'categories' => 'required',
34+
'tags' => 'required',
3435
];
3536
}
3637

‎app/Http/Requests/Frontend/User/UpdateProfileRequest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ public function rules()
3131
'first_name' => 'required|max:255',
3232
'last_name' => 'required|max:255',
3333
'email' => ['sometimes', 'required', 'email', 'max:255', Rule::unique('users')],
34-
'state_id' => 'required',
35-
'city_id' => 'required',
36-
'zip_code' => 'required',
37-
'ssn' => 'required',
3834
];
3935
}
4036
}

‎app/Http/Resources/PermissionResource.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public function toArray($request)
2020
'name' => $this->name,
2121
'display_name' => $this->display_name,
2222
'sort' => $this->sort,
23-
'registered_at' => $this->created_at->toIso8601String(),
24-
'last_updated_at' => $this->updated_at->toIso8601String(),
23+
'created_at' => $this->created_at->toIso8601String(),
24+
'updated_at' => $this->updated_at->toIso8601String(),
2525

2626
];
2727
}

‎app/Http/Resources/RoleResource.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public function toArray($request)
2222
'number_of_users' => $this->users->count(),
2323
'sort' => $this->sort,
2424
'status' => $this->status,
25-
'registered_at' => $this->created_at->toIso8601String(),
26-
'last_updated_at' => $this->updated_at->toIso8601String(),
25+
'created_at' => $this->created_at->toIso8601String(),
26+
'updated_at' => $this->updated_at->toIso8601String(),
2727
];
2828
}
2929
}

0 commit comments

Comments
 (0)