Skip to content

Commit f6bb267

Browse files
integrated AdminLTE 3.1 in frontend UI
1 parent d6e9251 commit f6bb267

File tree

2,039 files changed

+718383
-23327
lines changed

Some content is hidden

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

2,039 files changed

+718383
-23327
lines changed

app/Http/Controllers/BackupController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function show(Request $request)
5757
});
5858

5959
foreach ($backups as $idx => $backup) {
60-
$backups[$idx]['date'] = Carbon::createFromTimestamp($backup['date'])->format('d-m-Y h:i A');
60+
$backups[$idx]['date'] = Carbon::createFromTimestamp($backup['date'], 'UTC')->format('d-m-Y h:i A');
6161
}
6262

6363
$backups = collect($backups)->values();
@@ -92,7 +92,7 @@ public function download(Request $request, $name)
9292
if ($name) {
9393
$activity_data = [
9494
'module' => 'Backup',
95-
'icon' => 'fa fa-hdd-o'
95+
'icon' => 'fas fa-hdd'
9696
];
9797

9898
if (file_exists(storage_path('app/backups/' . $name . '.sql'))) {
@@ -129,7 +129,7 @@ public function delete(Request $request, $name)
129129
if ($name) {
130130
$activity_data = [
131131
'module' => 'Backup',
132-
'icon' => 'fa fa-hdd-o'
132+
'icon' => 'fas fa-hdd'
133133
];
134134

135135
if (file_exists(storage_path('app/backups/' . $name . '.sql'))) {
@@ -197,7 +197,7 @@ public function create(Request $request)
197197

198198
$activity_data = [
199199
'module' => 'Backup',
200-
'icon' => 'fa fa-hdd-o',
200+
'icon' => 'fas fa-hdd',
201201
'form_title' => $type
202202
];
203203

app/Http/Controllers/CommonController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public function saveActivity($data, $action)
1616
if (auth()->user()) {
1717
if ($action == "Login") {
1818
$data['module'] = 'Auth';
19-
$data['icon'] = 'fa fa-sign-in';
19+
$data['icon'] = 'fas fa-sign-in-alt';
2020
} elseif ($action == "Logout") {
2121
$data['module'] = 'Auth';
22-
$data['icon'] = 'fa fa-sign-out';
22+
$data['icon'] = 'fas fa-sign-out-alt';
2323
}
2424

2525
$data['action'] = $action;

app/Http/Controllers/ReportController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function downloadReport($report_name, $columns, $rows, $format, $action =
122122

123123
$activity_data = [
124124
'module' => 'Report',
125-
'icon' => 'fa fa-download',
125+
'icon' => 'fas fa-download',
126126
'form_title' => awesome_case($report_name)
127127
];
128128

app/Http/Controllers/SettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function show()
1919
'form_data' => isset($data) ? $data : [],
2020
'form_title' => 'Settings',
2121
'title' => 'Settings',
22-
'icon' => 'fa fa-cogs',
22+
'icon' => 'fas fa-cogs',
2323
'file' => 'layouts.origin.settings',
2424
'module' => 'Settings',
2525
'slug' => 'settings',

database/seeds/ModuleSeeder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public function run()
1717
'name' => 'Module', 'display_name' => 'Module', 'table_name' => 'oc_modules', 'sequence_no' => 1,
1818
'controller_name' => 'ModuleController', 'slug' => 'module', 'show' => 1, 'bg_color' => '#1ab394',
1919
'list_view_columns' => 'display_name, table_name, controller_name, slug, active',
20-
'icon' => 'fa fa-diamond', 'icon_color' => '#ffffff', 'form_title' => 'display_name',
20+
'icon' => 'fas fa-gem', 'icon_color' => '#ffffff', 'form_title' => 'display_name',
2121
'image_field' => null, 'owner' => 'admin', 'last_updated_by' => 'admin',
2222
'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')
2323
],
2424
[
2525
'name' => 'User', 'display_name' => 'User', 'table_name' => 'oc_users', 'sequence_no' => 2,
2626
'controller_name' => 'UserController', 'slug' => 'user', 'show' => 1, 'bg_color' => '#d35400',
2727
'list_view_columns' => 'avatar, username, full_name, role, active',
28-
'icon' => 'fa fa-user', 'icon_color' => '#ffffff', 'form_title' => 'username',
28+
'icon' => 'fas fa-user', 'icon_color' => '#ffffff', 'form_title' => 'username',
2929
'image_field' => 'avatar', 'owner' => 'admin', 'last_updated_by' => 'admin',
3030
'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')
3131
],

public/css/all.css

100755100644
Lines changed: 14 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/origin/report_view.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-132 KB
Binary file not shown.
131 KB
Binary file not shown.

public/fonts/font-awesome/fa-brands-400.svg

Lines changed: 3717 additions & 0 deletions
Loading
131 KB
Binary file not shown.
87.9 KB
Binary file not shown.
75 KB
Binary file not shown.
33.2 KB
Binary file not shown.

public/fonts/font-awesome/fa-regular-400.svg

Lines changed: 801 additions & 0 deletions
Loading
32.9 KB
Binary file not shown.
15.9 KB
Binary file not shown.
Binary file not shown.
198 KB
Binary file not shown.

public/fonts/font-awesome/fa-solid-900.svg

Lines changed: 5034 additions & 0 deletions
Loading
198 KB
Binary file not shown.
99.3 KB
Binary file not shown.
76.4 KB
Binary file not shown.
Binary file not shown.

public/fonts/font-awesome/fontawesome-webfont.svg

Lines changed: 0 additions & 2671 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

public/js/all.js

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/origin/activity.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/origin/backups.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/origin/form.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)