Merge branch 'master' of https://gitlab.del.ac.id/PA2-1617-32TK07/PA2-1617-D3TK07

app/Http/Controllers/homeController.php

@@ -30,7 +30,10 @@ class HomeController extends Controller
             return view('Admin.HalamanAdmin.index');
         }
         else if(Auth::user()->jabatan== 'Petugas'){
-            return view('HalamanPetugas.HalamanAdmin.index');
+            return view('PetugasKebun.HalamanUser.index');
+        }
+        else if(Auth::user()->jabatan== 'Customer'){
+            return view('Costumer.HalamanUser.index');
         }
         else
             return view('Costumer.HalamanUser.index');

resources/views/Costumer/HalamanUser/index.blade.php

@@ -389,7 +389,7 @@
                                     <div class="card">
                                         <div class="content table-responsive table-full-width">
                                             <ul>
-                                                Selamat Datang di Aplikasi SWISS,Terimakasih telah berkunjung
+                                                Selamat Datang di Aplikasi SWISS Custumer,Terimakasih telah berkunjung
                                             </ul>
                                         </div>
                                     </div>

resources/views/PetugasKebun/HalamanUser/daftar_tanaman.blade.php → resources/views/PetugasKebun/HalamanUser/daftartanaman.blade.php

@@ -375,7 +375,7 @@
                             <i class="ion ion-ios-people-outline"></i>
                         </div>
 
-                        <a href="{{URL::to('/HalamanMonitoring')}}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+                        <a href="{{URL::to('/costsayur')}}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
                     </div>
                 </div>
 

resources/views/PetugasKebun/HalamanUser/index.blade.php

@@ -389,7 +389,7 @@
                                     <div class="card">
                                         <div class="content table-responsive table-full-width">
                                             <ul>
-                                                Selamat Datang di Aplikasi SWISS,Terimakasih telah berkunjung
+                                                Selamat Datang di Aplikasi SWISS Petugas,Terimakasih telah berkunjung
                                             </ul>
                                         </div>
                                     </div>

resources/views/auth/register.blade.php

@@ -83,8 +83,8 @@
                             <div class="col-md-6">
                                 <select name="jabatan" class="form-control">
                                     <option value="Admin">Admin</option>
-                                    <option value="User">Petugas</option>
-                                    <option value="User">Costumer</option>
+                                    <option value="Petugas">Petugas</option>
+                                    <option value="Customer">Costumer</option>
                                 </select>
                             </div>
                         </div>