From aa294186ea5d48dc2da64bffc85e769b28434bd6 Mon Sep 17 00:00:00 2001 From: pher2017 Date: Mon, 23 Nov 2020 21:37:12 -0300 Subject: [PATCH 1/2] sdfs --- coreui/src/views/media/Media.vue | 2 +- laravel/.env.example | 44 -------------------------------- laravel/config/filesystems.php | 3 ++- laravel/package-lock.json | 6 +++++ laravel/routes/web.php | 3 +++ 5 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 laravel/.env.example diff --git a/coreui/src/views/media/Media.vue b/coreui/src/views/media/Media.vue index e23d3243d..6fdfbc1be 100644 --- a/coreui/src/views/media/Media.vue +++ b/coreui/src/views/media/Media.vue @@ -255,7 +255,7 @@ export default { croppModal: false, cropper: null, croppUrl: '', - changePort: 'localhost:8080', + changePort: 'localhost:8000', } }, computed: { diff --git a/laravel/.env.example b/laravel/.env.example deleted file mode 100644 index 604b401fe..000000000 --- a/laravel/.env.example +++ /dev/null @@ -1,44 +0,0 @@ -APP_NAME=Laravel -APP_ENV=local -APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost - -LOG_CHANNEL=stack - -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=laravel -DB_USERNAME=root -DB_PASSWORD= - -BROADCAST_DRIVER=log -CACHE_DRIVER=file -QUEUE_CONNECTION=sync -SESSION_DRIVER=file -SESSION_LIFETIME=120 - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=smtp -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null - -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= - -PUSHER_APP_ID= -PUSHER_APP_KEY= -PUSHER_APP_SECRET= -PUSHER_APP_CLUSTER=mt1 - -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" diff --git a/laravel/config/filesystems.php b/laravel/config/filesystems.php index d213e4fff..d56fec2ef 100644 --- a/laravel/config/filesystems.php +++ b/laravel/config/filesystems.php @@ -50,7 +50,8 @@ 'public' => [ 'driver' => 'local', - 'root' => public_path() . '/../../coreui/public/public', + //'root' => public_path() . '/../../coreui/public/public', + 'root' => public_path('public'), 'url' => env('APP_URL').'/public', 'visibility' => 'public', ], diff --git a/laravel/package-lock.json b/laravel/package-lock.json index 3601a70a9..962e2b897 100644 --- a/laravel/package-lock.json +++ b/laravel/package-lock.json @@ -2391,6 +2391,12 @@ "sha.js": "^2.4.8" } }, + "cropperjs": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.9.tgz", + "integrity": "sha512-aPWlg43sLIcYN4GBXIdyvM09wNPgn1ug+vNVwV8jlb3dbgEX/B34Iw6hrjGSajkUDQBmaCi6uPOevFb7N0yUsw==", + "dev": true + }, "cross-env": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", diff --git a/laravel/routes/web.php b/laravel/routes/web.php index 77d555ad0..25bd25102 100644 --- a/laravel/routes/web.php +++ b/laravel/routes/web.php @@ -14,3 +14,6 @@ //Route::get('/{any}', function () { // return view('coreui.homepage'); //})->where('any', '.*'); +Route::get('/{any}', function () { + return view('coreui.homepage'); +})->where('any', '.*'); From d11180f2fecf754444faabbd20cf4c826719b45d Mon Sep 17 00:00:00 2001 From: pher2017 Date: Mon, 23 Nov 2020 21:51:19 -0300 Subject: [PATCH 2/2] 654 --- laravel/app/Http/Controllers/RolesController.php | 2 +- laravel/resources/js/components/ExampleComponent.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/app/Http/Controllers/RolesController.php b/laravel/app/Http/Controllers/RolesController.php index f51c9331e..a6c3a2a78 100644 --- a/laravel/app/Http/Controllers/RolesController.php +++ b/laravel/app/Http/Controllers/RolesController.php @@ -98,7 +98,7 @@ public function store(Request $request) $roleHierarchy->role_id = $role->id; $roleHierarchy->hierarchy = $hierarchy; $roleHierarchy->save(); - //$request->session()->flash('message', 'Successfully created role'); + $request->session()->flash('message', 'Successfully created role'); return response()->json( ['status' => 'success'] ); } diff --git a/laravel/resources/js/components/ExampleComponent.vue b/laravel/resources/js/components/ExampleComponent.vue index 3fb9f9aa7..b3d568d0a 100644 --- a/laravel/resources/js/components/ExampleComponent.vue +++ b/laravel/resources/js/components/ExampleComponent.vue @@ -6,7 +6,7 @@
Example Component
- I'm an example component. + Holasssaadsadasdasd