From 745abc48efdab2c7fbac74dc675c66d293329038 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 25 May 2021 19:55:13 +0200
Subject: [PATCH 1/3] Add balance if user is logged in

---
 uncloud/templates/uncloud/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/uncloud/templates/uncloud/base.html b/uncloud/templates/uncloud/base.html
index 8c5c867..5915bed 100644
--- a/uncloud/templates/uncloud/base.html
+++ b/uncloud/templates/uncloud/base.html
@@ -11,7 +11,8 @@
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
       {% if user.is_authenticated %}
-      <span class="navbar-text">Logged in as {{ user }}.</span>
+      <span class="navbar-text">Logged in as {{ user }}. Your balance:
+      {{ balance }} CHF. </span>
       <li class="nav-item">
         <a class="nav-link" href="{% url 'logout' %}">Logout</a>
       </li>

From 485f08e25cfa36a904b7018ba567d26b4b8300b9 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 25 May 2021 19:55:33 +0200
Subject: [PATCH 2/3] Cleanup views

---
 uncloud/urls.py  | 29 -----------------------------
 uncloud/views.py |  9 +++++++++
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/uncloud/urls.py b/uncloud/urls.py
index bf3672c..6ecfd7a 100644
--- a/uncloud/urls.py
+++ b/uncloud/urls.py
@@ -25,35 +25,6 @@ router = routers.DefaultRouter()
 # Beta endpoints
 router.register(r'beta/vm', vmviews.NicoVMProductViewSet, basename='nicovmproduct')
 
-# VM
-# router.register(r'v1/vm/snapshot', vmviews.VMSnapshotProductViewSet, basename='vmsnapshotproduct')
-# router.register(r'v1/vm/diskimage', vmviews.VMDiskImageProductViewSet, basename='vmdiskimageproduct')
-# router.register(r'v1/vm/disk', vmviews.VMDiskProductViewSet, basename='vmdiskproduct')
-# router.register(r'v1/vm/vm', vmviews.VMProductViewSet, basename='vmproduct')
-
-# Services
-# router.register(r'v1/service/matrix', serviceviews.MatrixServiceProductViewSet, basename='matrixserviceproduct')
-# router.register(r'v1/service/generic', serviceviews.GenericServiceProductViewSet, basename='genericserviceproduct')
-
-
-# Pay
-
-# router.register(r'v1/my/bill', payviews.BillViewSet, basename='bill')
-# router.register(r'v1/my/order', payviews.OrderViewSet, basename='order')
-# router.register(r'v1/my/payment-method', payviews.PaymentMethodViewSet, basename='payment-method')
-
-# admin/staff urls
-# router.register(r'v1/admin/bill', payviews.AdminBillViewSet, basename='admin/bill')
-# router.register(r'v1/admin/order', payviews.AdminOrderViewSet, basename='admin/order')
-# router.register(r'v1/admin/vmhost', vmviews.VMHostViewSet)
-# router.register(r'v1/admin/vmcluster', vmviews.VMClusterViewSet)
-
-# User/Account
-# router.register(r'v1/my/user', authviews.UserViewSet, basename='user')
-# router.register(r'v1/admin/user', authviews.AdminUserViewSet, basename='useradmin')
-# router.register(r'v1/user/register', authviews.AccountManagementViewSet, basename='user/register')
-
-
 ################################################################################
 # v2
 
diff --git a/uncloud/views.py b/uncloud/views.py
index 198abd0..37542bb 100644
--- a/uncloud/views.py
+++ b/uncloud/views.py
@@ -1,4 +1,13 @@
 from django.views.generic.base import TemplateView
 
+from uncloud_pay.selectors import get_balance_for_user
+
 class UncloudIndex(TemplateView):
     template_name = "uncloud/index.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        print(context)
+        if self.request.user.is_authenticated:
+            context['balance'] = get_balance_for_user(self.request.user)
+        return context

From d872357dd1cea11c766382763db06f896d2f0fb3 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 25 May 2021 20:22:18 +0200
Subject: [PATCH 3/3] Fix login -> move to bootstrap5

---
 .../templates/uncloud_auth/login.html         | 25 +++++++++++--------
 .../uncloud_pay/register_stripe.html          |  7 ++++--
 uncloud_service/apps.py                       |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/uncloud_auth/templates/uncloud_auth/login.html b/uncloud_auth/templates/uncloud_auth/login.html
index 887467b..0a84780 100644
--- a/uncloud_auth/templates/uncloud_auth/login.html
+++ b/uncloud_auth/templates/uncloud_auth/login.html
@@ -1,14 +1,19 @@
 {% extends 'uncloud/base.html' %}
-{% load bootstrap4 %}
+{% load bootstrap5 %}
 
-{% block body %}
-<h1>Login to uncloud</h1>
-<form method="post" class="form">
-  {% csrf_token %}
-  {% bootstrap_form form %}
-  {% buttons %}
-  <button type="submit" class="btn btn-primary">Submit</button>
-  {% endbuttons %}
-</form>
+
+{% block bootstrap5_content %}
+    <div class="container">
+      <div id="content">
+        <h1>Login to uncloud</h1>
+        <form method="post" class="form">
+          {% csrf_token %}
+          {% bootstrap_form form %}
+          {% buttons %}
+          <button type="submit" class="btn btn-primary">Submit</button>
+          {% endbuttons %}
+        </form>
+      </div>
+    </div>
 
 {% endblock %}
diff --git a/uncloud_pay/templates/uncloud_pay/register_stripe.html b/uncloud_pay/templates/uncloud_pay/register_stripe.html
index 7205261..9613701 100644
--- a/uncloud_pay/templates/uncloud_pay/register_stripe.html
+++ b/uncloud_pay/templates/uncloud_pay/register_stripe.html
@@ -13,12 +13,15 @@
           By submitting I authorise to send instructions to
           the financial institution that issued my card to take
           payments from my card account in accordance with the
-        terms of my agreement with you.
+          terms of my agreement with you.
         </p>
 
         <span id="message"></span>
+
         <div id="card-element"></div>
+        <div id="card-errors" role="alert"></div>
         <button type='button' id="card-button">Save</button>
+
         <div id="ungleichmessage">The card will be registered with stripe.</div>
 
         <div id="goback" style="display: none;">
@@ -30,8 +33,8 @@
     <!-- Enable Stripe from UI elements - standard code -->
     <script>
       var stripe = Stripe('{{ stripe_pk }}');
-
       var elements = stripe.elements();
+
       var cardElement = elements.create('card');
       cardElement.mount('#card-element');
 
diff --git a/uncloud_service/apps.py b/uncloud_service/apps.py
index 184e181..190bd35 100644
--- a/uncloud_service/apps.py
+++ b/uncloud_service/apps.py
@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class UngleichServiceConfig(AppConfig):
-    name = 'ungleich_service'
+    name = 'uncloud_service'