Merge branch 'CodingPirates:master' into master

JakobLibak · Oct 23, 2021 · 9982038 · 9982038
2 parents cdf2043 + ef23dc1
commit 9982038
Show file tree

Hide file tree

Showing 28 changed files with 465 additions and 444 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v10.19.0
diff --git a/forenings_medlemmer/settings.py b/forenings_medlemmer/settings.py
@@ -73,7 +73,9 @@
 
 ALLOWED_HOSTS = [host.replace(" ", "") for host in env.list("ALLOWED_HOSTS")]
 BASE_URL = os.environ["BASE_URL"]
-
+assert not BASE_URL.endswith(
+    "/"
+), f"BASE_URL environment variable must not end with '/'. It is set to '{BASE_URL}'."
 
 INSTALLED_APPS = (
     "bootstrap4",

diff --git a/members/forms/signup_form.py b/members/forms/signup_form.py
@@ -11,7 +11,7 @@ def __init__(self, *args, **kwargs):
         super(signupForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
         self.helper.form_method = "post"
-        self.helper.form_action = "entry_page"
+        self.helper.form_action = "account_create"
         self.helper.html5_required = True
         self.helper.layout = Layout(
             Hidden("form_id", "signup", id="id_form_id"),

diff --git a/members/static/members/sass/account_create.scss b/members/static/members/sass/account_create.scss
@@ -0,0 +1,10 @@
+@use "definitions";
+@use "buttons";
+
+
+#signup-form {
+    border: 1px solid rgba(0, 0, 0, 0.125);
+    padding: 1.25rem;
+    background-clip: border-box;
+    border-radius: 0.25rem;
+}
diff --git a/members/static/members/sass/entry_page.scss b/members/static/members/sass/entry_page.scss
@@ -47,10 +47,3 @@
         }
     }
 }
-
-#signup-form {
-    border: 1px solid rgba(0, 0, 0, 0.125);
-    padding: 1.25rem;
-    background-clip: border-box;
-    border-radius: 0.25rem;
-}
diff --git a/members/static/members/sass/header.scss b/members/static/members/sass/header.scss
@@ -36,10 +36,10 @@ nav {
             text-align: center !important;
         }
     }
