Merge branch 'master' of https://github.com/lintangtimur/MPRO

lintangtimur · Nov 30, 2018 · 1347394 · 1347394
2 parents bf7739e + 1f55b7f
commit 1347394
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 25 deletions.
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
diff --git a/public/css/sidebar.min.css b/public/css/sidebar.min.css
@@ -1,11 +1,11 @@
 .main_sidebar {
     min-height:100vh;
     position: absolute;
-    top:50px;
+    top:10px;
     left:0;
     width:120px;
     transition: all 150ms cubic-bezier(0.65, 0.05, 0.36, 1);
-    will-change: left, width;
+    will-change: auto;
 
 }
 
@@ -16,6 +16,7 @@
 }
 .main_sidebar ul li {
     padding:10px;
+    display: inline-block;
 }
 .main_sidebar ul li a {
     color:grey;
@@ -28,6 +29,10 @@
     font-size:18px;
     padding-left:7px;
 }
+.kiri{
+    visibility: hidden;
+}
+
 /* .active{
     background-color: red;
     color: white;
@@ -36,11 +41,66 @@
     color:#167696;
     text-decoration:none;
 }
-.main {
-    float:right;
-    color:#fff;
-    display:block;
-    width:100%;
-    background:red;
-    min-height:100vh;
+@media only screen and (max-width:414px){
+    .main_sidebar {
+        position: absolute;
+       top: 50px;
+        width:100px;
+        margin: 0 auto;
+        left: 0;
+
+    }
+    .main{
+        margin-left: 70px; /* Same as the width of the sidebar */
+
+
+    }
+    .main2{
+        padding-left: -10px;
+    }
+
+   .kiri{
+      visibility: visible;
+
+   }
+   .main_sidebar ul {
+    list-style:none;
+    padding-left:15px;
+    font-size: 12px;
+}
+.main_sidebar ul li {
+    padding:5px;
+    display: inline-block;
+}
+.main_sidebar ul li i {
+    float:left;
+    color:grey;
+    margin-left:-25px;
+    font-size:14px;
+    padding-left:7px;
+}
+}
+@media only screen and (max-width:360px){
+    .main_sidebar {
+        position: absolute;
+       top: 50px;
+        width:120px;
+        margin: 0 auto;
+        left: 0;
+
+    }
+    .main{
+        margin-left: 70 px; /* Same as the width of the sidebar */
+
+
+    }
+    .main2{
+        padding-left: -10px;
+    }
+
+   .kiri{
+      visibility: visible;
+
+   }
+
 }
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
@@ -8,8 +8,9 @@
 <body>
     @include('partial.nav')
     <div id="content">
-    <div id="asu">
+    <div class="main">
         <div class="container mt-4">
+            <div class="main2">
             <div class="row">
                 @if($role == 'admin')
                 @include('dashboard.admin')
@@ -27,6 +28,7 @@
         </div>
     </div>
     </div>
+</div>
     @include('partial.dependency')
 
 </body>

diff --git a/resources/views/dashboard/dosen.blade.php b/resources/views/dashboard/dosen.blade.php
@@ -1,10 +1,41 @@
-
+<head>
+    <style>
+        .hilang{
+            visibility: visible;
+        }
+    @media only screen and (max-width:414px){
+        .hilang{
+            visibility: hidden;
+        }
+        .naik{
+            margin-top:-300px;
+            margin-left:-70px;
+            margin-bottom:10px;
+            margin-right:-20px;
+        }
+    }
+    @media only screen and (max-width:360px){
+        .hilang{
+            visibility: hidden;
+        }
+        .naik{
+            margin-top:-320px;
+            margin-left:-70px;
+            margin-bottom:10px;
+            margin-right:-20px;
+            
+        }
+    }   
+    }
+    </style>
+</head>
 <div class="col-md-12">
+<div class="hilang">
     <h1>Dashboard</h1>
-    <div class="row">
-        <div class="col-md-5">
-            <div class="card" >
-                <div class="row">
+    <div class="row"> 
+        <div class="col-md-5">   
+            <div class="card" >       
+                <div class="row">             
                     <div class="col-md-3 text-center" style="background-color:greenyellow;">
                         <div id="contentCard">
                         <div>{{$totalApproved}}</div>
@@ -26,6 +57,8 @@
             </div>
         </div>
     </div>
+</div>
+<div class="naik">
     <div class="card mt-4">
         <div class="card-body">
             <div class="flash-message">
@@ -38,6 +71,7 @@
                   </div>
                   @endif
             </div>
+
             <div class="table-responsive">
                 <table class="table table-inverse" id="tDosenDashboard">
                     <thead class="thead-default">
@@ -56,8 +90,8 @@
                         </tbody>
                 </table>
             </div>
-
-                         
+            </div>
+
 
             {{-- MODAL --}}
             <div class="modal fade" id="modalDosenDecline" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">

diff --git a/resources/views/partial/nav.blade.php b/resources/views/partial/nav.blade.php
@@ -2,41 +2,52 @@
     <span class="navbar-brand">NASM v1.1.2</span>
     <div class="wrapper">
         <div class="main_sidebar mt-4">
-            <ul>
-                <li ><a href="/dashboard"
+
+           <ul>
+           <li class=" kiri">
+            <i class="fas fa-users"></i> Hello, {{Session::get('username')}}</li>
+                <li  ><a href="/dashboard"
                     @if(Request::is('dashboard'))
                     class="activeMenu"
                     @endif
                     ><i class="fas fa-home "></i>Dashboard  <span class="sr-only">(current)</span></a></li>
 
                 @if(Auth::user()->roleid == 10)
-                <li><a href="/dashboard/mahasiswa"
+                <li ><a href="/dashboard/mahasiswa"
                     @if(Request::is('dashboard/mahasiswa'))
                     class="activeMenu"
                     @endif
-                    >Mahasiswa</a></li>
+                    ><i class="fas fa-user "></i>Mahasiswa</a></li>
                 @endif
-                <li>
+                <li >
                     @if(Auth::user()->roleid == 11)
                         <a  href="/inputevent" class="{{ Request::segment(1) === 'inputevent' ? 'activeMenu' : null }}"><i class="fas fa-copy"></i>Input Event</a>
                     @endif
 
                 </li>
-
+            <li class="kiri">
+
+                <a href="/logout"><i class="fas fa-sign-out-alt"></i> Logout</a>
+
+        </li>
+
             </ul>
         </div>
+
     </div>
 
     <div class="collapse navbar-collapse" id="collapsibleNavId">
         <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
 </ul>
-    <ul class=" navbar-nav navbar-right">
+
+    <ul class="navbar-nav navbar-right">
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="dropdownId" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-users"></i> Hello, {{Session::get('username')}}</a>
             <div class="dropdown-menu" aria-labelledby="dropdownId">
                 <a class="dropdown-item" href="/logout"><i class="fas fa-sign-out-alt"></i> Logout</a>
             </div>
         </li>
     </ul>
+
 </div>
 </nav>