Merge pull request #534 from rl-institut/release/v1.3.0

Release/v1.3.0

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0]
+### Changed
+- wording and image on mobile LP
+- added buttons on mobile LP to skip onboarding 
+- default stations are set, if user skips route page
+- desktop LP design (wording and image)
+
 ## [1.2.0] - 2020-10-05
 ### Added
 - posthog event to distinguish between mobile/desktop device

e_metrobus/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.2.0"
+__version__ = "1.3.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

e_metrobus/navigation/tests/test_smoke.py

@@ -4,6 +4,8 @@
 from django.test import Client
 from django.urls import reverse
 
+from e_metrobus.navigation import stations
+
 
 def test_landing_page():
     client = Client()
@@ -19,11 +21,12 @@ def test_welcome_page():
     assert response.status_code == 200
 
 
-def test_route_redirect():
+def test_default_route():
     client = Client()
     url = reverse("navigation:dashboard")
     response = client.get(url)
-    assert response.status_code == 302
+    assert response.status_code == 200
+    assert client.session["stations"] == stations.DEFAULT_STATIONS
 
 
 def test_route_page():

e_metrobus/navigation/views.py

@@ -14,11 +14,11 @@
 )
 
 
-class CheckStationsMixin:
+class DefaultStationsMixin:
     def get(self, request, *args, **kwargs):
         if "stations" not in request.session:
-            return redirect("navigation:route")
-        return super(CheckStationsMixin, self).get(request, *args, **kwargs)
+            request.session["stations"] = stations.DEFAULT_STATIONS
+        return super(DefaultStationsMixin, self).get(request, *args, **kwargs)
 
 
 class FeedbackMixin:
@@ -96,7 +96,7 @@ def get_stations():
         return redirect("navigation:display_route")
 
 
-class DashboardView(CheckStationsMixin, NavigationView):
+class DashboardView(DefaultStationsMixin, NavigationView):
     template_name = "navigation/dashboard.html"
     footer_links = {
         "info": {"enabled": True},
@@ -135,7 +135,7 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class DisplayRouteView(CheckStationsMixin, NavigationView):
+class DisplayRouteView(DefaultStationsMixin, NavigationView):
     template_name = "navigation/display_route.html"
     footer_links = {"dashboard": {"selected": True}}
     back_url = "navigation:route"
@@ -180,7 +180,7 @@ def get(self, request, *args, **kwargs):
         return super(DisplayRouteView, self).get(request, *args, **kwargs)
 
 
-class ComparisonView(CheckStationsMixin, NavigationView):
+class ComparisonView(DefaultStationsMixin, NavigationView):
     template_name = "navigation/comparison.html"
     footer_links = {"dashboard": {"selected": True}}
     back_url = "navigation:route"
@@ -195,7 +195,7 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class EnvironmentView(CheckStationsMixin, NavigationView):
+class EnvironmentView(DefaultStationsMixin, NavigationView):
     template_name = "navigation/environment.html"
     footer_links = {
         "info": {"enabled": True},
@@ -413,7 +413,7 @@ def post(self, request, **kwargs):
         return redirect("navigation:legal")
 
 
-class SummaryView(CheckStationsMixin, NavigationView):
+class SummaryView(DefaultStationsMixin, NavigationView):
     template_name = "navigation/summary.html"
     footer_links = {
         "info": {"enabled": True},