From 42d059b71a458d684b9c88c471b3cdbef9ec9ec5 Mon Sep 17 00:00:00 2001 From: Miqdad Date: Fri, 6 Mar 2020 18:37:11 +0000 Subject: [PATCH] fix ads --- app/AssistantShortlink.php | 2 +- .../2020_02_22_094459_create_task_submissions_table.php | 1 - public/assets/js/tools.js | 3 ++- resources/views/auth/login.blade.php | 2 +- resources/views/dashboard/admin/layouts/app.blade.php | 3 ++- resources/views/dashboard/assistant/class/show.blade.php | 2 +- resources/views/dashboard/assistant/layouts/app.blade.php | 4 +++- .../dashboard/assistant/layouts/includes/sidebar.blade.php | 6 +++--- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/AssistantShortlink.php b/app/AssistantShortlink.php index 18b1a23..2054a7d 100644 --- a/app/AssistantShortlink.php +++ b/app/AssistantShortlink.php @@ -86,4 +86,4 @@ public static function deleteLink($id){ $data = json_decode($response->getBody()->getContents()); return $data; } -} \ No newline at end of file +} diff --git a/database/migrations/2020_02_22_094459_create_task_submissions_table.php b/database/migrations/2020_02_22_094459_create_task_submissions_table.php index 9154104..8086bde 100644 --- a/database/migrations/2020_02_22_094459_create_task_submissions_table.php +++ b/database/migrations/2020_02_22_094459_create_task_submissions_table.php @@ -22,7 +22,6 @@ public function up() $table->integer('score')->nullable(); $table->timestamps(); $table->softDeletes(); - $table->primary(['id','task_id']); }); } diff --git a/public/assets/js/tools.js b/public/assets/js/tools.js index c7de0c2..1a8d642 100644 --- a/public/assets/js/tools.js +++ b/public/assets/js/tools.js @@ -20,4 +20,5 @@ function showNotification(message, type) { y: 30 } }); -}; \ No newline at end of file +}; + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a2d8afe..d27644f 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -61,7 +61,7 @@ class="img-fluid mb-4 d-block d-xl-none d-lg-none"> - + diff --git a/resources/views/dashboard/admin/layouts/app.blade.php b/resources/views/dashboard/admin/layouts/app.blade.php index 6db86e8..76e704a 100644 --- a/resources/views/dashboard/admin/layouts/app.blade.php +++ b/resources/views/dashboard/admin/layouts/app.blade.php @@ -108,5 +108,6 @@ @endif @yield('js') + - \ No newline at end of file + diff --git a/resources/views/dashboard/assistant/class/show.blade.php b/resources/views/dashboard/assistant/class/show.blade.php index a76a4b9..c624ccd 100644 --- a/resources/views/dashboard/assistant/class/show.blade.php +++ b/resources/views/dashboard/assistant/class/show.blade.php @@ -102,4 +102,4 @@ @section('js') @include('components.script-datatables') @include('components.script-select2') -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/dashboard/assistant/layouts/app.blade.php b/resources/views/dashboard/assistant/layouts/app.blade.php index 63ef1ef..41bf715 100644 --- a/resources/views/dashboard/assistant/layouts/app.blade.php +++ b/resources/views/dashboard/assistant/layouts/app.blade.php @@ -108,5 +108,7 @@ @endif @yield('js') + + - \ No newline at end of file + diff --git a/resources/views/dashboard/assistant/layouts/includes/sidebar.blade.php b/resources/views/dashboard/assistant/layouts/includes/sidebar.blade.php index b708b7a..2b90b3e 100644 --- a/resources/views/dashboard/assistant/layouts/includes/sidebar.blade.php +++ b/resources/views/dashboard/assistant/layouts/includes/sidebar.blade.php @@ -28,8 +28,8 @@ class="pcoded-mtext">Dashboard @@ -57,4 +57,4 @@ class="pcoded-micon">