From bfebda48bdd7677de36aafc2682856fccf391031 Mon Sep 17 00:00:00 2001
From: Arief <arief.pratama01@ui.ac.id>
Date: Sat, 31 Oct 2020 21:35:20 +0700
Subject: [PATCH] Remove duplication administration
---
administration/templates/detail_admin.html | 64 ++-----------------
.../templates/detail_kontri_admin.html | 63 ++----------------
.../templates/detail_kontri_admin_base.html | 60 +++++++++++++++++
app/tests.py | 3 +-
4 files changed, 69 insertions(+), 121 deletions(-)
create mode 100644 administration/templates/detail_kontri_admin_base.html
diff --git a/administration/templates/detail_admin.html b/administration/templates/detail_admin.html
index 5105c77..b94ac03 100644
--- a/administration/templates/detail_admin.html
+++ b/administration/templates/detail_admin.html
@@ -1,65 +1,9 @@
-{% extends 'administration/base_administrasi2.html' %}
-
-{% load static %}
+{% extends 'detail_kontri_admin_base.html' %}
{% block title %}
<title>Kelola Admin | Digipus</title>
{% endblock %}
-{% block content %}
-<div class="profile-content white-text">
- <div>
- {% if not user.default_profile_picture %}
- <img class="img-profile rounded-circle" src="https://i.ibb.co/9wgPzyZ/default-image.png" alt="Photo" class="img-thumbnail"></img>
- {% else %}
- <img class="img-profile rounded-circle" src="{{ user.profile_picture.url }}" alt="Photo" class="img-thumbnail"></img>
- {% endif %}
- <div class="profile-margin"></div>
- <h2>{{ user.name }}</h2>
- <h4>{{ user.email }}</h4>
- <h4>{{ user.biography }}</h4>
- <div class="profile-margin"></div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- instansi
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- {{user.instansi}}
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- LinkedIn
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://linkedin.com">{{ user.linkedin }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Facebook
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://facebook.com">{{ user.facebook }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Twitter
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://twitter.com">{{ user.twitter }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Instagram
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://instagram.com">{{ user.instagram }}</a>
- </div>
- </div>
- <a class="btn btn-primary btn-admin" href="/administration/kelola-admin/">Kembali ke Kelola Admin</a>
- </div>
-</div>
-{% endblock%}
\ No newline at end of file
+{% block return_link %}
+<a class="btn btn-primary btn-admin" href="/administration/kelola-admin/">Kembali ke Kelola Admin</a>
+{% endblock %}
diff --git a/administration/templates/detail_kontri_admin.html b/administration/templates/detail_kontri_admin.html
index ef4ff27..eb897e9 100644
--- a/administration/templates/detail_kontri_admin.html
+++ b/administration/templates/detail_kontri_admin.html
@@ -1,64 +1,9 @@
-{% extends 'administration/base_administrasi2.html' %}
-{% load static %}
+{% extends 'detail_kontri_admin_base.html' %}
{% block title %}
<title>Kelola Kontributor | Digipus</title>
{% endblock %}
-{% block content %}
-<div class="profile-content white-text">
- <div>
- {% if not user.default_profile_picture %}
- <img class="img-profile rounded-circle" src="https://i.ibb.co/9wgPzyZ/default-image.png" alt="Photo" class="img-thumbnail"></img>
- {% else %}
- <img class="img-profile rounded-circle" src="{{ user.profile_picture.url }}" alt="Photo" class="img-thumbnail"></img>
- {% endif %}
- <div class="profile-margin"></div>
- <h2>{{ user.name }}</h2>
- <h4>{{ user.email }}</h4>
- <h4>{{ user.biography }}</h4>
- <div class="profile-margin"></div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- instansi
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- {{user.instansi}}
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- LinkedIn
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://linkedin.com">{{ user.linkedin }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Facebook
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://facebook.com">{{ user.facebook }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Twitter
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://twitter.com">{{ user.twitter }}</a>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6 my-auto" style="font-size: 2rem;">
- Instagram
- </div>
- <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
- <a href="https://instagram.com">{{ user.instagram }}</a>
- </div>
- </div>
- <a class="btn btn-primary btn-admin" href="/administration/kelola-kontributor/">Kembali ke Kelola Kontributor</a>
- </div>
-</div>
-{% endblock %}
\ No newline at end of file
+{% block return_link %}
+<a class="btn btn-primary btn-admin" href="/administration/kelola-kontributor/">Kembali ke Kelola Kontributor</a>
+{% endblock %}
diff --git a/administration/templates/detail_kontri_admin_base.html b/administration/templates/detail_kontri_admin_base.html
new file mode 100644
index 0000000..c57a45a
--- /dev/null
+++ b/administration/templates/detail_kontri_admin_base.html
@@ -0,0 +1,60 @@
+{% extends 'administration/base_administrasi2.html' %}
+
+{% block content %}
+<div class="profile-content white-text">
+ <div>
+ {% if not user.default_profile_picture %}
+ <img class="img-profile rounded-circle" src="https://i.ibb.co/9wgPzyZ/default-image.png" alt="Photo" class="img-thumbnail"></img>
+ {% else %}
+ <img class="img-profile rounded-circle" src="{{ user.profile_picture.url }}" alt="Photo" class="img-thumbnail"></img>
+ {% endif %}
+ <div class="profile-margin"></div>
+ <h2>{{ user.name }}</h2>
+ <h4>{{ user.email }}</h4>
+ <h4>{{ user.biography }}</h4>
+ <div class="profile-margin"></div>
+ <div class="row">
+ <div class="col-md-6 my-auto" style="font-size: 2rem;">
+ instansi
+ </div>
+ <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
+ {{user.instansi}}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 my-auto" style="font-size: 2rem;">
+ LinkedIn
+ </div>
+ <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
+ <a href="https://linkedin.com">{{ user.linkedin }}</a>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 my-auto" style="font-size: 2rem;">
+ Facebook
+ </div>
+ <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
+ <a href="https://facebook.com">{{ user.facebook }}</a>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 my-auto" style="font-size: 2rem;">
+ Twitter
+ </div>
+ <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
+ <a href="https://twitter.com">{{ user.twitter }}</a>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 my-auto" style="font-size: 2rem;">
+ Instagram
+ </div>
+ <div class="col-md-6 my-auto" style="font-size: 1.2rem;">
+ <a href="https://instagram.com">{{ user.instagram }}</a>
+ </div>
+ </div>
+ {% block return_link %}
+ {% endblock %}
+ </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/tests.py b/app/tests.py
index a487c2b..d65e62e 100644
--- a/app/tests.py
+++ b/app/tests.py
@@ -1006,6 +1006,7 @@ class PostsViewTest(TestCase):
materi=post,
session_id=("dummysession-" + str(i) + '-' + str(j))
)
+ time.sleep(0.1)
for i, post_id in enumerate(post_comment_group_dict):
post = post_comment_group_dict[post_id]["data"]
@@ -1069,8 +1070,6 @@ class PostsViewTest(TestCase):
response = self._request_as_user()
posts = list(self.data.keys())
- posts.sort()
-
comments = {
i: [comment.id for comment in self.data[post_id]["comments"]]
for i, post_id in enumerate(posts)
--
GitLab