amal/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Test Full cycle and fix some issues

Browse source
This commit is contained in:
amalelshihaby 2021-08-16 10:46:59 +02:00
commit 2e05ebbf67
19 changed files with 131 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

28
matrixhosting/templates/matrixhosting/base.html
View file

@ -44,7 +44,35 @@
<div id="main-wrapper">
{% block navbar %} {% include "matrixhosting/includes/_navbar.html" with transparent_header=transparent_header %} {%endblock %}
{% block main %}
<div class="container">
<!-- Steps Progress bar -->
{% if messages %}
<div class="row">
{% for message in messages %}
{% if 'error' in message.tags %}
<div class="col-lg-12 alert alert-danger" role="alert">
<h4 class="alert-heading">{%trans "Error!" %}</h4>
<p class="mb-0">
{{ message|safe }}
</p>
</div>
{% else %}
<div class="col-lg-12 alert alert-success" role="alert">
<p class="mb-0 float-left">
{{ message|safe }}
</p>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endif %}
{% endfor %}
</div>
{% endif %}
{% block content %} {% endblock %}
</div>
{% endblock %}
{% include "matrixhosting/includes/_footer.html" %}
</div>

2
matrixhosting/templates/matrixhosting/bills.html
View file

@ -5,7 +5,6 @@
{% block title %} Bills {% endblock %}
{% block content %}
<div class="container">
<div class="bg-white shadow-md rounded p-4 my-4">
<div class="row">
<div class="col-md-3">
@ -182,7 +181,6 @@
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}
<script>

2
matrixhosting/templates/matrixhosting/cards.html
View file

@ -5,7 +5,6 @@
{% block title %} Payment Methods {% endblock %}
{% block content %}
<div class="container">
<div class="bg-white shadow-md rounded p-4 my-4">
<div class="row">
<div class="col-md-3">
@ -128,7 +127,6 @@
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}
<script src="https://js.stripe.com/v3/"></script>

6
matrixhosting/templates/matrixhosting/includes/_navbar.html
View file

@ -18,6 +18,7 @@
============================== -->
{% url 'matrix:index' as index_url %}
{% url 'matrix:orders' as orders_url %}
{% url 'matrix:instances' as instances_url %}
{% url 'matrix:billing' as payments_url %}
<nav class="primary-menu navbar navbar-expand-lg">
<div id="header-nav" class="collapse navbar-collapse">
@ -27,8 +28,9 @@
<li><a href="">Pricing</a></li>
<li><a href="">Contact Us</a></li>
{% else %}
<li><a class="{% if request.path == orders_url %}active{%endif%}" href="{{orders_url}}">Orders</a></li>
<li class="{% if request.path == payments_url %}active{%endif%}"><a href="{{payments_url}}">{%trans "Billing" %}</a></li>
<li class="{% if orders_url in request.path %}active{%endif%}"><a href="{{orders_url}}">Orders</a></li>
<li class="{% if instances_url in request.path %}active{%endif%}"><a href="{{instances_url}}">Instances</a></li>
<li class="{% if payments_url in request.path %}active{%endif%}"><a href="{{payments_url}}">{%trans "Billing" %}</a></li>
<li><a href="">Help</a></li>
{% endif %}
</ul>

2
matrixhosting/templates/matrixhosting/index.html
View file

@ -16,7 +16,7 @@
{% endwith %}
{% endblock %}
{% block content %}
{% block main %}
<!-- Content
============================================= -->
<div id="content">

24
matrixhosting/templates/matrixhosting/instances.html
View file

@ -7,18 +7,26 @@
{% block content %}
<!-- Page Content -->
{% csrf_token %}
<div class="container">
<div class="row p-1 mt-4">
<div class="col-lg-12 bg-white shadow-sm border border-light rounded py-4 mb-4">
<h3 class="text-5 font-weight-400 d-flex align-items-center px-1 mb-4">{% trans "Instances"%}</h3>
<div class="row">
<div class="col-6 col-sm-6">
<h3 class="text-5 font-weight-400 d-flex align-items-center px-1 mb-4">{% trans "Instances"%}</h3>
</div>
<div class="col-6 col-sm-6">
<div class="float-right">
<a class="border border-primary rounded p-2" href="{% url 'matrix:payment' %}">{% trans "Request New Instance"%}</a>
</div>
</div>
</div>
<!-- Title
=============================== -->
<div class="transaction-title py-2 px-1">
<div class="row">
<div class="col-1 col-sm-1 text-center"><span class="">{% trans "ID"%}</span></div>
<div class="col-2 col-sm-2 text-center"><span class="">{% trans "Creation Date"%}</span></div>
<div class="col-3 col-sm-3 d-none d-sm-block text-center">{% trans "Homeserver Domain"%}</div>
<div class="col-3 col-sm-3 text-right">{% trans "WebClient Domain"%}</div>
<div class="col-3 col-sm-3 text-center">{% trans "Homeserver Domain"%}</div>
<div class="col-3 col-sm-3 text-center">{% trans "WebClient Domain"%}</div>
<div class="col-1 col-sm-1 text-center"><span class="">{% trans "Order"%}</span></div>
<div class="col-2 col-sm-2 text-center">{% trans "Termination Date"%}</div>
</div>
@ -33,10 +41,10 @@
<div class="row align-items-center flex-row">
<div class="col-1 col-sm-1 text-center"> <span class="d-block text-3 font-weight-400">#{{instance.id}}</span></div>
<div class="col-2 col-sm-2 text-center"> <span class="d-block text-2 font-weight-300">{{instance.creation_date|date:"Y-m-d"}}</span></div>
<div class="col-3 col-sm-3 d-none d-sm-block text-right text-1"> <span>{{instance.homeserver_domain}}</span> </div>
<div class="col-3 col-sm-3 d-none d-sm-block text-right text-1"> <span>{{instance.webclient_domain}}</span> </div>
<div class="col-3 col-sm-3 text-center text-1"> <span>{{instance.homeserver_domain}}</span> </div>
<div class="col-3 col-sm-3 text-center text-1"> <span>{{instance.webclient_domain}}</span> </div>
<div class="col-1 col-sm-1 text-center text-2"><span class="">#{{instance.order.id}}</span></div>
<div class="col-2 col-sm-2 d-none d-sm-block text-center text-2"> <span class=" text-uppercase">{{order.termination_date|date:"Y-m-d"}}</span> </div>
<div class="col-2 col-sm-2 text-center text-2"> <span class=" text-uppercase">{{order.termination_date|date:"Y-m-d"}}</span> </div>
</div>
</div>
{%endfor%}
@ -45,8 +53,6 @@
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}

