Skip to content

Commit d7dd82f

Browse files
akhileshdarjeeakhileshdarjee
committed
bug fixes, optimizations, UI responsive fixes, added dark theme, more awesomeness
1 parent 4217030 commit d7dd82f

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

+1000
-695
lines changed

‎app/Console/Commands/OriginBackup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function handle()
8585
$this->error('Backups are not enabled. Please enable it from Settings');
8686
}
8787
} catch (ProcessFailedException $e) {
88-
logger()->error('Backup process failed: ' . $e->getMessage());
88+
logger()->error('Backup process failed: ' . str_replace("'", "", $e->getMessage()));
8989
$this->error('Backup process has been failed.');
9090
}
9191
}

‎app/Http/Controllers/ActivityController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function show(Request $request)
3737
}
3838
}
3939

40-
return view('layouts.origin.activity', compact('modules'));
40+
return view('admin.layouts.origin.activity', compact('modules'));
4141
}
4242
}
4343

@@ -90,7 +90,7 @@ public function getAllowedModuleRecordIds($modules)
9090
$allowed_records[$module_name] = $form_ids;
9191
}
9292
catch (Exception $e) {
93-
$error_msg .= $e->getMessage();
93+
$error_msg .= str_replace("'", "", $e->getMessage());
9494
continue;
9595
}
9696
}

‎app/Http/Controllers/AppController.php

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,49 @@ public function showHome()
2121
return redirect()->route($app_page);
2222
}
2323
}
24+
25+
public function editorUpload(Request $request)
26+
{
27+
if ($request->ajax()) {
28+
$messages = [
29+
'required' => __('Please provide image'),
30+
'image' => __('Please upload valid image file')
31+
];
32+
33+
$validator = Validator::make($request->all(), [
34+
'image' => 'required|image',
35+
], $messages);
36+
37+
if ($validator->fails()) {
38+
$data = [
39+
'success' => false,
40+
'message' => $validator->messages()->first()
41+
];
42+
} else {
43+
$file_name = $request->file('image')->hashName();
44+
45+
$upload_path = $request->file('image')->storeAs(
46+
'uploads/editor_uploads', $file_name, 'public'
47+
);
48+
49+
if ($upload_path) {
50+
$data = [
51+
'success' => true,
52+
'file' => asset('storage/uploads/editor_uploads/' . $file_name)
53+
];
54+
} else {
55+
$data = [
56+
'success' => false,
57+
'message' => __('Cannot save image. Please try again')
58+
];
59+
}
60+
}
61+
} else {
62+
$data = [
63+
'message' => __('Please upload the image from Ajax method'),
64+
];
65+
}
66+
67+
return response()->json($data, 200);
68+
}
2469
}

‎app/Http/Controllers/AutocompleteController.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ public function getData(Request $request)
9898
if ($data) {
9999
foreach ($data as $idx => $record) {
100100
foreach ($record as $column => $value) {
101-
$data[$idx]->{$column} = strval($value);
102-
103101
if ($column == $field[0] && !strval($value)) {
104102
unset($data[$idx]);
103+
break;
105104
}
105+
106+
$data[$idx]->{$column} = strval($value);
106107
}
107108
}
108109
}
@@ -137,6 +138,12 @@ public function getUniverseResults($query)
137138
'value' => __($config['display_name']) . ' ' . __('List'),
138139
'redirect_to' => route('show.list', $config['slug'])
139140
]);
141+
142+
array_push($allowed_modules, [
143+
'label' => __('New') . ' <b>' . __($config['display_name']) . '</b>',
144+
'value' => __('New') . ' ' . __($config['display_name']),
145+
'redirect_to' => route('new.doc', $config['slug'])
146+
]);
140147
}
141148
} else {
142149
$role_modules = $this->roleWiseModules(auth()->user()->role, "Read");
@@ -149,6 +156,12 @@ public function getUniverseResults($query)
149156
'value' => __($config['display_name']) . ' ' . __('List'),
150157
'redirect_to' => route('show.list', $config['slug'])
151158
]);
159+
160+
array_push($allowed_modules, [
161+
'label' => __('New') . ' <b>' . __($config['display_name']) . '</b>',
162+
'value' => __('New') . ' ' . __($config['display_name']),
163+
'redirect_to' => route('new.doc', $config['slug'])
164+
]);
152165
}
153166
}
154167
}

