Skip to content

Commit

Permalink
Merge pull request #88 from training-solonet/ipan
Browse files Browse the repository at this point in the history 
Ipan
  • Loading branch information
@Diandaru
Diandaru authored Dec 16, 2024
2 parents ed30392 + 3a98117 commit 2ad25f3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 40 deletions.
8 changes: 4 additions & 4 deletions resources/views/admin/pembimbing.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ class="text-center text-secondary text-xs font-weight-semibold opacity-7">
<th
class="text-center text-secondary text-xs font-weight-semibold opacity-7">
Username</th>
<th
{{-- <th
class="text-center text-secondary text-xs font-weight-semibold opacity-7">
Password</th>
Password</th> --}}
<th
class="text-center text-secondary font-weight-semibold text-xs opacity-7">
Status</th>
Expand All @@ -75,10 +75,10 @@ class="text-sm text-dark font-weight-semibold mb-0">
class="text-sm text-dark font-weight-semibold mb-0">
{{ $item->username }}</p>
</td>
<td class="align-middle text-center text-sm">
{{-- <td class="align-middle text-center text-sm">
<p class="text-sm text-dark mb-0">
{{ $item->password }}</p>
</td>
</td> --}}
<td class="align-middle text-center">
@if($item->status == 'Aktif')
<span class="badge badge-sm border border-success text-uppercase text-success bg-success">{{ $item->status }}</span>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/admin/siswa.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ class="text-center text-secondary text-xs font-weight-semibold opacity-7">
<th
class="text-center text-secondary text-xs font-weight-semibold opacity-7">
Username</th>
<th
{{-- <th
class="text-center text-secondary text-xs font-weight-semibold opacity-7">
Password</th>
Password</th> --}}
<th
class="text-center text-secondary font-weight-semibold text-xs opacity-7">
Tanggal Mulai</th>
Expand Down Expand Up @@ -86,11 +86,11 @@ class="text-sm text-dark font-weight-semibold mb-0">
<p
class="text-sm text-dark font-weight-semibold mb-0">
{{ $item->username }}</p>
</td>
{{-- </td>
<td class="align-middle text-center text-sm">
<p class="text-sm text-dark mb-0">
{{ $item->password }}</p>
</td>
</td> --}}
<td class="align-middle text-center text-sm">
<p class="text-sm text-dark mb-0">
{{ \Carbon\Carbon::parse($item->tanggal_mulai)->translatedFormat('l, d-m-Y') }}
Expand Down Expand Up @@ -205,7 +205,7 @@ class="badge badge-sm border border-secondary text-uppercase text-secondary bg-s

