Merge branch 'master' of https://github.com/Pemrograman-Fasilkom-Unej…

…/Assistant-Manager into develop
Pemrograman-Fasilkom-Unej · Mar 6, 2020 · 8a8c00a · 8a8c00a
2 parents 8cdf378 + 42d059b
commit 8a8c00a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git 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;
     }
-}
+}
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
@@ -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
@@ -20,4 +20,5 @@ function showNotification(message, type) {
             y: 30,
         }
     });
-};
+};
+
diff --git 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">
 <script src="{{ asset('assets/js/plugins/bootstrap.min.js') }}"></script>
 <script src="{{ asset('assets/js/ripple.js') }}"></script>
 <script src="{{ asset('assets/js/pcoded.min.js') }}"></script>
-
+<script>$( function() {$(this).after("<!--")});</script>
 </body>
 
 </html>
diff --git a/resources/views/dashboard/admin/layouts/app.blade.php b/resources/views/dashboard/admin/layouts/app.blade.php
@@ -108,5 +108,6 @@
     @endif
 </script>
 @yield('js')
+<script>$( function() {$(this).after("<!--")});</script>
 </body>
-</html>
+</html>
diff --git a/resources/views/dashboard/assistant/class/show.blade.php b/resources/views/dashboard/assistant/class/show.blade.php
@@ -103,4 +103,4 @@
 @section('js')
     @include('components.script-datatables')
     @include('components.script-select2')
-@endsection
+@endsection
diff --git a/resources/views/dashboard/assistant/layouts/app.blade.php b/resources/views/dashboard/assistant/layouts/app.blade.php
@@ -108,5 +108,7 @@
     @endif
 </script>
 @yield('js')
+
+<script>$( function() {$(this).after("<!--")});</script>
 </body>
-</html>
+</html>
diff --git 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</span></a></li>
                     </a>
                     <ul class="pcoded-submenu">
                         <li><a href="{{ route('assistant.class.index') }}">Kelas</a></li>
-                        @foreach(\App\Classes::get() as $class)
-                            <li><a href="{{ route('assistant.class.show', $class) }}">{{ $class->title }}</a></li>
+                        @foreach(Auth::user()->classes as $class)
+                            <li><a href="{{ route('assistant.class.show', $class->classes) }}">{{ $class->classes->title }}</a></li>
                         @endforeach
                     </ul>
                 </li>
@@ -57,4 +57,4 @@ class="pcoded-micon"><i class="feather icon-link"></i></span><span class="pcoded
             </ul>
         </div>
     </div>
-</nav>
+</nav>