‎app/Http/Controllers/BackupController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function show(Request $request)
7171
if ($request->ajax()) {
7272
return response()->json(['backups' => $paginator], 200);
7373
} else {
74-
return view('layouts.origin.backups');
74+
return view('admin.layouts.origin.backups');
7575
}
7676
}
7777

‎app/Http/Controllers/CommonController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function createUserSettings($username)
9696
$settings = array(
9797
['field_name' => 'home_page', 'field_value' => 'modules', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => date("Y-m-d H:i:s"), "updated_at" => date("Y-m-d H:i:s")],
9898
['field_name' => 'list_view_records', 'field_value' => '15', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => date("Y-m-d H:i:s"), "updated_at" => date("Y-m-d H:i:s")],
99-
['field_name' => 'display_type', 'field_value' => 'comfortable', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => date("Y-m-d H:i:s"), "updated_at" => date("Y-m-d H:i:s")]
99+
['field_name' => 'theme', 'field_value' => 'light', 'module' => 'Other', 'owner' => $username, 'last_updated_by' => $username, 'created_at' => date("Y-m-d H:i:s"), "updated_at" => date("Y-m-d H:i:s")]
100100
);
101101

102102
DB::table('oc_settings')->insert($settings);
@@ -131,7 +131,7 @@ public function getAppModules()
131131

132132
$app_modules[$module->name]['link_field'] = 'id';
133133
$app_modules[$module->name]['link_field_label'] = 'ID';
134-
$app_modules[$module->name]['view'] = 'layouts.modules.' . $module->slug;
134+
$app_modules[$module->name]['view'] = 'admin.layouts.modules.' . $module->slug;
135135
$app_modules[$module->name]['upload_folder'] = '/uploads/' . $module->slug;
136136
}
137137

‎app/Http/Controllers/FormController.php

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ public function showForm($module, $user_role)
120120
$fetch_field = '';
121121

122122
foreach (array_values($foreign_table) as $index => $table_name) {
123+
$foreign_alias = explode(' as ', $table_name);
124+
$foreign_alias = array_map('trim', $foreign_alias);
123125
$foreign_key = $child_foreign_map[$child_table][$table_name]['foreign_key'];
124126
$foreign_field = $child_foreign_map[$child_table][$table_name]['fetch_field'];
125127

@@ -129,16 +131,28 @@ public function showForm($module, $user_role)
129131
$fetch_field .= $foreign_field . ',';
130132
}
131133

132-
$data_query = $data_query
133-
->leftJoin($table_name, $child_table.'.'.$foreign_key, '=', $table_name.'.id');
134+
if (count($foreign_alias) == 2) {
135+
$data_query = $data_query
136+
->leftJoin($table_name, $child_table.'.'.$foreign_key, '=', $foreign_alias[1].'.id');
137+
} else {
138+
$data_query = $data_query
139+
->leftJoin($table_name, $child_table.'.'.$foreign_key, '=', $table_name.'.id');
140+
}
134141
}
135142
} else {
136143
$foreign_table = $foreign_table[0];
144+
$foreign_alias = explode(' as ', $foreign_table);
145+
$foreign_alias = array_map('trim', $foreign_alias);
137146
$foreign_key = $child_foreign_map[$child_table][$foreign_table]['foreign_key'];
138147
$fetch_field = $child_foreign_map[$child_table][$foreign_table]['fetch_field'];
139148

140-
$data_query = $data_query
141-
->leftJoin($foreign_table, $child_table.'.'.$foreign_key, '=', $foreign_table.'.id');
149+
if (count($foreign_alias) == 2) {
150+
$data_query = $data_query
151+
->leftJoin($foreign_table, $child_table.'.'.$foreign_key, '=', $foreign_alias[1].'.id');
152+
} else {
153+
$data_query = $data_query
154+
->leftJoin($foreign_table, $child_table.'.'.$foreign_key, '=', $foreign_table.'.id');
155+
}
142156
}
143157

144158
$data[$child_table] = $data_query
@@ -494,7 +508,7 @@ public function saveDataInDb($form_data, $module, $action)
494508
}
495509