<div class="mb-3">
<label for="password" class="form-label">Password</label>
<input type="password" class="form-control" id="password" name="password"
<input type="text" class="form-control" id="password" name="password"
placeholder="Password" required>
</div>
<div class="mb-3">
Expand Down Expand Up @@ -267,7 +267,7 @@ class="badge badge-sm border border-secondary text-uppercase text-secondary bg-s
</div>
<div class="mb-3">
<label for="password" class="form-label">Password</label>
<input type="password" class="form-control" id="password" name="password"
<input type="text" class="form-control" id="password" name="password"
value="{{ $item->password }}" required>
</div>
<div class="mb-3">
Expand Down
29 changes: 1 addition & 28 deletions resources/views/components/app/navbar.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h6 class="font-weight-bold mb-0">Dashboard</h6>
</nav>
<div class="collapse navbar-collapse mt-sm-0 mt-2 me-md-0 me-sm-4" id="navbar">
<div class="ms-md-auto pe-md-3 d-flex align-items-center mb-0 font-weight-bold breadcrumb-text text-white">
<div class="ms-md-auto pe-md-1 d-flex align-items-center mb-0 font-weight-bold breadcrumb-text text-white">
<form method="POST" action="{{ route('logout') }}">
@csrf
<a href="login" onclick="event.preventD efault();
Expand All @@ -17,33 +17,6 @@
</a>
</form>
</div>
<ul class="navbar-nav justify-content-end">
<li class="nav-item d-xl-none ps-3 d-flex align-items-center">
<a href="javascript:;" class="nav-link text-body p-0" id="iconNavbarSidenav">
<div class="sidenav-toggler-inner">
<i class="sidenav-toggler-line"></i>
<i class="sidenav-toggler-line"></i>
<i class="sidenav-toggler-line"></i>
</div>
</a>
</li>
<li class="nav-item px-3 d-flex align-items-center">
<a href="javascript:;" class="nav-link text-body p-0">
<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"
class="fixed-plugin-button-nav cursor-pointer" viewBox="0 0 24 24" fill="currentColor">
<path fill-rule="evenodd"
d="M11.078 2.25c-.917 0-1.699.663-1.85 1.567L9.05 4.889c-.02.12-.115.26-.297.348a7.493 7.493 0 00-.986.57c-.166.115-.334.126-.45.083L6.3 5.508a1.875 1.875 0 00-2.282.819l-.922 1.597a1.875 1.875 0 00.432 2.385l.84.692c.095.078.17.229.154.43a7.598 7.598 0 000 1.139c.015.2-.059.352-.153.43l-.841.692a1.875 1.875 0 00-.432 2.385l.922 1.597a1.875 1.875 0 002.282.818l1.019-.382c.115-.043.283-.031.45.082.312.214.641.405.985.57.182.088.277.228.297.35l.178 1.071c.151.904.933 1.567 1.85 1.567h1.844c.916 0 1.699-.663 1.85-1.567l.178-1.072c.02-.12.114-.26.297-.349.344-.165.673-.356.985-.57.167-.114.335-.125.45-.082l1.02.382a1.875 1.875 0 002.28-.819l.923-1.597a1.875 1.875 0 00-.432-2.385l-.84-.692c-.095-.078-.17-.229-.154-.43a7.614 7.614 0 000-1.139c-.016-.2.059-.352.153-.43l.84-.692c.708-.582.891-1.59.433-2.385l-.922-1.597a1.875 1.875 0 00-2.282-.818l-1.02.382c-.114.043-.282.031-.449-.083a7.49 7.49 0 00-.985-.57c-.183-.087-.277-.227-.297-.348l-.179-1.072a1.875 1.875 0 00-1.85-1.567h-1.843zM12 15.75a3.75 3.75 0 100-7.5 3.75 3.75 0 000 7.5z"
clip-rule="evenodd" />
</svg>
</a>
</li>

<li class="nav-item ps-2 d-flex align-items-center">
<a href="javascript:;" class="nav-link text-body p-0">
<img src="../assets/img/team-2.jpg" class="avatar avatar-sm" alt="avatar" />
</a>
</li>
</ul>
</div>
</div>
</nav>
Expand Down
2 changes: 0 additions & 2 deletions resources/views/components/sidenav-top.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
</div>
</a>
</li>
<li class="nav-item px-3 d-flex align-items-center">
<a href="javascript:;" class="nav-link text-white p-0">
<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"
class="fixed-plugin-button-nav cursor-pointer" viewBox="0 0 24 24" fill="currentColor">
<path fill-rule="evenodd"
d="M11.078 2.25c-.917 0-1.699.663-1.85 1.567L9.05 4.889c-.02.12-.115.26-.297.348a7.493 7.493 0 00-.986.57c-.166.115-.334.126-.45.083L6.3 5.508a1.875 1.875 0 00-2.282.819l-.922 1.597a1.875 1.875 0 00.432 2.385l.84.692c.095.078.17.229.154.43a7.598 7.598 0 000 1.139c.015.2-.059.352-.153.43l-.841.692a1.875 1.875 0 00-.432 2.385l.922 1.597a1.875 1.875 0 002.282.818l1.019-.382c.115-.043.283-.031.45.082.312.214.641.405.985.57.182.088.277.228.297.35l.178 1.071c.151.904.933 1.567 1.85 1.567h1.844c.916 0 1.699-.663 1.85-1.567l.178-1.072c.02-.12.114-.26.297-.349.344-.165.673-.356.985-.57.167-.114.335-.125.45-.082l1.02.382a1.875 1.875 0 002.28-.819l.923-1.597a1.875 1.875 0 00-.432-2.385l-.84-.692c-.095-.078-.17-.229-.154-.43a7.614 7.614 0 000-1.139c-.016-.2.059-.352.153-.43l.84-.692c.708-.582.891-1.59.433-2.385l-.922-1.597a1.875 1.875 0 00-2.282-.818l-1.02.382c-.114.043-.282.031-.449-.083a7.49 7.49 0 00-.985-.57c-.183-.087-.277-.227-.297-.348l-.179-1.072a1.875 1.875 0 00-1.85-1.567h-1.843zM12 15.75a3.75 3.75 0 100-7.5 3.75 3.75 0 000 7.5z"
clip-rule="evenodd"></path>
Expand Down

0 comments on commit 2ad25f3

Please sign in to comment.