diff --git a/deployment/views.py b/deployment/views.py index 29cb137..6272252 100644 --- a/deployment/views.py +++ b/deployment/views.py @@ -17,7 +17,7 @@ def index(request): deployments = Deployment.objects.filter(user=request.user.id).order_by( "-created_at" ) - paginator = Paginator(deployments, 5) + paginator = Paginator(deployments, 10) page_number = request.GET.get("page") 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) if request.method == "POST": - if deployment.status == Status.RUNNING: + if deployment.status == Status.RUNNING.name: return HttpResponseBadRequest("deployment is running") try: deployment.delete() @@ -72,7 +72,5 @@ def create(request): ) except Exception as e: return HttpResponseServerError(e) - return HttpResponseRedirect("/deployment") - - form = DeploymentForm() - return render(request, "deployment/create.html", {"form": form}) + + return HttpResponseRedirect("/deployment") diff --git a/templates/base.html b/templates/base.html index a480ccd..e901045 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,12 +9,10 @@ - + {% include 'header.html' %} -
- {% block content %} - {% endblock %} -
+ {% block content %}{% endblock %} + {% block modal %}{% endblock %} {% block script %}{% endblock %} diff --git a/templates/deployment/board.html b/templates/deployment/board.html index b0f07a9..5b02029 100644 --- a/templates/deployment/board.html +++ b/templates/deployment/board.html @@ -15,54 +15,62 @@ {% endblock %} {% block content %} - {% if user.is_authenticated %} - - - - - - - - - {% for deployment in page_obj %} - - - - - - {% if deployment.status == "FAILED" or deployment.status == "READY" %} - - {% elif deployment.status == "RUNNING" %} - - {% else %} - - {% endif %} - - {% endfor %} -
NameTypeStatus
{{ deployment.name }}{{ deployment.type }}{{ deployment.status }} - - - - -
- {% csrf_token %} - -
- 		- -
- {% include 'pagination.html' %} - Create - {% else %} +
-

Please log in !

+ {% if user.is_authenticated %} + + + + + + + + + {% for deployment in page_obj %} + + + + + + {% if deployment.status == "FAILED" or deployment.status == "READY" %} + + {% elif deployment.status == "RUNNING" %} + + {% else %} + + {% endif %} + + {% endfor %} +
NameTypeStatus
{{ deployment.name }}{{ deployment.type }}{{ deployment.status }} + + + + +
+ {% csrf_token %} + +
+ 		+ +
+ {% include 'pagination.html' %} + + {% else %} +

Please log in !

+ {% endif %}
- {% endif %} +
+{% endblock %} + +{% block modal %} + {% include 'deployment/create_modal.html' %} {% endblock %} {% block script %} diff --git a/templates/deployment/create.html b/templates/deployment/create.html deleted file mode 100644 index b817c52..0000000 --- a/templates/deployment/create.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends 'base.html' %} - -{% block title %} New deployment {% endblock %} - -{% block content %} - {% if user.is_authenticated %} - {{ user.username }}'s new deployment -
- {% csrf_token %} - {{ form }} - -
- {% else %} -
-
-

Please log in !

-
-
- {% endif %} -{% endblock %} \ No newline at end of file diff --git a/templates/deployment/create_modal.html b/templates/deployment/create_modal.html new file mode 100644 index 0000000..bc301a2 --- /dev/null +++ b/templates/deployment/create_modal.html @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/templates/deployment/details.html b/templates/deployment/details.html index afbc81a..9bf1cde 100644 --- a/templates/deployment/details.html +++ b/templates/deployment/details.html @@ -3,30 +3,49 @@ {% block title %} Deployment details: {{ deployment.name }} {% endblock %} {% block content %} - {% if user.is_authenticated %} - - - - - - - - - - - - - -
idnametypestatus
{{ deployment.id }}{{ deployment.name }}{{ deployment.type }}{{ deployment.status }}
-
- {% csrf_token %} - -
- {% else %} +
-
-

Please log in !

+
+ {% if user.is_authenticated %} +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ {% csrf_token %} + + {% if deployment.status != "RUNNING" %} + + {% endif %} +
+ {% else %} +

Please log in !

+ {% endif %}
- {% endif %} +
+{% endblock %} + +{% block script %} + {% endblock %} \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 76573db..aa616c3 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,23 +1,60 @@ -
-
-
- - Mumui - +
+ +
- -
- {% if user.is_authenticated %} - - {% else %} - - {% endif %} + \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index e684a71..754cfe7 100644 --- a/templates/home.html +++ b/templates/home.html @@ -3,25 +3,27 @@ {% block title %}Home{% endblock %} {% block content %} - {% if user.is_authenticated %} -
-
-

Hi {{ user.username }} ! How are you ?

-
-
-
-
-
Forget, i don't care... Please go on - Deployments - and enjoy the life ! +
+ {% if user.is_authenticated %} +
+
+

Hi {{ user.username }} ! How are you ?

-
- {% else %} -
-
-

Please log in !

+
+
+
Forget, i don't care... Please go on + Deployments + and enjoy the life ! +
+
-
- {% endif %} + {% else %} +
+
+

Please log in !

+
+
+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/pagination.html b/templates/pagination.html index 801c5dd..978903b 100644 --- a/templates/pagination.html +++ b/templates/pagination.html @@ -1,4 +1,3 @@ -