Fakultas Ilmu Komputer UI

Skip to content
GitLab
Commit 1570fba8 authored by Steven Kusuman's avatar Steven Kusuman
Browse files

Merge branch '1706028676-121' into 'master' 

[#121] Bugfix: admin dashboard

Closes #121

See merge request !70
parents 041f2dc8 d1951aab
Pipeline #59973 passed with stages
in 25 minutes and 38 seconds
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ 1570fba8
...@@ -215,3 +215,4 @@ client_secrets.json ...@@ -215,3 +215,4 @@ client_secrets.json
# MacOS # MacOS
.DS_Store .DS_Store
*.bak
\ No newline at end of file
administration/templates/administration/includes/navigation.html
View file @ 1570fba8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<!-- Topbar Navbar --> <!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/dashboard/"> <a class="nav-link" href="/administration/">
<span class="mr-2 d-none d-lg-inline text-gray-600 small">Administrasi</span> <span class="mr-2 d-none d-lg-inline text-gray-600 small">Administrasi</span>
</a> </a>
</li> </li>
......
administration/templates/settings.html
View file @ 1570fba8
{% load static %} {% extends 'administration/base_administrasi2.html' %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="description" content="" />
<meta name="author" content="" />
<title>Dasbor - Pengaturan {{ page_title }}</title>
<!-- Custom fonts for this template -->
<link
href="https://fonts.googleapis.com/css2?family=Poppins&display=swap"
rel="stylesheet"
/>
<!-- Custom styles for this template -->
<link
rel="icon"
type="image/png"
href="{% static 'images/icons/logo.ico' %}"
/>
<link href="{% static 'css/sb-admin-2.min.css' %}" rel="stylesheet" />
<link rel="stylesheet" href="{% static 'css/button.css' %}" />
<!-- Custom styles for this page -->
<link
href="{% static 'vendor/datatables/dataTables.bootstrap4.min.css' %}"
rel="stylesheet"
/>
</head>
<body id="page-top" style="font-family: 'Poppins', sans-serif;">
<!-- Page Wrapper -->
<div id="wrapper">
<!-- Sidebar -->
<ul
class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion"
id="accordionSidebar"
>
<!-- Sidebar - Brand -->
<a
class="sidebar-brand d-flex align-items-center justify-content-center"
href="verif.html"
>
<div class="sidebar-brand-icon rotate-n-15"></div>
<div class="sidebar-brand-text mx-3">Digipus</div>
</a>
<!-- Divider -->
<hr class="sidebar-divider my-0" />
<!-- Nav Item - Dashboard -->
<li class="nav-item">
<a class="nav-link" href="/administration/">
<span>Verifikasi Materi</span></a
>
</li>
<li class="nav-item">
<a class="nav-link" href="#">
<span>Statistik Materi</span></a
>
</li>
<li class="nav-item">
<a class="nav-link" href="/administration/laporan-materi/">
<span>Laporan Materi</span></a>
</li>
<!-- Divider -->
<hr class="sidebar-divider my-0" />
<li class="nav-item">
<a
class="nav-link"
href="/administration/setting/verification/"
>
<span>Pengaturan Verifikasi</span></a
>
</li>
<li class="nav-item">
<a
class="nav-link"
href="/administration/setting/category/"
>
<span>Pengaturan Kategori</span></a
>
</li>
<!-- Divider -->
<hr class="sidebar-divider my-0" />
<li class="nav-item">
<a
class="nav-link"
href="/administration/kelola-kontributor/"
>
<span>Kelola Kontributor</span></a
>
</li>
<li class="nav-item">
<a class="nav-link" href="/administration/kelola-admin/">
<span>Kelola Admin</span></a
>
</li>
<!-- Divider -->
<hr class="sidebar-divider my-0" />
</ul>
<!-- End of Sidebar -->
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
<!-- Main Content -->
<div id="content">
<!-- Topbar -->
<nav
class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow"
>
<!-- Sidebar Toggle (Topbar) -->
<button
id="sidebarToggleTop"
class="btn btn-link d-md-none rounded-circle mr-3"
>
<i class="fa fa-bars" aria-hidden="true"></i>
</button>
<div class="sidebar-brand-text mx-3">
Diskominfo Kota Depok
</div>
<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
<!-- Nav Item - Search Dropdown (Visible Only XS) -->
<li class="nav-item">
<a class="nav-link" href="/dashboard/">
<span
class="mr-2 d-none d-lg-inline text-gray-600 small"
>Administrasi</span
>
</a>
</li>
<li class="nav-item"> {% load static %}
<a class="nav-link" href="/profil/">
<span
class="mr-2 d-none d-lg-inline text-gray-600 small"
>Profil</span
>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout/">
<span
class="mr-2 d-none d-lg-inline text-gray-600 small"
>Logout</span
>
</a>
</li>
<div class="topbar-divider d-none d-sm-block"></div> {% block title %}
<title>Dasbor - Pengaturan {{ page_title }}</title>
{% endblock %}
<!-- Nav Item - User Information --> {% block content %}
<li class="nav-item dropdown no-arrow">
<a
class="nav-link dropdown-toggle"
href="#"
id="userDropdown"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<span
class="mr-2 d-none d-lg-inline text-gray-600 small"
>Admin</span
>
{% if not user.default_profile_picture %}
<img
class="img-profile rounded-circle"
src="https://i.ibb.co/9wgPzyZ/default-image.png"
alt="User profile picture"
/>
{% else %}
<img
class="img-profile rounded-circle"
src="{{ user.profile_picture.url }}"
alt="User profile picture"
/>
{% endif %}
</a>
</li>
</ul>
</nav>
<!-- End of Topbar -->
<!-- Begin Page Content -->
<div class="container-fluid"> <div class="container-fluid">
<div class="card shadow mb-4"> <div class="card shadow mb-4">
<div class="card-header py-3"> <div class="card-header py-3">
...@@ -389,55 +191,8 @@ ...@@ -389,55 +191,8 @@
</div> </div>
</div> </div>
<!-- /.container-fluid --> <!-- /.container-fluid -->
</div> {% endblock%}
<!-- End of Main Content --> {% block javascripts %}
<!-- Footer -->
<footer class="sticky-footer bg-white">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span
>Copyright &copy; Diskominfo Kota Depok
2020</span
>
</div>
</div>
</footer>
<!-- End of Footer -->
</div>
<!-- End of Content Wrapper -->
</div>
<!-- End of Page Wrapper -->
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up" aria-hidden="true"></i>
</a>
<!-- Bootstrap core JavaScript-->
<script
src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"
></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin="anonymous"
></script>
<script
src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"
></script>
<!-- Core plugin JavaScript-->
<script
src="https://code.jquery.com/jquery-3.5.0.min.js"
integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ="
crossorigin="anonymous"
></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="{% static 'js/sb-admin-2.min.js' %}"></script> <script src="{% static 'js/sb-admin-2.min.js' %}"></script>
...@@ -457,5 +212,4 @@ ...@@ -457,5 +212,4 @@
} }
} }
</script> </script>
</body> {% endblock javascripts %}
</html> \ No newline at end of file
authentication/templates/login_admin.html
View file @ 1570fba8
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="g-recaptcha" data-sitekey="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe"></div> <div class="g-recaptcha" data-sitekey={{captcha_site_key}}></div>
<div class="container-login100-form-btn"> <div class="container-login100-form-btn">
<button class="login100-form-btn" type="submit"> <button class="login100-form-btn" type="submit">
Login Login
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Excellence In Teamwork