4
matrixhosting/templates/matrixhosting/order_confirmation.html
View file

@ -5,7 +5,6 @@
{% block title %} Request Details {% endblock %}
{% block content %}
<div class="container">
<!-- Steps Progress bar -->
<div class="row mt-3 mb-4">
<div class="col-lg-12 mx-auto mb-4">
@ -15,7 +14,7 @@
<div class="progress">
<div class="progress-bar"></div>
</div>
<a href="#" class="step-dot"></a> </div>
<a href="{% url 'matrix:payment' %}" class="step-dot"></a> </div>
<div class="col-4 step active">
<div class="step-name">{%trans "Confirm" %}</div>
<div class="progress">
@ -199,7 +198,6 @@
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}

27
matrixhosting/templates/matrixhosting/order_details.html
View file

@ -5,31 +5,6 @@
{% block title %} Request Details {% endblock %}
{% block content %}
<div class="container">
<!-- Steps Progress bar -->
{% if messages %}
<div class="row">
{% for message in messages %}
{% if 'error' in message.tags %}
<div class="col-lg-12 alert alert-danger" role="alert">
<h4 class="alert-heading">{%trans "Error!" %}</h4>
<p class="mb-0">
{{ message|safe }}
</p>
</div>
{% else %}
<div class="col-lg-12 alert alert-success" role="alert">
<p class="mb-0 float-left">
{{ message|safe }}
</p>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endif %}
{% endfor %}
</div>
{% endif %}
<div class="row mt-3 mb-4">
<div class="col-lg-12 mx-auto mb-4">
<div class="row widget-steps">
@ -264,8 +239,6 @@
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}

6
matrixhosting/templates/matrixhosting/order_success.html
View file

@ -5,7 +5,6 @@
{% block title %} Request Details {% endblock %}
{% block content %}
<div class="container">
<div class="row mt-3 mb-4">
<div class="col-lg-12 mx-auto mb-4">
<div class="row widget-steps">
@ -41,12 +40,11 @@
<p class="text-success text-8 font-weight-500 line-height-07">{%trans "Success!" %}</p>
<p class="lead">{%trans "Order has been successfully added. Your VM will be up and running in a few moments. " %}</p>
</div>
<p class="text-3 mb-4">{%trans "We will send you a confirmation email as soon as it is ready." %} {%trans "Go to your dashboard" %} <a class="btn-link" href="{% url 'matrix:billing' %}">{%trans "Billing" %}</a>.</p>
<a href="{% url 'matrix:invoice_download' %}" class="btn btn-white border border-success text-success" role="button"><i class="fas fa-print"></i> {%trans "Download Invoice" %}</a>
<p class="text-3 mb-4">{%trans "We will send you a confirmation email as soon as it is ready." %} {%trans "Go to your dashboard" %} <a class="btn-link" href="{% url 'matrixhosting:bills' %}">{%trans "Billing" %}</a>.</p>
<a href="{% url 'matrix:invoice_download' bill_id=bill_id %}" class="btn btn-white border border-success text-success" role="button"><i class="fas fa-print"></i> {%trans "Download Invoice" %}</a>
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}

3
matrixhosting/templates/matrixhosting/orders.html
View file

@ -7,7 +7,6 @@
{% block content %}
<!-- Page Content -->
{% csrf_token %}
<div class="container">
<div class="row p-1 mt-4">
<div class="col-lg-12 bg-white shadow-sm border border-light rounded py-4 mb-4">
<h3 class="text-5 font-weight-400 d-flex align-items-center px-1 mb-4">{% trans "Orders"%}</h3>
@ -104,8 +103,6 @@
</div>
</div>
</div>
</div>
<div class="alert" role="alert" id="result"></div>
<!-- /.banner -->
{% endblock %}

2
matrixhosting/templates/matrixhosting/payments.html
View file

@ -5,7 +5,6 @@
{% block title %} Payments {% endblock %}
{% block content %}
<div class="container">
<div class="bg-white shadow-md rounded p-4 my-4">
<div class="row">
<div class="col-md-3">
@ -116,7 +115,6 @@
</div>
</div>
</div>
</div>
{% endblock %}
{% block js_extra %}