496510
// Delete the record from the database
497-
public function deleteDoc($request, $module, $email_id = null)
511+
public function deleteDoc($request, $module, $email = null)
498512
{
499513
$user_role = auth()->user()->role;
500514
$delete_allowed = true;
@@ -504,7 +518,7 @@ public function deleteDoc($request, $module, $email_id = null)
504518
}
505519

506520
if ($delete_allowed) {
507-
return $this->deleteRecord($request, $module, $email_id);
521+
return $this->deleteRecord($request, $module, $email);
508522
} else {
509523
session()->flash('success', false);
510524
$message = __('You are not authorized to delete') . ' "' . __($module['display_name']) . '" ' . __('records');
@@ -514,7 +528,7 @@ public function deleteDoc($request, $module, $email_id = null)
514528
}
515529

516530
// Delete record from database
517-
public function deleteRecord($request, $module, $email_id = null)
531+
public function deleteRecord($request, $module, $email = null)
518532
{
519533
if ($module['link_field_value']) {
520534
$user_role = auth()->user()->role;
@@ -578,14 +592,14 @@ public function deleteRecord($request, $module, $email_id = null)
578592
// delete user if modules come under user_via_modules
579593
if (in_array($module['name'], $this->user_via_modules)) {
580594
if (isset($data->email_id) && $data->email_id) {
581-
$email_id = $data->email_id;
595+
$email = $data->email_id;
582596
} elseif (isset($data->email) && $data->email) {
583-
$email_id = $data->email;
597+
$email = $data->email;
584598
} else {
585-
$email_id = null;
599+
$email = null;
586600
}
587601

588-
$this->userFormAction($request, $module['name'], "delete", $data->avatar, $email_id);
602+
$this->userFormAction($request, $module['name'], "delete", $data->avatar, $email);
589603
}
590604

591605
$delete_data = [
@@ -862,29 +876,28 @@ public function mergeCommonData($data, $module, $action = null)
862876
}
863877

864878
// performs form actions for user table
865-
public function userFormAction($request, $module, $action, $user_avatar = null, $email_id = null)
879+
public function userFormAction($request, $module, $action, $user_avatar = null, $email = null)
866880
{
867881
$user_table_name = cache('app_modules')['User']['table_name'];
868882
$user = DB::table($user_table_name);
869883

870884
if ($request->filled('email_id')) {
871-
$email_id = $request->get('email_id');
885+
$email = $request->get('email_id');
872886
} elseif ($request->filled('email')) {
873-
$email_id = $request->get('email');
887+
$email = $request->get('email');
874888
}
875889

876890
if ($request->filled('username')) {
877891
$username = $request->get('username');
878892
} else {
879-
$username = $email_id;
893+
$username = $email;
880894
}
881895

882896
if ($action == "delete") {
883-
$result = $user->where('username', $email_id)->delete();
897+
$result = $user->where('username', $usename)->delete();
884898
} else {
885899
$first_name = '';
886900
$last_name = null;
887-
$last_name = '';
888901

889902
if ($request->filled('first_name')) {
890903
$first_name = $request->get('first_name');
@@ -912,7 +925,7 @@ public function userFormAction($request, $module, $action, $user_avatar = null,
912925
if ($name && count($name)) {
913926
$last_name = implode(" ", $name);
914927

915-
if ($last_name && count($last_name)) {
928+
if ($last_name) {
916929
$last_name = trim($last_name);
917930
}
918931
}
@@ -925,7 +938,7 @@ public function userFormAction($request, $module, $action, $user_avatar = null,
925938
"last_name" => $last_name,
926939
"full_name" => $full_name,
927940
"username" => $username,
928-
"email" => $email_id,
941+
"email" => $email,
929942
"active" => $request->filled('active') ? $request->get('active') : 1,
930943
"last_updated_by" => auth()->user()->username,
931944
"updated_at" => date('Y-m-d H:i:s')

‎app/Http/Controllers/ImportController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function import(Request $request)
6464
$response_data = app()->handle($module_request);
6565
}
6666
catch(Exception $e) {
67-
array_push($errors, $e->getMessage());
67+
array_push($errors, str_replace("'", "", $e->getMessage()));
6868
continue;
6969
}
7070

‎app/Http/Controllers/ListViewController.php

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function showList(Request $request, $slug)
2121
try {
2222
$this->module = $this->setModule($slug);
2323
} catch(Exception $e) {
24-
return back()->with(['msg' => $e->getMessage()]);
24+
return back()->with(['msg' => str_replace("'", "", $e->getMessage())]);
2525
}
2626

2727
if ($slug == "report") {
@@ -36,7 +36,7 @@ public function showList(Request $request, $slug)
3636
$msg = __('You are not authorized to view') . ' "'. __($this->module["display_name"]) . '" ' . __('records');
3737

3838
if (url()->current() === url()->previous()) {
39-
return redirect()->route('home')->with('msg', $msg);
39+
return redirect()->route('home')->with(['msg' => $msg]);
4040
} else {
4141
return back()->with(['msg' => $msg]);
4242
}
@@ -50,10 +50,6 @@ public function showList(Request $request, $slug)
5050
public function showListView($request)
5151
{
5252
if ($request->ajax() || $request->is('api/*')) {
53-
$table_name = $this->module['table_name'];
54-
$columns = array_map('trim', explode(",", $this->module['list_view_columns']));
55-
$form_title = $this->module['form_title'];
56-
5753
if ($request->filled('delete_list')) {
5854
$delete_data = $this->deleteSelectedRecords($request, $request->get('delete_list'));
5955
return response()->json(['data' => $delete_data], 200);
@@ -63,15 +59,25 @@ public function showListView($request)
6359
$list_view_data = $this->prepareListViewData($request);
6460
return $list_view_data;
6561
} catch(Exception $e) {
66-
return response()->json(['msg' => $e->getMessage()], 200);
62+
return response()->json(['msg' => str_replace("'", "", $e->getMessage())], 200);
6763
}
6864
}
6965
else {
66+
try {
67+
$columns = array_map('trim', explode(",", $this->module['list_view_columns']));
68+
69+
$records = DB::table($this->module['table_name'])
70+
->select($columns)
71+
->first();
72+
} catch(Exception $e) {
73+
return back()->with(['msg' => str_replace("'", "", $e->getMessage())]);
74+
}
75+
7076
try {
7177
$list_view_data = $this->prepareListViewData($request);
72-
return view('templates.list_view', $list_view_data);
78+
return view('admin.templates.list_view', $list_view_data);
7379
} catch(Exception $e) {
74-
return back()->with(['msg' => $e->getMessage()]);
80+
return back()->with(['msg' => str_replace("'", "", $e->getMessage())]);
7581
}
7682
}
7783
}
@@ -86,8 +92,7 @@ public function prepareListViewData($request)
8692
try {
8793
$rows = $this->getRecords($request, $table_schema);
8894
} catch(Exception $e) {
89-
$error = str_replace("'", "", $e->getMessage());
90-
throw new Exception($error);
95+
throw new Exception(str_replace("'", "", $e->getMessage()));
9196
}
9297
} else {
9398
$rows = [];
@@ -134,7 +139,6 @@ public function deleteSelectedRecords($request, $delete_records)
134139

135140
public function getRecords($request, $table_schema)
136141
{
137-
logger('getRecords');
138142
$table = $this->module['table_name'];
139143
$table_columns = array_map('trim', explode(",", $this->module['list_view_columns']));
140144
$sort_field = $this->module['sort_field'];

‎app/Http/Controllers/ModuleController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function show()
3535
}
3636
}
3737

38-
return view('layouts.origin.modules')->with(['data' => $modules]);
38+
return view('admin.layouts.origin.modules')->with(['data' => $modules]);
3939
}
4040

4141
// put all functions to be performed after save
@@ -79,8 +79,8 @@ public function afterSave($data)
7979
}
8080

8181
// create view file if doesn't exists
82-
if (!File::exists(resource_path('views/layouts/modules/' . $form_data["slug"] . '.blade.php'))) {
83-
File::put(resource_path('views/layouts/modules/' . $form_data["slug"] . '.blade.php'), '');
82+
if (!File::exists(resource_path('views/admin/layouts/modules/' . $form_data["slug"] . '.blade.php'))) {
83+
File::put(resource_path('views/admin/layouts/modules/' . $form_data["slug"] . '.blade.php'), '');
8484
}
8585

8686
// create migration file for seeding module data

0 commit comments

Comments
 (0)