-}
-#login-logout {
-    text-align: right;
-    flex-grow: 2;
+    > .account-sep {
+        text-align: right;
+        flex-grow: 2;
+    }
 }
 
 .inactive {

diff --git a/members/templates/members/account_create.html b/members/templates/members/account_create.html
@@ -0,0 +1,12 @@
+{% extends 'members/base.html' %} {% load crispy_forms_tags %} {% load static %}
+{% block content %}
+
+  <h1>Tilmelding til Coding Pirates</h1>
+  <p>
+    Indtast barnets og forældrenes informationer, for at tilmelde en Coding
+    Pirates-workshop, eller for at komme med på ventelisten.
+  </p>
+  <div id="signup-form">
+      {% crispy signupform %}
+  </div>
+{% endblock %}
diff --git a/members/templates/members/base.html b/members/templates/members/base.html
@@ -27,15 +27,17 @@
 </head>
 
 <body>
-    {% include "members/header.html" %}
+    {% if not skip_context %} {% include "members/header.html" %} {% endif %}
     <main>
         {% block content %}{% endblock %}
     </main>
+    {% if not skip_context %}
     <footer>
         <p>Coding Pirates Denmark - Sverigesgade 20, 1., 5000 Odense C,
         E-mail: <a href="mailto:[email protected]">[email protected]</a>
         <abbr title="Telefon">Tlf</abbr>: +45 27 83 65 25,
         CVR: 35 55 23 16</p>
     </footer>
+    {% endif %}
 </body>
 </html>
diff --git a/members/templates/members/entry_page.html b/members/templates/members/entry_page.html
@@ -1,18 +1,7 @@
 {% extends 'members/base.html' %} {% load crispy_forms_tags %} {% load static %}
 {% block content %}
 
-{% if user.is_authenticated %}
   <div id="user-action-container">
-    <div>
-      <span><i class="fa-users fa fa-4x"></i></span>
-      <div>
-        <h4>Jeres familie</h4>
-        <a href="{% url 'family_detail' %}">
-          Se familie <i class="fa fa-long-arrow-alt-right"></i>
-        </a>
-          <p>Se og ret stamdata for din familie</p>
-      </div>
-    </div>
     <div>
       <span><i class="fa-list-ol fa fa-4x"></i></span>
       <div>
@@ -21,7 +10,7 @@ <h4>Opskriv til afdelinger</h4>
           Afdelinger <i class="fa fa-long-arrow-alt-right"></i>
         </a>
         <p>
-          Her kan du opskrive dig som interesseret til en af vores 
+          Her kan du opskrive dig som interesseret til en af vores
           afdelinger til næste gang vi starter nye hold op
         </p>
       </div>
@@ -49,7 +38,7 @@ <h4>Bliv medlem af en lokalforening</h4>
     <div>
       <span><i class="fa-users fa fa-4x"></i></span>
       <div>
-        <h4>Bliv støttemedlemskab</h4>
+        <h4>Bliv støttemedlem</h4>
         <a href="{% url 'support_membership' %}">
           Støttemedlemskaber <i class="fa fa-long-arrow-alt-right"></i>
         </a>
@@ -65,14 +54,4 @@ <h4>Bliv støttemedlemskab</h4>
     <a href="mailto:[email protected]">[email protected]</a>.
   </p>
 
-{% else %}
-  <h1>Tilmelding til Coding Pirates</h1>
-  <p>
-    Indtast barnets og forældrenes informationer, for at tilmelde en Coding
-    Pirates-workshop, eller for at komme med på ventelisten.
-  </p>
-  <div id="signup-form">
-      {% crispy signupform %}
-  </div>
-{% endif %}
 {% endblock %}
diff --git a/members/templates/members/header.html b/members/templates/members/header.html
@@ -3,16 +3,17 @@
     <a id="toggle" class="active" href="#" onClick="toggleNav()">
         <i class="fa fa-bars fa-2x"></i>
     </a>
+    <a href="{% url "entry_page" %}">Oversigt</a>
+    <a href="{% url "department_signup" %}">Afdelinger</a>
+    <a href="{% url "activities" %}">Arrangementer</a>
+    <a href="{% url "membership" %}">Medlemskaber</a>
+    <a href="{% url "support_membership" %}">Støttemedlemskaber</a>
+    <div class="account-sep"></div>
     {% if user.is_authenticated %}
-        <a href="{% url "entry_page" %}">Oversigt</a>
         <a href="{% url "family_detail" %}">Familie</a>
-        <a href="{% url "department_signup" %}">Afdelinger</a>
-        <a href="{% url "activities" %}">Arrangementer</a>
-        <a href="{% url "membership" %}">Medlemskaber</a>
-        <a href="{% url "support_membership" %}">Støttemedlemskaber</a>
         <a id="login-logout" href="{% url 'person_logout' %}">Log ud</a>
     {% else %}
-        <a href="{% url "entry_page" %}">Tilmeld barn</a>
+        <a href="{% url "account_create" %}">Tilmeld barn</a>
         <a href="{% url "volunteer_signup" %}">Bliv frivillig</a>
         <a id="login-logout" href="{% url 'person_login' %}">Log ind</a>
     {% endif %}

diff --git a/members/templates/members/login.html b/members/templates/members/login.html
@@ -30,6 +30,18 @@
                 </div>
             </div>
         </div>
+        <div class="row center">
+            <div class="loginBox col-lg-6 col-md-7 col-sm-8 col-11 ">
+                <div class="loginTitle"><span>Opret bruger</span></div>
+                    <a href="{% url 'account_create' %}" title="Tilmeld barn" class="button-primary-color block-button">
+                        Tilmeld barn
+                    </a>
+                    <a href="{% url 'volunteer_signup' %}" title="Bliv frivillig" class="button-primary-color block-button">
+                        Bliv frivillig
+                    </a>
+                </div>
+            </div>
+        </div>
     </form>
 </div>
 {% endblock %}
diff --git a/members/templates/members/membership.html b/members/templates/members/membership.html
@@ -37,7 +37,7 @@ <h2>Nuværende og tidligere medlemsskaber</h2>
         <tr>
           <th>Navn</th>
           <th>Aktivitet</th>
-          <th>Afdeling</th>
+          <th>Forening</th>
           <th>Start</th>
           <th>Slut</th>
         </tr>
@@ -56,7 +56,7 @@ <h2>Nuværende og tidligere medlemsskaber</h2>
                 </a>
               {%endif%}
             </td>
-            <td>{{participation.activity.department.name}}</td>
+            <td>{{participation.activity.union.name}}</td>
             <td>{{participation.activity.start_date}}</td>
             <td>{{participation.activity.end_date}}</td>
           </tr>
@@ -78,7 +78,7 @@ <h2>Tilmeld som medlem her</h2>
     <table>
       <thead>
         <tr>
-          <th>Afdeling</th>
+          <th>Forening</th>
           <th>Aktivitet</th>
           <th>Beskrivelse</th>
           <th>Handling</th>
@@ -88,7 +88,7 @@ <h2>Tilmeld som medlem her</h2>
         {% for activity in membership_activities %}
           <tr>
             <td>
-              Coding Pirates {{activity.department.name}}
+              {{activity.union.name}}
             </td>
             <td>{{activity.name}}</td>
             <td>

diff --git a/members/templates/members/support_membership.html b/members/templates/members/support_membership.html
@@ -35,7 +35,7 @@ <h2>Nuværende og tidligere støttemedlemsskaber</h2>
         <tr>
           <th>Navn</th>
           <th>Aktivitet</th>
-          <th>Afdeling</th>
+          <th>Forening</th>
           <th>Start</th>
           <th>Slut</th>
         </tr>
@@ -54,7 +54,7 @@ <h2>Nuværende og tidligere støttemedlemsskaber</h2>
                 </a>
               {%endif%}
             </td>
-            <td>{{participation.activity.department.name}}</td>
+            <td>{{participation.activity.union.name}}</td>
             <td>{{participation.activity.start_date}}</td>
             <td>{{participation.activity.end_date}}</td>
           </tr>
@@ -76,7 +76,7 @@ <h2>Tilmeld som støttemedlem her</h2>
     <table>
       <thead>
         <tr>
-          <th>Afdeling</th>
+          <th>Forening</th>
           <th>Aktivitet</th>
           <th>Beskrivelse</th>
           <th>Handling</th>
@@ -86,7 +86,7 @@ <h2>Tilmeld som støttemedlem her</h2>
         {% for activity in activities %}
           <tr>
             <td>
-              Coding Pirates {{activity.department.name}}
+              {{activity.union.name}}
             </td>
             <td>{{activity.name}}</td>
             <td>

diff --git a/...sts/test_functional/test_create_family.py → ...ts/test_functional/test_account_create.py b/...sts/test_functional/test_create_family.py → ...ts/test_functional/test_account_create.py
@@ -16,7 +16,7 @@
 """
 
 
-class SignUpTest(StaticLiveServerTestCase):
+class AccountCreateTest(StaticLiveServerTestCase):
     host = socket.gethostbyname(socket.gethostname())
     serialized_rollback = True
 
@@ -32,9 +32,9 @@ def tearDown(self):
         self.browser.save_screenshot("test-screens/sign_up_screen_final.png")
         self.browser.quit()
 
-    def test_entry_page(self):
+    def test_account_create(self):
         # Loads the front page
-        self.browser.get(self.live_server_url)
+        self.browser.get(f"{self.live_server_url}/account/create")
         self.assertEqual("Coding Pirates Medlemssystem", self.browser.title)
         self.browser.save_screenshot("test-screens/sign_up_screen_1.png")
 
@@ -96,8 +96,5 @@ def test_entry_page(self):
 
         self.browser.find_element_by_xpath("//input[@type='submit']").click()
 
-        # Check that we were redirectet to overview page
-        elements = self.browser.find_elements_by_xpath(
-            "//*[text()[contains(.,'For yderligere hjælp med at bruge denne side')]]"
-        )
-        self.assertGreater(len(elements), 0)
+        # Check that we were redirectet to front page
+        self.assertEqual(f"{self.live_server_url}/", self.browser.current_url)
diff --git a/members/tests/test_functional/test_account_login.py b/members/tests/test_functional/test_account_login.py
@@ -0,0 +1,56 @@
+import os
+import socket
+
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from selenium import webdriver
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+
+from members.tests.factories import (
+    MemberFactory,
+)
+
+"""
+This test goes to the account login page
+"""
+
+
+class AccountLoginTest(StaticLiveServerTestCase):
+    host = socket.gethostbyname(socket.gethostname())
+    serialized_rollback = True
+
+    def setUp(self):
+        self.member = MemberFactory.create()
+
+        self.browser = webdriver.Remote(
+            "http://selenium:4444/wd/hub", DesiredCapabilities.CHROME
+        )
+
+    def tearDown(self):
+        if not os.path.exists("test-screens"):
+            os.mkdir("test-screens")
+        self.browser.save_screenshot("test-screens/activities_list_final.png")
+        self.browser.quit()
+
+    def test_account_login(self):
+        self.browser.get(f"{self.live_server_url}/account/login")
+        self.assertIn(
+            "Log ind",
+            [
+                e.text
+                for e in self.browser.find_elements_by_xpath(
+                    "//body/descendant-or-self::*"
+                )
+            ],
+        )
+        self.browser.find_element_by_link_text("Log ind")
+        self.assertIn(
+            "Opret bruger",
+            [
+                e.text
+                for e in self.browser.find_elements_by_xpath(
+                    "//body/descendant-or-self::*"
+                )
+            ],
+        )
+        self.browser.find_element_by_link_text("Tilmeld barn")
+        self.browser.find_element_by_link_text("Bliv frivillig")