refine create and details deployment ui
This commit is contained in:
rmanach
parent
53c54e9553
commit
d1d87b4b97
@ -17,7 +17,7 @@ def index(request):
|
|||||||
deployments = Deployment.objects.filter(user=request.user.id).order_by(
|
deployments = Deployment.objects.filter(user=request.user.id).order_by(
|
||||||
"-created_at"
|
"-created_at"
|
||||||
)
|
)
|
||||||
paginator = Paginator(deployments, 5)
|
paginator = Paginator(deployments, 10)
|
||||||
|
|
||||||
page_number = request.GET.get("page")
|
page_number = request.GET.get("page")
|
||||||
page_obj = paginator.get_page(page_number)
|
page_obj = paginator.get_page(page_number)
|
||||||
@ -51,7 +51,7 @@ def details(request, deployment_id):
|
|||||||
deployment = get_object_or_404(Deployment, id=deployment_id)
|
deployment = get_object_or_404(Deployment, id=deployment_id)
|
||||||
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
if deployment.status == Status.RUNNING:
|
if deployment.status == Status.RUNNING.name:
|
||||||
return HttpResponseBadRequest("deployment is running")
|
return HttpResponseBadRequest("deployment is running")
|
||||||
try:
|
try:
|
||||||
deployment.delete()
|
deployment.delete()
|
||||||
@ -72,7 +72,5 @@ def create(request):
|
|||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return HttpResponseServerError(e)
|
return HttpResponseServerError(e)
|
||||||
return HttpResponseRedirect("/deployment")
|
|
||||||
|
|
||||||
form = DeploymentForm()
|
return HttpResponseRedirect("/deployment")
|
||||||
return render(request, "deployment/create.html", {"form": form})
|
|
||||||
|
|||||||
@ -9,12 +9,10 @@
|
|||||||
<link href="{% static 'deployment/css/bootstrap.min.css' %}" rel="stylesheet" type="text/css">
|
<link href="{% static 'deployment/css/bootstrap.min.css' %}" rel="stylesheet" type="text/css">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body {% block bodyattr %}{% endblock %}>
|
<body class="d-flex flex-column min-vh-100" {% block bodyattr %}{% endblock %}>
|
||||||
{% include 'header.html' %}
|
{% include 'header.html' %}
|
||||||
<div class="container-md">
|
{% block content %}{% endblock %}
|
||||||
{% block content %}
|
{% block modal %}{% endblock %}
|
||||||
{% endblock %}
|
|
||||||
</div>
|
|
||||||
<script src="{% static 'deployment/js/bootstrap.bundle.min.js' %}" /></script>
|
<script src="{% static 'deployment/js/bootstrap.bundle.min.js' %}" /></script>
|
||||||
{% block script %}{% endblock %}
|
{% block script %}{% endblock %}
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -15,54 +15,62 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if user.is_authenticated %}
|
<div class="container-fluid">
|
||||||
<table class="table table-striped table-hover">
|
|
||||||
<tr>
|
|
||||||
<th scope="col-3">Name</th>
|
|
||||||
<th scope="col-3">Type</th>
|
|
||||||
<th scope="col-3">Status</th>
|
|
||||||
<th class="col-1"></th>
|
|
||||||
<th class="col-2"></th>
|
|
||||||
</tr>
|
|
||||||
{% for deployment in page_obj %}
|
|
||||||
<tr id="{{ deployment.id }}">
|
|
||||||
<th name="name">{{ deployment.name }}</th>
|
|
||||||
<th name="type">{{ deployment.type }}</th>
|
|
||||||
<th name="status">{{ deployment.status }}</th>
|
|
||||||
<th>
|
|
||||||
<a href="{% url 'deployment-details' deployment.id %}">
|
|
||||||
<button class="btn btn-primary">Details</button>
|
|
||||||
</a>
|
|
||||||
</th>
|
|
||||||
{% if deployment.status == "FAILED" or deployment.status == "READY" %}
|
|
||||||
<th name="deploy">
|
|
||||||
<form action="{% url 'deployment-launch' deployment.id %}?page={{ page_obj.number }}" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<button class="btn btn-success" type="submit">Deploy</button>
|
|
||||||
</form>
|
|
||||||
</th>
|
|
||||||
{% elif deployment.status == "RUNNING" %}
|
|
||||||
<th name="deploy">
|
|
||||||
<button class="btn btn-primary" type="button" disabled>
|
|
||||||
<span class="spinner-border spinner-border-sm" aria-hidden="true"></span>
|
|
||||||
<span role="status">Deploy</span>
|
|
||||||
</button>
|
|
||||||
</th>
|
|
||||||
{% else %}
|
|
||||||
<th></th>
|
|
||||||
{% endif %}
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% include 'pagination.html' %}
|
|
||||||
<a class="btn btn-success" href="{% url 'deployment-create' %}" role="button">Create</a>
|
|
||||||
{% else %}
|
|
||||||
<div class="row justify-content-md-center">
|
<div class="row justify-content-md-center">
|
||||||
<div class="col-lg-8 col-md-8 col-sm-6">
|
<div class="col-lg-8 col-md-8 col-sm-6">
|
||||||
<h4 style="text-align: center;">Please log in !</h4>
|
{% if user.is_authenticated %}
|
||||||
|
<table class="table table-striped table-hover">
|
||||||
|
<tr>
|
||||||
|
<th scope="col-3">Name</th>
|
||||||
|
<th scope="col-3">Type</th>
|
||||||
|
<th scope="col-3">Status</th>
|
||||||
|
<th class="col-2"></th>
|
||||||
|
<th class="col-2"></th>
|
||||||
|
</tr>
|
||||||
|
{% for deployment in page_obj %}
|
||||||
|
<tr id="{{ deployment.id }}">
|
||||||
|
<th name="name">{{ deployment.name }}</th>
|
||||||
|
<th name="type">{{ deployment.type }}</th>
|
||||||
|
<th name="status">{{ deployment.status }}</th>
|
||||||
|
<th>
|
||||||
|
<a href="{% url 'deployment-details' deployment.id %}">
|
||||||
|
<button class="btn btn-primary">Details</button>
|
||||||
|
</a>
|
||||||
|
</th>
|
||||||
|
{% if deployment.status == "FAILED" or deployment.status == "READY" %}
|
||||||
|
<th name="deploy">
|
||||||
|
<form action="{% url 'deployment-launch' deployment.id %}?page={{ page_obj.number }}" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
<button class="btn btn-success" type="submit">Deploy</button>
|
||||||
|
</form>
|
||||||
|
</th>
|
||||||
|
{% elif deployment.status == "RUNNING" %}
|
||||||
|
<th name="deploy">
|
||||||
|
<button class="btn btn-primary" type="button" disabled>
|
||||||
|
<span class="spinner-border spinner-border-sm" aria-hidden="true"></span>
|
||||||
|
<span role="status">Deploy</span>
|
||||||
|
</button>
|
||||||
|
</th>
|
||||||
|
{% else %}
|
||||||
|
<th></th>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
{% include 'pagination.html' %}
|
||||||
|
<button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#create-deployment-modal">
|
||||||
|
Create
|
||||||
|
</button>
|
||||||
|
{% else %}
|
||||||
|
<h4 style="text-align: center;">Please log in !</h4>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block modal %}
|
||||||
|
{% include 'deployment/create_modal.html' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block script %}
|
{% block script %}
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block title %} New deployment {% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
{{ user.username }}'s new deployment
|
|
||||||
<form action="" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form }}
|
|
||||||
<input type="submit" value="create">
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
<div class="row justify-content-md-center">
|
|
||||||
<div class="col-lg-8 col-md-8 col-sm-6">
|
|
||||||
<h4 style="text-align: center;">Please log in !</h4>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
29
templates/deployment/create_modal.html
Normal file
29
templates/deployment/create_modal.html
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
<div class="modal fade" id="create-deployment-modal" tabindex="-1">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title">Create new deployment</h5>
|
||||||
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<form id="create-deployment-form" action="{% url 'deployment-create' %}" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="name" class="form-label">Name</label>
|
||||||
|
<input type="name" class="form-control" id="name" name="name" required="">
|
||||||
|
</div>
|
||||||
|
<label for="type" class="form-label">Type</label>
|
||||||
|
<select id="type" name="type" class="form-select" aria-label="Deployment type" required="">
|
||||||
|
<option value="SLIM">Slim</option>
|
||||||
|
<option value="MEDIUM">Medium</option>
|
||||||
|
<option value="LARGE">Large</option>
|
||||||
|
</select>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
|
||||||
|
<button type="submit" form="create-deployment-form" class="btn btn-success">Create</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -3,30 +3,49 @@
|
|||||||
{% block title %} Deployment details: {{ deployment.name }} {% endblock %}
|
{% block title %} Deployment details: {{ deployment.name }} {% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if user.is_authenticated %}
|
<div class="container-fluid">
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<th>id</th>
|
|
||||||
<th>name</th>
|
|
||||||
<th>type</th>
|
|
||||||
<th>status</th>
|
|
||||||
</tr>
|
|
||||||
<tr id="{{ deployment.id }}">
|
|
||||||
<th name="id">{{ deployment.id }}</th>
|
|
||||||
<th name="name">{{ deployment.name }}</th>
|
|
||||||
<th name="type">{{ deployment.type }}</th>
|
|
||||||
<th name="status">{{ deployment.status }}</th>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<form action="" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<input type="submit" value="delete">
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
<div class="row justify-content-md-center">
|
<div class="row justify-content-md-center">
|
||||||
<div class="col-lg-8 col-md-8 col-sm-6">
|
<div class="col-lg-4 col-md-4 col-sm-6">
|
||||||
<h4 style="text-align: center;">Please log in !</h4>
|
{% if user.is_authenticated %}
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" readonly class="form-control-plaintext" id="id" value="{{ deployment.id }}">
|
||||||
|
<label for="id">UUID</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" readonly class="form-control-plaintext" id="type" value="{{ deployment.type }}">
|
||||||
|
<label for="type">Type</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" readonly class="form-control-plaintext" id="status" value="{{ deployment.status }}">
|
||||||
|
<label for="status">Status</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" readonly class="form-control-plaintext" id="created_at" value="{{ deployment.created_at }}">
|
||||||
|
<label for="created-at">Created at</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" readonly class="form-control-plaintext" id="updated_at" value="{{ deployment.updated_at }}">
|
||||||
|
<label for="updated-at">{{ deployment.updated_at }}</label>
|
||||||
|
</div>
|
||||||
|
<form action="" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
<button type="button" onclick="goBack()" class="btn btn-secondary">Back</button>
|
||||||
|
{% if deployment.status != "RUNNING" %}
|
||||||
|
<button type="submit" class="btn btn-danger">Delete</button>
|
||||||
|
{% endif %}
|
||||||
|
</form>
|
||||||
|
{% else %}
|
||||||
|
<h4 style="text-align: center;">Please log in !</h4>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block script %}
|
||||||
|
<script>
|
||||||
|
function goBack() {
|
||||||
|
window.history.back();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -1,23 +1,60 @@
|
|||||||
<div class="container-fluid">
|
<header class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between mb-4 border-bottom">
|
||||||
<header
|
<nav class="navbar navbar-expand-lg bg-dark border-bottom border-body" data-bs-theme="dark" style="width: 100%;">
|
||||||
class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 mb-4 border-bottom">
|
<div class="container-fluid">
|
||||||
<div class="col-md-3 mb-2 mb-md-0">
|
<a class="navbar-brand" href="/">Mumui</a>
|
||||||
<a href="/" class="d-inline-flex link-body-emphasis text-decoration-none">
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar"
|
||||||
Mumui
|
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
</a>
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbar">
|
||||||
|
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="/">Home</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a href="{% url 'deployment' %}" class="nav-link">Deployments</a></li>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="#">About</a></li>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
{% if user.is_authenticated %}
|
||||||
|
<a href="{% url 'logout' %}"><button type="button" class="btn btn-outline-danger me-2">Logout</button></a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{% url 'login' %}"><button type="button" class="btn btn-outline-primary me-2">Login</button></a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
|
||||||
<ul class="nav col-12 col-md-auto mb-2 justify-content-center mb-md-0">
|
|
||||||
<li><a href="{% url 'deployment' %}" class="nav-link px-2">Deployments</a></li>
|
|
||||||
<li><a href="#" class="nav-link px-2">About</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="col-md-3 text-end">
|
<!-- <nav class="navbar navbar-expand-lg bg-dark border-bottom border-body" data-bs-theme="dark">
|
||||||
{% if user.is_authenticated %}
|
<div class="container-fluid">
|
||||||
<a href="{% url 'logout' %}"><button type="button" class="btn btn-outline-danger me-2">Logout</button></a>
|
<a class="navbar-brand" href="#">Navbar</a>
|
||||||
{% else %}
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01"
|
||||||
<a href="{% url 'login' %}"><button type="button" class="btn btn-outline-primary me-2">Login</button></a>
|
aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
{% endif %}
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbarColor01">
|
||||||
|
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link active" aria-current="page" href="#">Home</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="#">Features</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="#">Pricing</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="#">About</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<form class="d-flex" role="search">
|
||||||
|
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
|
||||||
|
<button class="btn btn-outline-light" type="submit">Search</button>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</div>
|
||||||
</div>
|
</nav> -->
|
||||||
@ -3,25 +3,27 @@
|
|||||||
{% block title %}Home{% endblock %}
|
{% block title %}Home{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if user.is_authenticated %}
|
<div class="container-fluid">
|
||||||
<div class="row justify-content-md-center">
|
{% if user.is_authenticated %}
|
||||||
<div class="col-lg-4 col-md-8 col-sm-8">
|
<div class="row justify-content-md-center">
|
||||||
<h2 style="text-align: center;">Hi {{ user.username }} ! How are you ?</h2>
|
<div class="col-lg-4 col-md-8 col-sm-8">
|
||||||
</div>
|
<h2 style="text-align: center;">Hi {{ user.username }} ! How are you ?</h2>
|
||||||
</div>
|
|
||||||
<div class="row justify-content-md-center">
|
|
||||||
<div class="col-lg-6 col-md-8 col-sm-8">
|
|
||||||
<div style="text-align: center;">Forget, i don't care... Please go on
|
|
||||||
<a href="/deployment/">Deployments</a>
|
|
||||||
and enjoy the life !
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="row justify-content-md-center">
|
||||||
{% else %}
|
<div class="col-lg-6 col-md-8 col-sm-8">
|
||||||
<div class="row justify-content-md-center">
|
<div style="text-align: center;">Forget, i don't care... Please go on
|
||||||
<div class="col-lg-6 col-md-8 col-sm-8">
|
<a href="/deployment/">Deployments</a>
|
||||||
<h4 style="text-align: center;">Please log in !</h4>
|
and enjoy the life !
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% else %}
|
||||||
{% endif %}
|
<div class="row justify-content-md-center">
|
||||||
|
<div class="col-lg-6 col-md-8 col-sm-8">
|
||||||
|
<h4 style="text-align: center;">Please log in !</h4>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
<nav aria-label="pagination">
|
<nav aria-label="pagination">
|
||||||
<ul class="pagination justify-content-center">
|
<ul class="pagination justify-content-center">
|
||||||
{% if page_obj.has_previous %}
|
{% if page_obj.has_previous %}
|
||||||
|
|||||||
@ -3,25 +3,27 @@
|
|||||||
{% block title %} Login {% endblock %}
|
{% block title %} Login {% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="row justify-content-md-center">
|
<div class="container-fluid">
|
||||||
<div class="col-lg-4 col-md-4 col-sm-6">
|
<div class="row justify-content-md-center">
|
||||||
{% if not user.is_authenticated %}
|
<div class="col-lg-3 col-md-3 col-sm-4">
|
||||||
<h2>Log in</h2>
|
{% if not user.is_authenticated %}
|
||||||
<form method="post">
|
<h2>Log in</h2>
|
||||||
{% csrf_token %}
|
<form method="post">
|
||||||
<div class="mb-3">
|
{% csrf_token %}
|
||||||
<label for="id_username" class="form-label">Username</label>
|
<div class="mb-3">
|
||||||
<input type="username" class="form-control" id="id_username" name="username" required="">
|
<label for="id_username" class="form-label">Username</label>
|
||||||
</div>
|
<input type="username" class="form-control" id="id_username" name="username" required="">
|
||||||
<div class="mb-3">
|
</div>
|
||||||
<label for="id_password" class="form-label">Password</label>
|
<div class="mb-3">
|
||||||
<input type="password" id="id_password" name="password" class="form-control" required="">
|
<label for="id_password" class="form-label">Password</label>
|
||||||
</div>
|
<input type="password" id="id_password" name="password" class="form-control" required="">
|
||||||
<button type="submit" class="btn btn-success">Log in</button>
|
</div>
|
||||||
</form>
|
<button type="submit" class="btn btn-success">Log in</button>
|
||||||
{% else %}
|
</form>
|
||||||
<h4 style="text-align: center;">You're already log in !</h4>
|
{% else %}
|
||||||
{% endif %}
|
<h4 style="text-align: center;">You're already log in !</h4>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
Loading…
x
Reference in New Issue
Block a user