From 8ca5b2d1048a8118a0374b8c6b564a3436cde864 Mon Sep 17 00:00:00 2001 From: Amal Elshihaby Date: Tue, 17 Aug 2021 19:05:44 +0200 Subject: [PATCH] Add the Pricing Page and update the pricing model --- .../static/matrixhosting/css/theme.css | 49 +---- .../matrixhosting/includes/_footer.html | 5 +- .../matrixhosting/includes/_navbar.html | 11 +- .../templates/matrixhosting/pricing.html | 195 ++++++++++++++++++ matrixhosting/tests.py | 4 +- matrixhosting/urls.py | 1 + matrixhosting/views.py | 12 +- uncloud/.env | 4 +- .../migrations/0029_auto_20210817_1129.py | 23 +++ ...30_pricingplan_monthly_maintenance_fees.py | 18 ++ uncloud_pay/models.py | 18 +- uncloud_pay/tests.py | 20 +- uncloud_pay/utils.py | 5 +- 13 files changed, 287 insertions(+), 78 deletions(-) create mode 100644 matrixhosting/templates/matrixhosting/pricing.html create mode 100644 uncloud_pay/migrations/0029_auto_20210817_1129.py create mode 100644 uncloud_pay/migrations/0030_pricingplan_monthly_maintenance_fees.py diff --git a/matrixhosting/static/matrixhosting/css/theme.css b/matrixhosting/static/matrixhosting/css/theme.css index a65e777..416c4d2 100644 --- a/matrixhosting/static/matrixhosting/css/theme.css +++ b/matrixhosting/static/matrixhosting/css/theme.css @@ -1,50 +1,3 @@ -/*------------------------------------------------------------------- - - - Template Name: Payyed - Description: Money Transfer and Online Payments HTML Template - Template URI: http://demo.harnishdesign.net/html/payyed - Author: Harnish Design - Author URI: https://themeforest.net/user/harnishdesign - - -========================================= - Table of Contents -========================================= - - - Basic - - Helpers Classes - - Layouts - - Header - - Logo - - Primary Menu - - Secondary Nav - - Page Header - - Profile - - Dashboard - - Cards & Bank Account Page - - Blog - - Elements - - Featured Box - - Team - - Accordion & Toggle - - Tabs - - Easy Responsive Tab Accordion - - Custom Background - - Owl Carousel - - Brands Grid - - Banner - - Simple ul - - Steps Progress bar - - Footer - - Social Icons - - Back to Top - - Extra - --------------------------------------------------------------*/ -/* =================================== */ -/* Basic Style -/* =================================== */ body, html { height: 100%; } @@ -559,7 +512,7 @@ body, html { .section { position: relative; padding: 104px 0; - padding: 6.5rem 0; + padding: 5.5rem 0; } @media (max-width: 767.98px) { diff --git a/matrixhosting/templates/matrixhosting/includes/_footer.html b/matrixhosting/templates/matrixhosting/includes/_footer.html index 14e23bd..0ad7806 100644 --- a/matrixhosting/templates/matrixhosting/includes/_footer.html +++ b/matrixhosting/templates/matrixhosting/includes/_footer.html @@ -6,9 +6,8 @@

{% trans "Information" %}

diff --git a/matrixhosting/templates/matrixhosting/includes/_navbar.html b/matrixhosting/templates/matrixhosting/includes/_navbar.html index 78032aa..01aca4f 100644 --- a/matrixhosting/templates/matrixhosting/includes/_navbar.html +++ b/matrixhosting/templates/matrixhosting/includes/_navbar.html @@ -20,18 +20,19 @@ {% url 'matrix:orders' as orders_url %} {% url 'matrix:instances' as instances_url %} {% url 'matrix:billing' as payments_url %} + {% url 'matrix:pricing' as pricing_url %}