basis for paypal transactions

better endpoints
fixed print
2025-02-17 11:54:03 +01:00 · 2025-02-17 10:27:02 +01:00 · 2025-02-14 17:19:27 +01:00 · 2025-02-14 16:47:37 +01:00 · 2025-02-14 10:44:09 +01:00 · 2025-02-14 10:33:57 +01:00
53 changed files with 3968 additions and 728 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -21,15 +21,21 @@
            ]
        },
        {
-            "name": "Backend - tester",
+            "name": "Backend - test",
            "type": "debugpy",
            "request": "launch",
-            "program": "src/tester.py",
+            "module": "pytest",
+            "args": [
+                "src/tests",
+                "--log-cli-level=DEBUG",
+                "--html=report.html",
+                "--self-contained-html"
+            ],
            "env": {
                "DEBUG": "true"
            },
            "cwd": "${workspaceFolder}/backend"
-        },
+        },        
        // frontend - flutter app
        {
            "name": "Frontend - debug",
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,30 @@
+# License
+
+## Proprietary License
+
+All code and resources in this repository are the property of AnyDev. The software and related documentation are provided solely for use with services provided by AnyDev. Redistribution, modification, or use of this software outside of its intended service is strictly prohibited without explicit permission.
+
+### Copyright © 2024 AnyDev
+
+All rights reserved.
+
+### Restrictions
+
+- You may not modify, distribute, copy, or reverse engineer any part of this codebase.
+- This software is licensed for use solely in conjunction with services provided by AnyDev.
+- Any commercial use of this software is strictly prohibited without explicit written consent from AnyDev.
+
+## Third-Party Dependencies
+
+This project uses third-party dependencies, which are subject to their respective licenses.
+
+- Python backend dependencies: fastapi, pydantic, numpy, shapely, etc. – Licensed under their respective licenses.
+- Flutter frontend dependencies: Cupertino Icons, sliding_up_panel, http, etc. – Licensed under their respective licenses.
+
+Please refer to each project's documentation for the specific terms and conditions.
+
+## OpenStreetMap Data Usage
+
+This project uses data derived from **OpenStreetMap**. OpenStreetMap data is available under the [Open Database License (ODbL)](https://www.openstreetmap.org/copyright). We comply with the ODbL license, and some of the data displayed in the service may be derived from OpenStreetMap sources. We do not redistribute raw OpenStreetMap data; instead, it is processed and transformed before being used in our services.
+
+More information about OpenStreetMap data usage can be found [here](https://www.openstreetmap.org/copyright).
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1,6 +1,9 @@
 # osm-cache
 cache_XML/

+# secrets
+*secrets.yaml
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
--- a/backend/Pipfile
+++ b/backend/Pipfile
@@ -25,3 +25,5 @@ loki-logger-handler = "*"
 pulp = "*"
 scipy = "*"
 requests = "*"
+supabase = "*"
+paypalrestsdk = "*"
--- a/backend/Pipfile.lock
+++ b/backend/Pipfile.lock
--- a/backend/report.html
+++ b/backend/report.html
@@ -328,7 +328,7 @@ div.media {
  </head>
  <body>
    <h1 id="title">Backend Testing Report</h1>
-    <p>Report generated on 29-Jan-2025 at 09:35:03 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
+    <p>Report generated on 17-Feb-2025 at 11:20:02 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
        v4.1.1</p>
    <div id="environment-header">
      <h2>Environment</h2>
@@ -382,7 +382,7 @@ div.media {
        <h2>Summary</h2>
        <div class="additional-summary prefix">
        </div>
-        <p class="run-count">1 test took 97 ms.</p>
+        <p class="run-count">1 test took 524 ms.</p>
        <p class="filter">(Un)check the boxes to filter the results.</p>
        <div class="summary__reload">
          <div class="summary__reload__button hidden" onclick="location.reload()">
@@ -432,7 +432,7 @@ div.media {
    </table>
  </body>
  <footer>
-    <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.12.3&#34;, &#34;Platform&#34;: &#34;Linux-6.8.0-51-generic-x86_64-with-glibc2.39&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;8.3.4&#34;, &#34;pluggy&#34;: &#34;1.5.0&#34;}, &#34;Plugins&#34;: {&#34;html&#34;: &#34;4.1.1&#34;, &#34;anyio&#34;: &#34;4.8.0&#34;, &#34;metadata&#34;: &#34;3.1.1&#34;}}, &#34;tests&#34;: {&#34;src/tests/test_main.py::test_turckheim&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Passed&#34;, &#34;testId&#34;: &#34;src/tests/test_main.py::test_turckheim&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Passed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;src/tests/test_main.py::test_turckheim&lt;/td&gt;&#34;, &#34;&lt;td&gt;start (0 | 0) - 3 - Mairie du 2e arrondissement (78 | 5) - 1 - Basilique Saint-Martin d&#39;Ainay (406 | 5) - 3 - Chapelle Paul Couturier (109 | 5) - 1 - finish (0 | 0) - 0&lt;/td&gt;&#34;, &#34;&lt;td&gt;23 min&lt;/td&gt;&#34;, &#34;&lt;td&gt;20 min&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;97 ms&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;------------------------------ Captured log call -------------------------------\nDEBUG    asyncio:selector_events.py:64 Using selector: EpollSelector\nINFO     src.main:main.py:67 No end coordinates provided. Using start=end.\nDEBUG    src.utils.landmarks_manager:landmarks_manager.py:76 Starting to fetch landmarks...\nDEBUG    src.utils.landmarks_manager:landmarks_manager.py:88 Fetching sightseeing landmarks...\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nDEBUG    src.utils.landmarks_manager:landmarks_manager.py:204 Fetched 16 landmarks of type sightseeing in (45.74643460077641, 4.819803369760263, 45.756693361321055, 4.834505559895031)\nINFO     src.utils.landmarks_manager:landmarks_manager.py:91 Found 16 sightseeing landmarks\nINFO     src.overpass.overpass:overpass.py:55 Cache hit for 2/2 quadrants.\nINFO     src.utils.cluster_manager:cluster_manager.py:145 Found 0 sightseeing clusters.\nINFO     src.main:main.py:104 Fetched 12 landmarks in  \t: 0.011 seconds\nDEBUG    src.optimization.optimizer:optimizer.py:597 First results are out. Looking out for circles and correcting.\nINFO     src.optimization.optimizer:optimizer.py:637 Re-optimized 0 times, objective value : 593\nDEBUG    src.optimization.refiner:refiner.py:345 Using 2 minor landmarks around the predicted path\nDEBUG    src.optimization.optimizer:optimizer.py:597 First results are out. Looking out for circles and correcting.\nINFO     src.optimization.optimizer:optimizer.py:637 Re-optimized 0 times, objective value : 593\nDEBUG    src.main:main.py:130 First stage optimization\t: 0.045 seconds\nDEBUG    src.main:main.py:131 Second stage optimization\t: 0.025 seconds\nINFO     src.main:main.py:132 Total computation time\t: 0.071 seconds\nINFO     src.main:main.py:137 Generated a trip of 23 minutes with 5 landmarks in 0.082 seconds.\nINFO     httpx:_client.py:1025 HTTP Request: POST http://testserver/trip/new &amp;quot;HTTP/1.1 200 OK&amp;quot;\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;Backend Testing Report&#34;}"></div>
+    <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.12.3&#34;, &#34;Platform&#34;: &#34;Linux-6.8.0-53-generic-x86_64-with-glibc2.39&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;8.3.4&#34;, &#34;pluggy&#34;: &#34;1.5.0&#34;}, &#34;Plugins&#34;: {&#34;html&#34;: &#34;4.1.1&#34;, &#34;anyio&#34;: &#34;4.8.0&#34;, &#34;metadata&#34;: &#34;3.1.1&#34;}}, &#34;tests&#34;: {&#34;src/tests/test_user.py::test_user_handling&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Passed&#34;, &#34;testId&#34;: &#34;src/tests/test_user.py::test_user_handling&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Passed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;src/tests/test_user.py::test_user_handling&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;524 ms&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;------------------------------ Captured log call -------------------------------\nDEBUG    asyncio:selector_events.py:64 Using selector: EpollSelector\nINFO     src.payments.supabase_routes:supabase_routes.py:34 User created successfully, ID: e0b9176d-0211-43fc-b8c7-db815293835e\nDEBUG    asyncio:selector_events.py:64 Using selector: EpollSelector\nERROR    src.payments.supabase_routes:supabase_routes.py:26 Failed to create user : email_exists\nDEBUG    asyncio:selector_events.py:64 Using selector: EpollSelector\nDEBUG    src.payments.supabase_routes:supabase_routes.py:44 None\nINFO     src.payments.supabase_routes:supabase_routes.py:52 User with ID e0b9176d-0211-43fc-b8c7-db815293835e deleted successfully\nDEBUG    asyncio:selector_events.py:64 Using selector: EpollSelector\nERROR    src.payments.supabase_routes:supabase_routes.py:47 Failed to delete user : user_not_found\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;Backend Testing Report&#34;}"></div>
    <script>
      (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 const { getCollapsedCategory, setCollapsedIds } = require('./storage.js')
--- a/backend/src/README.md
+++ b/backend/src/README.md
@@ -49,7 +49,7 @@ This file configures the logging system for the application. It defines how logs
 This file contains the main application logic and API endpoints for interacting with the system. The application is built using the FastAPI framework, which provides several endpoints for creating trips, fetching trips, and retrieving landmarks or nearby facilities. The key endpoints include:

 - **POST /trip/new**:
-    - This endpoint allows users to create a new trip by specifying preferences, start coordinates, and optionally end coordinates. The preferences guide the optimization process for selecting landmarks.
+    - This endpoint allows users to create a new trip by specifying user_id, preferences, start coordinates, and optionally end coordinates. The preferences guide the optimization process for selecting landmarks. The user id is needed to verify that the user's credit balance.
    - Returns: A `Trip` object containing the optimized route, landmarks, and trip details.

 - **GET /trip/{trip_uuid}**:
--- a/backend/src/constants.py
+++ b/backend/src/constants.py
@@ -12,6 +12,14 @@ LANDMARK_PARAMETERS_PATH = PARAMETERS_DIR / 'landmark_parameters.yaml'
 OPTIMIZER_PARAMETERS_PATH = PARAMETERS_DIR / 'optimizer_parameters.yaml'


+PAYPAL_CLIENT_ID = os.getenv("future-paypal-client-id", None)
+PAYPAL_SECRET = os.getenv("future-paypal-secret", None)
+PAYPAL_API_URL = "https://api-m.sandbox.paypal.com"
+
+SUPABASE_URL = os.getenv("SUPABASE_URL", None)
+SUPABASE_KEY = os.getenv("SUPABASE_API_KEY", None)
+
+
 cache_dir_string = os.getenv('OSM_CACHE_DIR', './cache')
 OSM_CACHE_DIR = Path(cache_dir_string)

--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -3,7 +3,7 @@
 import logging
 import time
 from contextlib import asynccontextmanager
-from fastapi import FastAPI, HTTPException, BackgroundTasks, Query
+from fastapi import FastAPI, HTTPException, BackgroundTasks, Query, Body

 from .logging_config import configure_logging
 from .structs.landmark import Landmark, Toilets
@@ -16,6 +16,9 @@ from .optimization.optimizer import Optimizer
 from .optimization.refiner import Refiner
 from .overpass.overpass import fill_cache
 from .cache import client as cache_client
+from .payments.supabase import Supabase
+from .payments.payment_routes import router as payment_router
+from .payments.supabase_routes import router as supabase_router


 logger = logging.getLogger(__name__)
@@ -23,6 +26,7 @@ logger = logging.getLogger(__name__)
 manager = LandmarkManager()
 optimizer = Optimizer()
 refiner = Refiner(optimizer=optimizer)
+supabase = Supabase()


@asynccontextmanager
@@ -37,10 +41,16 @@ async def lifespan(app: FastAPI):
 app = FastAPI(lifespan=lifespan)


+# Include the payment routes and supabase routes
+app.include_router(payment_router)
+app.include_router(supabase_router)
+
+
@app.post("/trip/new")
-def new_trip(preferences: Preferences,
-             start: tuple[float, float],
-             end: tuple[float, float] | None = None, 
+def new_trip(user_id: str = Body(...),
+             preferences: Preferences = Body(...),
+             start: tuple[float, float] = Body(...),
+             end: tuple[float, float] | None = Body(None), 
             background_tasks: BackgroundTasks = None) -> Trip:
    """
    Main function to call the optimizer.
@@ -52,6 +62,19 @@ def new_trip(preferences: Preferences,
    Returns: 
        (uuid) : The uuid of the first landmark in the optimized route
    """
+    # Check for valid user balance.
+    try:
+        if not supabase.check_balance(user_id=user_id):
+            logger.warning('Insufficient credits to perform this action.')
+            return {"error": "Insufficient credits"}, 400  # Return a 400 Bad Request with an appropriate message
+    except SyntaxError as se :
+        raise HTTPException(status_code=400, detail=str(se)) from se
+    except ValueError as ve :
+        raise HTTPException(status_code=406, detail=str(ve)) from ve
+    except Exception as exc:
+        raise HTTPException(status_code=500, detail=f"Internal Server Error: {str(exc)}") from exc
+
+    # Check for invalid input.
    if preferences is None:
        raise HTTPException(status_code=406, detail="Preferences not provided or incomplete.")
    if (preferences.shopping.score == 0 and
@@ -130,13 +153,15 @@ def new_trip(preferences: Preferences,
    logger.debug(f'First stage optimization\t: {round(t_first_stage,3)} seconds')
    logger.debug(f'Second stage optimization\t: {round(t_second_stage,3)} seconds')
    logger.info(f'Total computation time\t: {round(t_first_stage + t_second_stage,3)} seconds')
-
    linked_tour = LinkedLandmarks(refined_tour)
+
    # upon creation of the trip, persistence of both the trip and its landmarks is ensured.
    trip = Trip.from_linked_landmarks(linked_tour, cache_client)
    logger.info(f'Generated a trip of {trip.total_time} minutes with {len(refined_tour)} landmarks in {round(t_generate_landmarks + t_first_stage + t_second_stage,3)} seconds.')
+    logger.debug('Detailed trip :\n\t' + '\n\t'.join(f'{landmark}' for landmark in refined_tour))

    background_tasks.add_task(fill_cache)
+    supabase.decrement_credit_balance(user_id=user_id)

    return trip

@@ -178,6 +203,45 @@ def get_landmark(landmark_uuid: str) -> Landmark:
        raise HTTPException(status_code=404, detail="Landmark not found") from exc


+@app.post("/trip/recompute-time/{trip_uuid}/{removed_landmark_uuid}")
+def update_trip_time(trip_uuid: str, removed_landmark_uuid: str) -> Trip:
+    """
+    Updates the reaching times of a given trip when removing a landmark.
+
+    Args:
+        landmark_uuid (str) : unique identifier for a Landmark.
+
+    Returns:
+        (Landmark)          : the corresponding Landmark.
+    """
+    # First, fetch the trip in the cache.
+    try:
+        trip = cache_client.get(f'trip_{trip_uuid}')
+    except KeyError as exc:
+        raise HTTPException(status_code=404, detail='Trip not found') from exc
+
+    landmarks = []
+    next_uuid = trip.first_landmark_uuid
+
+    # Extract landmarks
+    try :
+        while next_uuid is not None:
+            landmark = cache_client.get(f'landmark_{next_uuid}')
+            # Filter out the removed landmark.
+            if next_uuid != removed_landmark_uuid :
+                landmarks.append(landmark)
+            next_uuid = landmark.next_uuid  # Prepare for the next iteration
+    except KeyError as exc:
+        raise HTTPException(status_code=404, detail=f'landmark {next_uuid} not found') from exc
+
+    # Re-link every thing and compute times again
+    linked_tour = LinkedLandmarks(landmarks)
+    trip = Trip.from_linked_landmarks(linked_tour, cache_client)
+
+    return trip
+
+
+
@app.post("/toilets/new")
 def get_toilets(location: tuple[float, float] = Query(...), radius: int = 500) -> list[Toilets] :
    """
@@ -204,3 +268,6 @@ def get_toilets(location: tuple[float, float] = Query(...), radius: int = 500) -
        return toilets_list
    except KeyError as exc:
        raise HTTPException(status_code=404, detail="No toilets found") from exc
+
+
+
--- a/backend/src/optimization/optimizer.py
+++ b/backend/src/optimization/optimizer.py
@@ -594,7 +594,7 @@ class Optimizer:
        status = pl.LpStatus[prob.status]
        solution = [pl.value(var) for var in x]  # The values of the decision variables (will be 0 or 1)

-        self.logger.debug("First results are out. Looking out for circles and correcting.")
+        self.logger.debug("First results are out. Looking out for circles and correcting...")

        # Raise error if no solution is found. FIXME: for now this throws the internal server error
        if status != 'Optimal' :
--- a/backend/src/overpass/overpass.py
+++ b/backend/src/overpass/overpass.py
@@ -52,7 +52,7 @@ class Overpass :
        # Retrieve cached data and identify missing cache entries
        cached_responses, non_cached_cells = self._retrieve_cached_data(overlapping_cells, osm_types, selector, conditions, out)

-        self.logger.info(f'Cache hit for {len(overlapping_cells)-len(non_cached_cells)}/{len(overlapping_cells)} quadrants.')
+        self.logger.debug(f'Cache hit for {len(overlapping_cells)-len(non_cached_cells)}/{len(overlapping_cells)} quadrants.')

        # If there is no missing data, return the cached responses after filtering.
        if not non_cached_cells :
@@ -61,6 +61,7 @@ class Overpass :
        # If there is no cached data, fetch all from Overpass.
        elif not cached_responses :
            query_str = Overpass.build_query(bbox, osm_types, selector, conditions, out)
+            self.logger.debug(f'Query string: {query_str}')
            return self.fetch_data_from_api(query_str)

        # Hybrid cache: some data from Overpass, some data from cache.
@@ -68,6 +69,7 @@ class Overpass :
            # Resize the bbox for smaller search area and build new query string.
            non_cached_bbox = Overpass._get_non_cached_bbox(non_cached_cells, bbox)
            query_str = Overpass.build_query(non_cached_bbox, osm_types, selector, conditions, out)
+            self.logger.debug(f'Query string: {query_str}')
            non_cached_responses = self.fetch_data_from_api(query_str)
            return Overpass._filter_landmarks(cached_responses, bbox) + non_cached_responses

--- a/backend/src/parameters/landmark_parameters.yaml
+++ b/backend/src/parameters/landmark_parameters.yaml
@@ -1,12 +1,11 @@
 max_bbox_side: 4000   #m
 radius_close_to: 50
-church_coeff: 0.55
-nature_coeff: 1.4
+church_coeff: 0.75
+nature_coeff: 1.6
 overall_coeff: 10
 tag_exponent: 1.15
 image_bonus: 1.1
-viewpoint_bonus: 5
+viewpoint_bonus: 10
 wikipedia_bonus: 1.25
-name_bonus: 3
 N_important: 60
 pay_bonus: -1
--- a/backend/src/parameters/optimizer_parameters.yaml
+++ b/backend/src/parameters/optimizer_parameters.yaml
@@ -5,5 +5,5 @@ max_landmarks: 10
 max_landmarks_refiner: 20
 overshoot: 0.0016
 time_limit: 1
-gap_rel: 0.05
+gap_rel: 0.025
 max_iter: 40
--- a/backend/src/payments/init.py
+++ b/backend/src/payments/init.py
--- a/backend/src/payments/payment_handler.py
+++ b/backend/src/payments/payment_handler.py
@@ -0,0 +1,70 @@
+from typing import Literal
+import paypalrestsdk
+from pydantic import BaseModel
+from fastapi import HTTPException
+import logging
+
+
+# Model for payment request body
+class PaymentRequest(BaseModel):
+    user_id: str
+    credit_amount: Literal[10, 50, 100]
+    currency: Literal["USD", "EUR", "CHF"]  
+    description: str = "Purchase of credits"
+
+
+# Payment handler class for managing PayPal payments
+class PaymentHandler:
+
+    payment_id: str
+
+    def __init__(self, transaction_details: PaymentRequest):
+        self.details = transaction_details
+        self.logger = logging.getLogger(__name__)
+
+    # Only support purchase of credit 'bundles': 10, 50 or 100 credits worth of trip generation
+    def fetch_price(self) -> float:
+        """
+        Fetches the price of credits in the specified currency.
+        """
+        result = self.supabase.table("prices").select("credit_amount").eq("currency", self.details.currency).single().execute()
+        if result.data:
+            return result.data.get("price")
+        else:
+            self.logger.error(f"Unsupported currency: {self.details.currency}")
+            return None
+
+    def create_paypal_payment(self) -> str:
+        """
+        Creates a PayPal payment and returns the approval URL.
+        """
+        price = self.fetch_price()
+        payment = paypalrestsdk.Payment({
+            "intent": "sale",
+            "payer": {
+                "payment_method": "paypal"
+            },
+            "transactions": [{
+                "amount": {
+                    "total": f"{price:.2f}",
+                    "currency": self.details.currency
+                },
+                "description": self.details.description
+            }],
+            "redirect_urls": {
+                "return_url": "http://localhost:8000/payment/success",
+                "cancel_url": "http://localhost:8000/payment/cancel"
+            }
+        })
+
+        if payment.create():
+            self.logger.info("Payment created successfully")
+            self.payment_id = payment.id
+
+            # Get the approval URL and return it for the user to approve
+            for link in payment.links:
+                if link.rel == "approval_url":
+                    return link.href
+        else:
+            self.logger.error(f"Failed to create payment: {payment.error}")
+            raise HTTPException(status_code=500, detail="Payment creation failed")
--- a/backend/src/payments/payment_routes.py
+++ b/backend/src/payments/payment_routes.py
@@ -0,0 +1,79 @@
+import logging
+import paypalrestsdk
+from fastapi import HTTPException, APIRouter
+
+from .payment_handler import PaymentRequest, PaymentHandler
+from .supabase import Supabase
+
+# Set up logging and supabase
+logger = logging.getLogger(__name__)
+supabase = Supabase()
+
+# Configure PayPal SDK
+paypalrestsdk.configure({
+    "mode": "sandbox",  # Use 'live' for production
+    "client_id": "YOUR_PAYPAL_CLIENT_ID",
+    "client_secret": "YOUR_PAYPAL_SECRET"
+})
+
+
+# Define the API router
+router = APIRouter()
+
+@router.post("/purchase/credits")
+def purchase_credits(payment_request: PaymentRequest):
+    """
+    Handles token purchases. Calculates the number of tokens based on the amount paid,
+    updates the user's balance, and processes PayPal payment.
+    """
+    payment_handler = PaymentHandler(payment_request)
+
+    # Create PayPal payment and get the approval URL
+    approval_url = payment_handler.create_paypal_payment()
+
+    return {
+        "message": "Purchase initiated successfully",
+        "payment_id": payment_handler.payment_id,
+        "credits": payment_request.credit_amount,
+        "approval_url": approval_url,
+    }
+
+
+@router.get("/payment/success")
+def payment_success(paymentId: str, PayerID: str):
+    """
+    Handles successful PayPal payment.
+    """
+    payment = paypalrestsdk.Payment.find(paymentId)
+
+    if payment.execute({"payer_id": PayerID}):
+        logger.info("Payment executed successfully")
+
+        # Retrieve transaction details from the database
+        result = supabase.table("pending_payments").select("*").eq("payment_id", paymentId).single().execute()
+        if not result.data:
+            raise HTTPException(status_code=404, detail="Transaction not found")
+
+        # Extract the necessary information
+        user_id = result.data["user_id"]
+        credit_amount = result.data["credit_amount"]
+
+        # Update the user's balance
+        supabase.increment_credit_balance(user_id, amount=credit_amount)
+
+        # Optionally, delete the pending payment entry since the transaction is completed
+        supabase.table("pending_payments").delete().eq("payment_id", paymentId).execute()
+
+        return {"message": "Payment completed successfully"}
+    else:
+        logger.error(f"Payment execution failed: {payment.error}")
+        raise HTTPException(status_code=500, detail="Payment execution failed")
+
+
+@router.get("/payment/cancel")
+def payment_cancel():
+    """
+    Handles PayPal payment cancellation.
+    """
+    return {"message": "Payment was cancelled"}
+
--- a/backend/src/payments/supabase.py
+++ b/backend/src/payments/supabase.py
@@ -0,0 +1,170 @@
+import os
+import logging
+import yaml
+from fastapi import HTTPException, status
+from supabase import create_client, Client, ClientOptions
+
+from ..constants import PARAMETERS_DIR
+
+# Silence the supabase logger
+logging.getLogger("httpx").setLevel(logging.CRITICAL)
+logging.getLogger("hpack").setLevel(logging.CRITICAL)
+logging.getLogger("httpcore").setLevel(logging.CRITICAL)
+
+
+class Supabase:
+
+    logger = logging.getLogger(__name__)
+
+    def __init__(self):
+
+        with open(os.path.join(PARAMETERS_DIR, 'secrets.yaml')) as f:
+            secrets = yaml.safe_load(f)
+            self.SUPABASE_URL = secrets['SUPABASE_URL']
+            self.SUPABASE_ADMIN_KEY = secrets['SUPABASE_ADMIN_KEY']
+            self.SUPABASE_TEST_USER_ID = secrets['SUPABASE_TEST_USER_ID']
+
+        self.supabase = create_client(
+            self.SUPABASE_URL, 
+            self.SUPABASE_ADMIN_KEY, 
+            options=ClientOptions(schema='public')
+        )
+        self.logger.debug('Supabase client initialized.')
+
+
+    def check_balance(self, user_id: str) -> bool:
+        """
+        Checks if the user has enough 'credit' for generating a new trip.
+
+        Args:
+            user_id (str): The ID of the current user.
+
+        Returns:
+            bool: True if the balance is positive, False otherwise.
+        """
+        try:
+            # Query the public.credits table to get the user's credits
+            response = (
+                self.supabase.table("credits")
+                .select('*')
+                .eq('id', user_id)
+                .single()
+                .execute()
+            )
+            # self.logger.critical(response)
+
+        except Exception as e:
+            if e.code == '22P02' :
+                self.logger.error(f"Failed querying credits : {str(e)}")
+                raise SyntaxError(f"Failed querying credits : {str(e)}") from e
+            if e.code == 'PGRST116' :
+                self.logger.error(f"User not found : {str(e)}")
+                raise ValueError(f"User not found : {str(e)}") from e
+            else :
+                self.logger.error(f"An unexpected error occured while checking user balance : {str(e)}")
+                raise Exception(f"An unexpected error occured while checking user balance : {str(e)}") from e
+
+        # Proceed to check the user's credit balance
+        credits = response.data['credit_amount']
+        self.logger.debug(f'Credits of user {user_id}: {credits}')
+
+        if credits > 0:
+            self.logger.info(f'Credit balance is positive for user {user_id}. Proceeding with trip generation.')
+            return True
+
+        self.logger.warning(f'Insufficient balance for user {user_id}. Trip generation cannot proceed.')
+        return False
+
+
+    def decrement_credit_balance(self, user_id: str, amount: int=1) -> bool:
+        """
+        Decrements the user's credit balance by 1.
+
+        Args:
+            user_id (str): The ID of the current user.
+        """
+        try:
+            # Query the public.credits table to get the user's current credits
+            response = (
+                self.supabase.table("credits")
+                .select('*')
+                .eq('id', user_id)
+                .single()
+                .execute()
+            )
+        except Exception as e:
+            if e.code == '22P02' :
+                self.logger.error(f"Failed decrementing credits : {str(e)}")
+                raise SyntaxError(f"Failed decrementing credits : {str(e)}") from e
+            if e.code == 'PGRST116' :
+                self.logger.error(f"User not found : {str(e)}")
+                raise ValueError(f"User not found : {str(e)}") from e
+            else :
+                self.logger.error(f"An unexpected error occured while decrementing user balance : {str(e)}")
+                raise Exception(f"An unexpected error occured while decrementing user balance : {str(e)}") from e
+
+
+        current_credits = response.data['credit_amount']
+        updated_credits = current_credits - amount
+
+        # Update the user's credits in the table
+        update_response = (
+            self.supabase.table('credits')
+            .update({'credit_amount': updated_credits})
+            .eq('id', user_id)
+            .execute()
+        )
+
+        # Check if the update was successful
+        if update_response.data:
+            self.logger.debug(f'Credit balance successfully decremented.')
+            return True
+        else:
+            raise Exception("Error decrementing credit balance.")
+
+
+    def increment_credit_balance(self, user_id: str, amount: int=1) -> bool:
+        """
+        Increments the user's credit balance by 1.
+
+        Args:
+            user_id (str): The ID of the current user.
+        """
+        try:
+            # Query the public.credits table to get the user's current credits
+            response = (
+                self.supabase.table("credits")
+                .select('*')
+                .eq('id', user_id)
+                .single()
+                .execute()
+            )
+        except Exception as e:
+            if e.code == '22P02' :
+                self.logger.error(f"Failed incrementing credits : {str(e)}")
+                raise SyntaxError(f"Failed incrementing credits : {str(e)}") from e
+            if e.code == 'PGRST116' :
+                self.logger.error(f"User not found : {str(e)}")
+                raise ValueError(f"User not found : {str(e)}") from e
+            else :
+                self.logger.error(f"An unexpected error occured while incrementing user balance : {str(e)}")
+                raise Exception(f"An unexpected error occured while incrementing user balance : {str(e)}") from e
+
+
+        current_credits = response.data['credit_amount']
+        updated_credits = current_credits + amount
+
+        # Update the user's credits in the table
+        update_response = (
+            self.supabase.table('credits')
+            .update({'credit_amount': updated_credits})
+            .eq('id', user_id)
+            .execute()
+        )
+
+        # Check if the update was successful
+        if update_response.data:
+            self.logger.debug(f'Credit balance successfully incremented.')
+            return True
+        else:
+            raise Exception("Error incrementing credit balance.")
--- a/backend/src/payments/supabase_routes.py
+++ b/backend/src/payments/supabase_routes.py
@@ -0,0 +1,52 @@
+"""Endpoints for supabase user handling."""
+import logging
+from fastapi import APIRouter, HTTPException
+
+from .supabase import Supabase
+
+
+# Set up logging and supabase.
+logger = logging.getLogger(__name__)
+supabase = Supabase()
+
+# Create fastapi router
+router = APIRouter()
+
+
+@router.post("/user/create/{email}/{password}")
+def register_user(email: str, password: str) -> str:
+    try:
+        response = supabase.supabase.auth.admin.create_user({
+            "email": email,
+            "password": password
+        })
+
+    except Exception as e:
+        if e.code == 'email_exists' :
+            logger.error(f"Failed to create user : {str(e.code)}")
+            raise HTTPException(status_code=422, detail=str(e)) from e
+        logger.error(f"Failed to create user : {str(e.code)}")
+        raise HTTPException(status_code=500, detail=str(e)) from e
+
+    # Extract the identity_id and user_id
+    user_id = response.user.id
+
+    logger.info(f"User created successfully, ID: {user_id}")
+    return user_id
+
+
+
+@router.post("/user/delete/{user_id}")
+def delete_user(user_id: str):
+
+    try:
+        response = supabase.supabase.auth.admin.delete_user(user_id)
+        logger.debug(response)
+    except Exception as e:
+        if e.code == 'user_not_found' :
+            logger.error(f"Failed to delete user : {str(e.code)}")
+            raise HTTPException(status_code=404, detail=str(e)) from e
+        logger.error(f"Failed to create user : {str(e.code)}")
+        raise HTTPException(status_code=500, detail=str(e)) from e
+    
+    logger.info(f"User with ID {user_id} deleted successfully")
--- a/backend/src/tests/test_invalid_input.py
+++ b/backend/src/tests/test_invalid_input.py
@@ -4,6 +4,7 @@ from fastapi.testclient import TestClient
 import pytest

 from ..main import app
+from ..constants import SUPABASE_TEST_USER_ID


@pytest.fixture(scope="module")
@@ -55,8 +56,38 @@ def test_input(invalid_client, start, preferences, status_code):   # pylint: dis
    response = invalid_client.post(
        "/trip/new",
        json={
+            "user_id": SUPABASE_TEST_USER_ID,
            "preferences": preferences,
            "start": start
        }
    )
    assert response.status_code == status_code
+
+
+
+@pytest.mark.parametrize(
+    "user_id,status_code",
+    [
+        # No user id :
+        ({}, 422),
+        ("invalid_user_id", 400),
+        # ("12345678-1234-5678-1234-567812345678", 406)
+    ]
+)
+def test_input(invalid_client, user_id, status_code):   # pylint: disable=redefined-outer-name
+    """
+    Test new trip creation with invalid user ID.
+    """
+    response = invalid_client.post(
+        "/trip/new",
+        json={
+            "user_id": user_id,
+            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
+                "nature": {"type": "nature", "score": 0},
+                "shopping": {"type": "shopping", "score": 0},
+                "max_time_minute": 20,
+                "detour_tolerance_minute": 0},
+            "start": [48.084588, 7.280405]
+        }
+    )
+    assert response.status_code == status_code
--- a/backend/src/tests/test_main.py
+++ b/backend/src/tests/test_main.py
@@ -1,10 +1,17 @@
 """Collection of tests to ensure correct implementation and track progress. """
 import time
+import logging
 from fastapi.testclient import TestClient
 import pytest

 from .test_utils import load_trip_landmarks, log_trip_details
 from ..main import app
+from ..payments.supabase import Supabase
+
+supabase = Supabase()
+logger = logging.getLogger(__name__)
+USER_ID = supabase.SUPABASE_TEST_USER_ID
+

@pytest.fixture(scope="module")
 def client():
@@ -22,21 +29,24 @@ def test_turckheim(client, request):    # pylint: disable=redefined-outer-name
    """
    start_time = time.time()  # Start timer
    duration_minutes = 20
+    logger.debug('Running test in Turckheim')

    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
-            "nature": {"type": "nature", "score": 0},
-            "shopping": {"type": "shopping", "score": 0},
-            "max_time_minute": duration_minutes,
-            "detour_tolerance_minute": 0},
-            # "start": [48.084588, 7.280405]
+                "nature": {"type": "nature", "score": 0},
+                "shopping": {"type": "shopping", "score": 0},
+                "max_time_minute": duration_minutes,
+                "detour_tolerance_minute": 0},
+            "start": [48.084588, 7.280405]
            # "start": [45.74445023349939, 4.8222687890538865]
-            "start": [45.75156398104873, 4.827154464827647]
+            # "start": [45.75156398104873, 4.827154464827647]
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])


@@ -58,6 +68,8 @@ def test_turckheim(client, request):    # pylint: disable=redefined-outer-name
    assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
    # assert 2!= 3

+
+
 def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name
    """
    Test n°2 : Custom test in Lyon centre to ensure proper decision making in crowded area.
@@ -73,6 +85,7 @@ def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 5},
                            "shopping": {"type": "shopping", "score": 5},
@@ -82,6 +95,7 @@ def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -113,6 +127,7 @@ def test_cologne(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 5},
                            "shopping": {"type": "shopping", "score": 5},
@@ -122,6 +137,7 @@ def test_cologne(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -154,6 +170,7 @@ def test_strasbourg(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 5},
                            "shopping": {"type": "shopping", "score": 5},
@@ -163,6 +180,7 @@ def test_strasbourg(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -195,6 +213,7 @@ def test_zurich(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 5},
                            "shopping": {"type": "shopping", "score": 5},
@@ -204,6 +223,7 @@ def test_zurich(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -236,6 +256,7 @@ def test_paris(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 0},
                            "shopping": {"type": "shopping", "score": 5},
@@ -245,6 +266,7 @@ def test_paris(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -277,6 +299,7 @@ def test_new_york(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 5},
                            "nature": {"type": "nature", "score": 5},
                            "shopping": {"type": "shopping", "score": 5},
@@ -286,6 +309,7 @@ def test_new_york(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -318,6 +342,7 @@ def test_shopping(client, request) :   # pylint: disable=redefined-outer-name
    response = client.post(
        "/trip/new",
        json={
+            "user_id": USER_ID,
            "preferences": {"sightseeing": {"type": "sightseeing", "score": 0},
                            "nature": {"type": "nature", "score": 0},
                            "shopping": {"type": "shopping", "score": 5},
@@ -327,6 +352,7 @@ def test_shopping(client, request) :   # pylint: disable=redefined-outer-name
            }
        )
    result = response.json()
+    supabase.increment_credit_balance(user_id=USER_ID)
    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])

    # Get computation time
@@ -342,4 +368,4 @@ def test_shopping(client, request) :   # pylint: disable=redefined-outer-name
    assert response.status_code == 200  # check for successful planning
    assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
    assert duration_minutes*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {duration_minutes}"
-    assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
+    assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
--- a/backend/src/tests/test_user.py
+++ b/backend/src/tests/test_user.py
@@ -0,0 +1,48 @@
+"""Collection of tests to ensure correct handling of user data."""
+
+from fastapi.testclient import TestClient
+import pytest
+
+from ..main import app
+
+TEST_EMAIL = "dummy@example.com"
+TEST_PW = "DummyPassword123"
+
+@pytest.fixture(scope="module")
+def client():
+    """Client used to call the app."""
+    return TestClient(app)
+
+
+def test_user_handling(client) :
+    """
+    Test the creation of a new user.
+    """
+    # Create a new user
+    response = client.post(f"/user/create/{TEST_EMAIL}/{TEST_PW}")
+
+    # Verify user has been created
+    assert response.status_code == 200, "Failed to create dummy user"
+    user_id = response.json()
+
+
+    # Create same user again to raise an error
+    response = client.post(f"/user/create/{TEST_EMAIL}/{TEST_PW}")
+    # Verify user already exists
+    assert response.status_code == 422, "Failed to simulate dummy user already created."
+
+
+    # Delete the user.
+    response = client.post(f"/user/delete/{user_id}")
+
+    # Verify user has been deleted
+    assert response.status_code == 200, "Failed to delete dummy user."
+
+
+    # Delete the user again to raise an error
+    response = client.post(f"/user/delete/{user_id}")
+    # Verify user has been deleted
+    assert response.status_code == 404, "Failed to simulate dummy user already deleted."
+
+
+
--- a/backend/src/utils/cluster_manager.py
+++ b/backend/src/utils/cluster_manager.py
@@ -1,6 +1,6 @@
 """Find clusters of interest to add more general areas of visit to the tour."""
 import logging
-from typing import Literal
+from typing import Literal, Tuple

 import numpy as np
 from sklearn.cluster import DBSCAN
@@ -33,7 +33,7 @@ class Cluster(BaseModel):
    """
    type: Literal['street', 'area']
    importance: int
-    centroid: tuple
+    centroid: Tuple[float, float]
    # start: Optional[list] = None      # for later use if we want to have streets as well
    # end: Optional[list] = None

@@ -134,7 +134,7 @@ class ClusterManager:

                # Check that there are is least 1 cluster
                if len(set(labels)) > 1 :
-                    self.logger.info(f"Found {len(set(labels))} different {cluster_type} clusters.")
+                    self.logger.info(f"Found {len(set(labels))} {cluster_type} clusters.")
                    # Separate clustered points and noise points
                    self.cluster_points = self.all_points[labels != -1]
                    self.cluster_labels = labels[labels != -1]
@@ -178,11 +178,12 @@ class ClusterManager:

            # Calculate the centroid as the mean of the points
            centroid = np.mean(current_cluster, axis=0)
+            centroid = tuple((round(centroid[0], 7), round(centroid[1], 7)))

            if self.cluster_type == 'shopping' :
-                score = len(current_cluster)*2
+                score = len(current_cluster)*3
            else :
-                score = len(current_cluster)*8
+                score = len(current_cluster)*15
            locations.append(Cluster(
                type='area',
                centroid=centroid,
@@ -215,7 +216,7 @@ class ClusterManager:
        """

        # Define the bounding box for a given radius around the coordinates
-        bbox = create_bbox(cluster.centroid, 1000)
+        bbox = create_bbox(cluster.centroid, 300)
        
        # Query neighborhoods and shopping malls
        selectors = ['"place"~"^(suburb|neighborhood|neighbourhood|quarter|city_block)$"']
@@ -223,10 +224,10 @@ class ClusterManager:
        if self.cluster_type == 'shopping' :
            selectors.append('"shop"="mall"')
            new_name = 'Shopping Area'
-            t = 40
+            t = 30
        else :
            new_name = 'Neighborhood'
-            t = 15
+            t = 20

        min_dist = float('inf')
        osm_id = 0
@@ -238,7 +239,7 @@ class ClusterManager:
                result = self.overpass.send_query(bbox = bbox,
                                                  osm_types = osm_types,
                                                  selector = sel,
-                                                  out = 'ids center'
+                                                  out = 'ids center tags'
                                                  )
            except Exception as e:
                self.logger.error(f"Error fetching clusters: {e}")
@@ -259,9 +260,9 @@ class ClusterManager:
                d = get_distance(cluster.centroid, coords)
                if  d < min_dist :
                    min_dist = d
-                    new_name = name
-                    osm_type = osm_type     # Add type: 'way' or 'relation'
-                    osm_id = id             # Add OSM id
+                    new_name = name         # add name
+                    osm_type = osm_type     # add type: 'way' or 'relation'
+                    osm_id = id             # add OSM id

        return Landmark(
            name=new_name,
--- a/backend/src/utils/landmarks_manager.py
+++ b/backend/src/utils/landmarks_manager.py
@@ -39,7 +39,6 @@ class LandmarkManager:
            self.overall_coeff = parameters['overall_coeff']
            self.tag_exponent = parameters['tag_exponent']
            self.image_bonus = parameters['image_bonus']
-            self.name_bonus = parameters['name_bonus']
            self.wikipedia_bonus = parameters['wikipedia_bonus']
            self.viewpoint_bonus = parameters['viewpoint_bonus']
            self.pay_bonus = parameters['pay_bonus']
@@ -147,6 +146,8 @@ class LandmarkManager:
            score *= self.wikipedia_bonus
        if landmark.is_place_of_worship :
            score *= self.church_coeff
+        if landmark.is_viewpoint :
+            score *= self.viewpoint_bonus
        if landmarktype == 'nature' :
            score *= self.nature_coeff

@@ -201,7 +202,7 @@ class LandmarkManager:

            return_list += self._to_landmarks(result, landmarktype, preference_level)

-        self.logger.debug(f"Fetched {len(return_list)} landmarks of type {landmarktype} in {bbox}")
+        # self.logger.debug(f"Fetched {len(return_list)} landmarks of type {landmarktype} in {bbox}")

        return return_list

@@ -267,7 +268,7 @@ class LandmarkManager:
                    landmark.image_url = value
                if key == 'website' :
                    landmark.website_url = value
-                if key == 'place_of_worship' :
+                if value == 'place_of_worship' :
                    landmark.is_place_of_worship = True
                if key == 'wikipedia' :
                    landmark.wiki_url = value
--- a/frontend/assets/confused.svg
+++ b/frontend/assets/confused.svg
--- a/frontend/lib/main.dart
+++ b/frontend/lib/main.dart
@@ -1,10 +1,12 @@
+import 'package:anyway/utils/get_first_page.dart';
+import 'package:anyway/utils/load_trips.dart';
 import 'package:flutter/material.dart';
 import 'package:anyway/constants.dart';
-import 'package:anyway/layout.dart';

 void main() => runApp(const App());

 final GlobalKey<ScaffoldMessengerState> rootScaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+final SavedTrips savedTrips = SavedTrips();

 class App extends StatelessWidget {
  const App({super.key});
@@ -14,7 +16,7 @@ class App extends StatelessWidget {
  Widget build(BuildContext context) {
    return MaterialApp(
      title: APP_NAME,
-      home: BasePage(mainScreen: "map"),
+      home: getFirstPage(),
      theme: APP_THEME,
      scaffoldMessengerKey: rootScaffoldMessengerKey
    );
--- a/frontend/lib/modules/current_trip_landmarks_list.dart
+++ b/frontend/lib/modules/current_trip_landmarks_list.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:anyway/modules/landmark_card.dart';
 import 'package:anyway/structs/landmark.dart';
 import 'package:anyway/structs/trip.dart';
-import 'package:anyway/main.dart';



@@ -25,30 +24,7 @@ List<Widget> landmarksList(Trip trip) {

  for (Landmark landmark in trip.landmarks) {
    children.add(
-      Dismissible(
-        key: ValueKey<int>(landmark.hashCode),
-        child: LandmarkCard(landmark),
-        dismissThresholds: {DismissDirection.endToStart: 0.95, DismissDirection.startToEnd: 0.95},
-        onDismissed: (direction) {
-          log('Removing ${landmark.name}');
-          trip.removeLandmark(landmark);
-
-          rootScaffoldMessengerKey.currentState!.showSnackBar(
-            SnackBar(content: Text("We won't show ${landmark.name} again"))
-          );
-        },
-
-        background: Container(color: Colors.red),
-        secondaryBackground: Container(
-          color: Colors.red,
-          child: Icon(
-            Icons.delete,
-            color: Colors.white,
-          ),
-          padding: EdgeInsets.all(15),
-          alignment: Alignment.centerRight,
-        ),
-      )
+      LandmarkCard(landmark, trip),
    );

    if (landmark.next != null) {
--- a/frontend/lib/modules/current_trip_loading_indicator.dart
+++ b/frontend/lib/modules/current_trip_loading_indicator.dart
@@ -1,9 +1,20 @@
+import 'package:anyway/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';

 import 'package:anyway/structs/trip.dart';
 import 'package:anyway/pages/current_trip.dart';

+
+final List<String> statusTexts = [
+  'Parsing your preferences...',
+  'Finding the best places...',
+  'Crunching the numbers...',
+  'Calculating the best route...',
+  'Making sure you have a great time...',
+];
+
+
 class CurrentTripLoadingIndicator extends StatefulWidget {
  final Trip trip;
  const CurrentTripLoadingIndicator({
@@ -15,46 +26,137 @@ class CurrentTripLoadingIndicator extends StatefulWidget {
  State<CurrentTripLoadingIndicator> createState() => _CurrentTripLoadingIndicatorState();
 }

+
 class _CurrentTripLoadingIndicatorState extends State<CurrentTripLoadingIndicator> {
  @override
-  Widget build(BuildContext context) => Center(
-    child: FutureBuilder(
-      future: widget.trip.cityName,
-      builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-        Widget greeter;
-        Widget loadingIndicator = const Padding(
-          padding: EdgeInsets.only(top: 10),
-          child: CircularProgressIndicator()
-        );
-
-        if (snapshot.hasData) {
-          greeter = AutoSizeText(
-            maxLines: 1,
-            'Generating your trip to ${snapshot.data}...',
-            style: greeterStyle,
-          );
-        } else if (snapshot.hasError) {
-          // the exact error is shown in the central part of the trip overview. No need to show it here
-          greeter = AutoSizeText(
-            maxLines: 1,
-            'Error while loading trip.',
-            style: greeterStyle,
-            );
-        } else {
-          greeter = AutoSizeText(
-            maxLines: 1,
-            'Generating your trip...',
-            style: greeterStyle,
-            );
-        }
-        return Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            greeter,
-            loadingIndicator,
-          ],
-        );
-      }
-    )
+  Widget build(BuildContext context) => Stack(
+    fit: StackFit.expand,
+    children: [
+      // In the very center of the panel, show the greeter which tells the user that the trip is being generated
+      Center(child: loadingText(widget.trip)),
+      // As a gimmick, and a way to show that the app is still working, show a few loading dots
+      Align(
+        alignment: Alignment.bottomCenter,
+        child: statusText(),
+      )
+    ],
  );
-}
+}
+
+// automatically cycle through the greeter texts
+class statusText extends StatefulWidget {
+  const statusText({Key? key}) : super(key: key);
+
+  @override
+  _statusTextState createState() => _statusTextState();
+}
+
+class _statusTextState extends State<statusText> {
+  int statusIndex = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    Future.delayed(Duration(seconds: 5), () {
+      setState(() {
+        statusIndex = (statusIndex + 1) % statusTexts.length;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AutoSizeText(
+      statusTexts[statusIndex],
+      style: Theme.of(context).textTheme.labelSmall,
+    );
+  }
+}
+
+
+
+Widget loadingText(Trip trip) => FutureBuilder(
+  future: trip.cityName,
+  builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+    Widget greeter;
+
+    if (snapshot.hasData) {
+      greeter = AnimatedGradientText(
+        text: 'Creating your trip to ${snapshot.data}...',
+        style: greeterStyle,
+      );
+    } else if (snapshot.hasError) {
+      // the exact error is shown in the central part of the trip overview. No need to show it here
+      greeter = AnimatedGradientText(
+        text: 'Error while loading trip.',
+        style: greeterStyle,
+      );
+    } else {
+      greeter = AnimatedGradientText(
+        text: 'Creating your trip...',
+        style: greeterStyle,
+      );
+    }
+    return greeter;
+  }
+);
+
+class AnimatedGradientText extends StatefulWidget {
+  final String text;
+  final TextStyle style;
+
+  const AnimatedGradientText({
+    Key? key,
+    required this.text,
+    required this.style,
+  }) : super(key: key);
+
+  @override
+  _AnimatedGradientTextState createState() => _AnimatedGradientTextState();
+}
+
+class _AnimatedGradientTextState extends State<AnimatedGradientText> with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      duration: const Duration(seconds: 1),
+      vsync: this,
+    )..repeat();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _controller,
+      builder: (context, child) {
+        return ShaderMask(
+          shaderCallback: (bounds) {
+            return LinearGradient(
+              colors: [GRADIENT_START, GRADIENT_END, GRADIENT_START],
+              stops: [
+                _controller.value - 1.0,
+                _controller.value,
+                _controller.value + 1.0,
+              ],
+              tileMode: TileMode.mirror,
+            ).createShader(bounds);
+          },
+          child: Text(
+            widget.text,
+            style: widget.style,
+          ),
+        );
+      },
+    );
+  }
+}
+
--- a/frontend/lib/modules/current_trip_panel.dart
+++ b/frontend/lib/modules/current_trip_panel.dart
@@ -36,7 +36,7 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {
              child: SizedBox(
                // reuse the exact same height as the panel has when collapsed
                // this way the greeter will be centered when the panel is collapsed
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT,
                child: CurrentTripErrorMessage(trip: widget.trip)
              ),
            );
@@ -46,19 +46,20 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {
              child: SizedBox(
                // reuse the exact same height as the panel has when collapsed
                // this way the greeter will be centered when the panel is collapsed
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT,
                child: CurrentTripLoadingIndicator(trip: widget.trip),
              ),
            );
        } else {
          return ListView(
            controller: widget.controller,
-            padding: const EdgeInsets.only(bottom: 30),
+            padding: const EdgeInsets.only(top: 10, left: 10, right: 10, bottom: 30),
            children: [
              SizedBox(
                // reuse the exact same height as the panel has when collapsed
                // this way the greeter will be centered when the panel is collapsed
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
+                // note that we need to account for the padding above
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 10,
                child: CurrentTripGreeter(trip: widget.trip),
              ),

@@ -72,7 +73,7 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {

              const Padding(padding: EdgeInsets.only(top: 10)),

-              Center(child: saveButton(widget.trip)),
+              Center(child: saveButton(trip: widget.trip)),
            ],
          );
        }
--- a/frontend/lib/modules/current_trip_save_button.dart
+++ b/frontend/lib/modules/current_trip_save_button.dart
@@ -3,39 +3,53 @@ import 'package:anyway/main.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';

-Widget saveButton(Trip trip) => ElevatedButton(
-  onPressed: () async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    trip.toPrefs(prefs);
-    rootScaffoldMessengerKey.currentState!.showSnackBar(
-      SnackBar(
-        content: Text('Trip saved'),
-        duration: Duration(seconds: 2),
-        dismissDirection: DismissDirection.horizontal
+
+class saveButton extends StatefulWidget {
+  Trip trip;
+  saveButton({super.key, required this.trip});
+
+  @override
+  State<saveButton> createState() => _saveButtonState();
+}
+
+class _saveButtonState extends State<saveButton> {
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton(
+      onPressed: () async {
+        savedTrips.addTrip(widget.trip);
+        // SharedPreferences prefs = await SharedPreferences.getInstance();
+        // setState(() => widget.trip.toPrefs(prefs));
+        rootScaffoldMessengerKey.currentState!.showSnackBar(
+          SnackBar(
+            content: Text('Trip saved'),
+            duration: Duration(seconds: 2),
+            dismissDirection: DismissDirection.horizontal
+          )
+        );
+      },
+      child: SizedBox(
+        width: 100,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.save,
+            ),
+            Expanded(
+              child: Padding(
+                padding: EdgeInsets.only(left: 10, top: 5, bottom: 5, right: 5),
+                child: AutoSizeText(
+                  'Save trip',
+                  maxLines: 2,
+                ),
+              ),
+            ),
+          ],
+        ),
      )
    );
-  },
-  child: SizedBox(
-    width: 100,
-    child: Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Icon(
-          Icons.save,
-        ),
-        Expanded(
-          child: Padding(
-            padding: EdgeInsets.only(left: 10, top: 5, bottom: 5, right: 5),
-            child: AutoSizeText(
-              'Save trip',
-              maxLines: 2,
-            ),
-          ),
-        ),
-      ],
-    ),
-  )
-);
+  }
+}

--- a/frontend/lib/modules/help_dialog.dart
+++ b/frontend/lib/modules/help_dialog.dart
@@ -0,0 +1,25 @@
+
+import 'package:flutter/material.dart';
+
+Future<void> helpDialog(BuildContext context, String title, String content) {
+  return showDialog<void>(
+    context: context,
+    builder: (BuildContext context) {
+      return AlertDialog(
+        title: Text(title),
+        content: Text(content),
+        actions: <Widget>[
+          TextButton(
+            style: TextButton.styleFrom(
+              textStyle: Theme.of(context).textTheme.labelLarge,
+            ),
+            child: const Text('Got it!'),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+        ],
+      );
+    },
+  );
+}
--- a/frontend/lib/modules/landmark_card.dart
+++ b/frontend/lib/modules/landmark_card.dart
@@ -1,3 +1,5 @@
+import 'package:anyway/main.dart';
+import 'package:anyway/structs/trip.dart';
 import 'package:flutter/material.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -6,8 +8,12 @@ import 'package:anyway/structs/landmark.dart';

 class LandmarkCard extends StatefulWidget {
  final Landmark landmark;
+  final Trip parentTrip;
  
-  LandmarkCard(this.landmark);
+  LandmarkCard(
+    this.landmark,
+    this.parentTrip,
+    );
  
  @override
  _LandmarkCardState createState() => _LandmarkCardState();
@@ -17,110 +23,149 @@ class LandmarkCard extends StatefulWidget {
 class _LandmarkCardState extends State<LandmarkCard> {
  @override
  Widget build(BuildContext context) {
-    ThemeData theme = Theme.of(context);
+    if (widget.landmark.type == typeStart || widget.landmark.type == typeFinish) {
+      return TextButton.icon(
+        onPressed: () {},
+        icon: widget.landmark.type.icon,
+        label: Text(widget.landmark.name),
+      );
+
+    }
+    // else:
    return Container(
-      height: 160,
      child: Card(
        shape: RoundedRectangleBorder(
          borderRadius: BorderRadius.circular(15.0),
        ),
        elevation: 5,
        clipBehavior: Clip.antiAliasWithSaveLayer,
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Container( // the image on the left
-              // inherit the height of the parent container
-              height: double.infinity,
-              // force a fixed width
-              width: 160,
-              child: CachedNetworkImage(
-                imageUrl: widget.landmark.imageURL ?? '',
-                placeholder: (context, url) => Center(child: CircularProgressIndicator()),
-                errorWidget: (context, error, stackTrace) => Icon(Icons.question_mark_outlined),
-                // TODO: make this a switch statement to load a placeholder if null
-                // cover the whole container meaning the image will be cropped
-                fit: BoxFit.cover,
-              ),
-            ),
-            Flexible(
-              child: Padding(
-                padding: EdgeInsets.all(10),
-                child: Column(
-                  children: [
-                    Row(
-                      children: [
-                        Flexible(
-                          child: Text(
-                            widget.landmark.name,
-                            style: const TextStyle(
-                              fontSize: 18,
-                              fontWeight: FontWeight.bold,
-                            ),
-                            maxLines: 2,
-                          ),
-                        )
-                      ],
-                    ),
-                    if (widget.landmark.nameEN != null)
-                      Row(
-                        children: [
-                          Flexible(
-                            child: Text(
-                              widget.landmark.nameEN!,
-                              style: const TextStyle(
-                                fontSize: 16,
-                              ),
-                              maxLines: 1,
-                            ),
-                          )
-                        ],
-                      ),
-                    SingleChildScrollView(
-                      // allows the buttons to be scrolled
-                      scrollDirection: Axis.horizontal,
-                      child: Wrap(
-                        spacing: 10,
-                        // show the type, the website, and the wikipedia link as buttons/labels in a row
-                        children: [
-                          TextButton.icon(
-                            onPressed: () {},
-                            icon: widget.landmark.type.icon,
-                            label: Text(widget.landmark.type.name),
-                          ),
-                          if (widget.landmark.duration != null && widget.landmark.duration!.inMinutes > 0)
-                            TextButton.icon(
-                              onPressed: () {},
-                              icon: Icon(Icons.hourglass_bottom),
-                              label: Text('${widget.landmark.duration!.inMinutes} minutes'),
-                            ),
-                          if (widget.landmark.websiteURL != null)
-                            TextButton.icon(
-                              onPressed: () async {
-                                // open a browser with the website link
-                                await launchUrl(Uri.parse(widget.landmark.websiteURL!));
-                              },
-                              icon: Icon(Icons.link),
-                              label: Text('Website'),
-                            ),
-                          if (widget.landmark.wikipediaURL != null)
-                            TextButton.icon(
-                              onPressed: () async {
-                                // open a browser with the wikipedia link
-                                await launchUrl(Uri.parse(widget.landmark.wikipediaURL!));
-                              },
-                              icon: Icon(Icons.book),
-                            label: Text('Wikipedia'),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
+        // if the image is available, display it on the left side of the card, otherwise only display the text
+        child: widget.landmark.imageURL != null ? splitLayout() : textLayout(),
+      ),
+    );
+  }
+
+  Widget splitLayout() {
+    // If an image is available, display it on the left side of the card
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          // the image on the left
+          width: 160,
+          height: 160,
+
+          child: CachedNetworkImage(
+            imageUrl: widget.landmark.imageURL ?? '',
+            placeholder: (context, url) => Center(child: CircularProgressIndicator()),
+            errorWidget: (context, error, stackTrace) => Icon(Icons.question_mark_outlined),
+            fit: BoxFit.cover,
+          ),
        ),
+        Flexible(
+          child: textLayout(),
+        ),
+      ],
+    );
+  }
+
+  Widget textLayout() {
+    return Padding(
+      padding: EdgeInsets.all(10),
+      child: Column(
+        children: [
+          Row(
+            children: [
+              Flexible(
+                child: Text(
+                  widget.landmark.name,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                  maxLines: 2,
+                ),
+              )
+            ],
+          ),
+          if (widget.landmark.nameEN != null)
+            Row(
+              children: [
+                Flexible(
+                  child: Text(
+                    widget.landmark.nameEN!,
+                    style: const TextStyle(
+                      fontSize: 16,
+                    ),
+                    maxLines: 1,
+                  ),
+                )
+              ],
+            ),
+          Padding(padding: EdgeInsets.only(top: 10)),
+          Align(
+            alignment: Alignment.centerLeft,
+            child: SingleChildScrollView(
+              // allows the buttons to be scrolled
+              scrollDirection: Axis.horizontal,
+              child: Wrap(
+                spacing: 10,
+                // show the type, the website, and the wikipedia link as buttons/labels in a row
+                children: [
+                  TextButton.icon(
+                    onPressed: () {},
+                    icon: widget.landmark.type.icon,
+                    label: Text(widget.landmark.type.name),
+                  ),
+                  if (widget.landmark.duration != null && widget.landmark.duration!.inMinutes > 0)
+                    TextButton.icon(
+                      onPressed: () {},
+                      icon: Icon(Icons.hourglass_bottom),
+                      label: Text('${widget.landmark.duration!.inMinutes} minutes'),
+                    ),
+                  if (widget.landmark.websiteURL != null)
+                    TextButton.icon(
+                      onPressed: () async {
+                        // open a browser with the website link
+                        await launchUrl(Uri.parse(widget.landmark.websiteURL!));
+                      },
+                      icon: Icon(Icons.link),
+                      label: Text('Website'),
+                    ),
+                  PopupMenuButton(
+                    icon: Icon(Icons.settings),
+                    style: TextButtonTheme.of(context).style,
+                    itemBuilder: (context) => [
+                      PopupMenuItem(
+                        child: ListTile(
+                          leading: Icon(Icons.delete),
+                          title: Text('Delete'),
+                          onTap: () async {
+                            widget.parentTrip.removeLandmark(widget.landmark);
+                            rootScaffoldMessengerKey.currentState!.showSnackBar(
+                              SnackBar(content: Text("We won't show ${widget.landmark.name} again"))
+                            );
+                          },
+                        ),
+                      ),
+                      PopupMenuItem(
+                        child: ListTile(
+                          leading: Icon(Icons.star),
+                          title: Text('Favorite'),
+                          onTap: () async {
+                            // delete the landmark
+                            // await deleteLandmark(widget.landmark);
+                          },
+                        ),
+                      ),
+                    ],
+                  )
+                    
+                ],
+              ),
+            ),
+          ),
+        ],
      ),
    );
  }
--- a/frontend/lib/modules/new_trip_button.dart
+++ b/frontend/lib/modules/new_trip_button.dart
@@ -1,5 +1,5 @@
-import 'package:anyway/layout.dart';
 import 'package:anyway/main.dart';
+import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/structs/preferences.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:anyway/utils/fetch_trip.dart';
@@ -57,7 +57,7 @@ class _NewTripButtonState extends State<NewTripButton> {
      fetchTrip(trip, widget.preferences);
      Navigator.of(context).push(
        MaterialPageRoute(
-          builder: (context) => BasePage(mainScreen: "map", trip: trip)
+          builder: (context) => TripPage(trip: trip)
        )
      );
    }
--- a/frontend/lib/modules/new_trip_location_search.dart
+++ b/frontend/lib/modules/new_trip_location_search.dart
@@ -9,6 +9,15 @@ import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:shared_preferences/shared_preferences.dart';

+const Map<String, List> debugLocations = {
+  'paris': [48.8575, 2.3514],
+  'london': [51.5074, -0.1278],
+  'new york': [40.7128, -74.0060],
+  'tokyo': [35.6895, 139.6917],
+};
+
+
+
 class NewTripLocationSearch extends StatefulWidget {
  Future<SharedPreferences> prefs = SharedPreferences.getInstance();
  Trip trip;
@@ -27,26 +36,35 @@ class _NewTripLocationSearchState extends State<NewTripLocationSearch> {

  setTripLocation (String query) async {
    List<Location> locations = [];
+    Location startLocation;
    log('Searching for: $query');
-    
-    try{
-      locations = await locationFromAddress(query);
-    } catch (e) {
-      log('No results found for: $query : $e');
+    if (GeocodingPlatform.instance != null) {
+      locations.addAll(await locationFromAddress(query));
    }

    if (locations.isNotEmpty) {
-      Location location = locations.first;
-      widget.trip.landmarks.clear();
-      widget.trip.addLandmark(
-        Landmark(
-          uuid: 'pending',
-          name: query,
-          location: [location.latitude, location.longitude],
-          type: typeStart
-        )
+      startLocation = locations.first;
+    } else {
+      log('No results found for: $query. Is geocoding available?');
+      log('Setting Fallback location');
+      List coordinates = debugLocations[query.toLowerCase()] ?? [48.8575, 2.3514];
+      startLocation = Location(
+        latitude: coordinates[0],
+        longitude: coordinates[1],
+        timestamp: DateTime.now(),
      );
    }
+
+    widget.trip.landmarks.clear();
+    widget.trip.addLandmark(
+      Landmark(
+        uuid: 'pending',
+        name: query,
+        location: [startLocation.latitude, startLocation.longitude],
+        type: typeStart
+      )
+    );
+
  }

  late Widget locationSearchBar = SearchBar(
--- a/frontend/lib/modules/new_trip_map.dart
+++ b/frontend/lib/modules/new_trip_map.dart
@@ -26,7 +26,7 @@ class _NewTripMapState extends State<NewTripMap> {
    target: LatLng(48.8566, 2.3522),
    zoom: 11.0,
  );
-  late GoogleMapController _mapController;
+  GoogleMapController? _mapController;
  final Set<Marker> _markers = <Marker>{};

  _onLongPress(LatLng location) {
@@ -56,11 +56,15 @@ class _NewTripMapState extends State<NewTripMap> {
          ),
        )
      );
-      _mapController.moveCamera(
-        CameraUpdate.newLatLng(
-          LatLng(landmark.location[0], landmark.location[1])
-        )
-      );
+      // check if the controller is ready
+
+      if (_mapController != null) {
+        _mapController!.animateCamera(
+          CameraUpdate.newLatLng(
+            LatLng(landmark.location[0], landmark.location[1])
+          )
+        );
+      }
      setState(() {});
    }
  }
--- a/frontend/lib/modules/onboarding_card.dart
+++ b/frontend/lib/modules/onboarding_card.dart
@@ -2,13 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';

 class OnboardingCard extends StatelessWidget {
-  int index;
-  String title;
-  String description;
-  String imagePath;
+  final String title;
+  final String description;
+  final String imagePath;

-  OnboardingCard({
-    required this.index,
+  const OnboardingCard({
    required this.title,
    required this.description,
    required this.imagePath,
@@ -16,41 +14,35 @@ class OnboardingCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    Color baseColor = Theme.of(context).colorScheme.secondary;
-    // have a different color for each card, incrementing the hue
-    Color currentColor = baseColor.withAlpha(baseColor.alpha - index * 30);
-    return Container(
-      color: currentColor,
-      alignment: Alignment.center,
-      child: Padding(
-        padding: EdgeInsets.all(20),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              title,
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-                color: Colors.white,
-              ),
+    
+    return Padding(
+      padding: EdgeInsets.all(20),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.bold,
+              color: Colors.white,
            ),
-            Padding(padding: EdgeInsets.only(top: 20)),
-            SvgPicture.asset(
-              imagePath,
-              height: 200,
-            ),
-            Padding(padding: EdgeInsets.only(top: 20)),
-            Text(
-              description,
-              style: TextStyle(
-                fontSize: 16,
-              ),
+          ),
+          Padding(padding: EdgeInsets.only(top: 20)),
+          SvgPicture.asset(
+            imagePath,
+            height: 200,
+          ),
+          Padding(padding: EdgeInsets.only(top: 20)),
+          Text(
+            description,
+            style: TextStyle(
+              fontSize: 16,
            ),
+          ),

-          ]
-        ),
-      )
+        ]
+      ),
    );
  }
 }
--- a/frontend/lib/modules/step_between_landmarks.dart
+++ b/frontend/lib/modules/step_between_landmarks.dart
@@ -19,8 +19,7 @@ class StepBetweenLandmarks extends StatefulWidget {
 class _StepBetweenLandmarksState extends State<StepBetweenLandmarks> {
  @override
  Widget build(BuildContext context) {
-    int timeRounded = 5 * ((widget.current.tripTime?.inMinutes ?? 0) ~/ 5);
-    // ~/ is integer division (rounding)
+    int time = widget.current.tripTime?.inMinutes ?? 0;
    return Container(
      margin: EdgeInsets.all(10),
      padding: EdgeInsets.all(10),
@@ -34,7 +33,7 @@ class _StepBetweenLandmarksState extends State<StepBetweenLandmarks> {
          Column(
            children: [
              Icon(Icons.directions_walk),
-              Text("~$timeRounded min", style: TextStyle(fontSize: 10)),
+              Text("$time min", style: TextStyle(fontSize: 10)),
            ],
          ),
          Spacer(),
--- a/frontend/lib/modules/trips_saved_list.dart
+++ b/frontend/lib/modules/trips_saved_list.dart
@@ -1,11 +1,12 @@
+import 'package:anyway/pages/current_trip.dart';
+import 'package:anyway/utils/load_trips.dart';
 import 'package:flutter/material.dart';

-import 'package:anyway/layout.dart';
 import 'package:anyway/structs/trip.dart';


 class TripsOverview extends StatefulWidget {
-  final Future<List<Trip>> trips;
+  final SavedTrips trips;
  const TripsOverview({
    super.key,
    required this.trips,
@@ -16,50 +17,34 @@ class TripsOverview extends StatefulWidget {
 }

 class _TripsOverviewState extends State<TripsOverview> {
-
-  Widget listBuild (BuildContext context, AsyncSnapshot<List<Trip>> snapshot) {
+  Widget listBuild (BuildContext context, SavedTrips trips) {
    List<Widget> children;
-    if (snapshot.hasData) {
-      children = List<Widget>.generate(snapshot.data!.length, (index) {
-        Trip trip = snapshot.data![index];
-        return ListTile(
-          title: FutureBuilder(
-            future: trip.cityName,
-            builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-              if (snapshot.hasData) {
-                return Text("Trip to ${snapshot.data}");
-              } else if (snapshot.hasError) {
-                return Text("Error: ${snapshot.error}");
-              } else {
-                return const Text("Trip to ...");
-              }
-            },
-          ),
-          leading: Icon(Icons.pin_drop),
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(
-                builder: (context) => BasePage(mainScreen: "map", trip: trip)
-              )
-            );
+    List<Trip> items = trips.trips;
+    children = List<Widget>.generate(items.length, (index) {
+      Trip trip = items[index];
+      return ListTile(
+        title: FutureBuilder(
+          future: trip.cityName,
+          builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+            if (snapshot.hasData) {
+              return Text("Trip to ${snapshot.data}");
+            } else if (snapshot.hasError) {
+              return Text("Error: ${snapshot.error}");
+            } else {
+              return const Text("Trip to ...");
+            }
          },
-        );
-      });
-    } else if (snapshot.hasError) {
-      children = [
-        const Icon(
-          Icons.error_outline,
-          color: Colors.red,
-          size: 60,
        ),
-        Padding(
-          padding: const EdgeInsets.only(top: 16),
-          child: Text('Error: ${snapshot.error}'),
-        ),
-      ];
-    } else {
-      children = [Center(child: CircularProgressIndicator())];
-    }
+        leading: Icon(Icons.pin_drop),
+        onTap: () {
+          Navigator.of(context).push(
+            MaterialPageRoute(
+              builder: (context) => TripPage(trip: trip)
+            )
+          );
+        },
+      );
+    });

    return ListView(
      children: children,
@@ -69,9 +54,11 @@ class _TripsOverviewState extends State<TripsOverview> {

  @override
  Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: widget.trips,
-      builder: listBuild,
+    return ListenableBuilder(
+      listenable: widget.trips,
+      builder: (BuildContext context, Widget? child) {
+        return listBuild(context, widget.trips);
+      }
    );
  }
-}
+}
--- a/frontend/lib/pages/base_page.dart
+++ b/frontend/lib/pages/base_page.dart
@@ -1,3 +1,6 @@
+import 'package:anyway/main.dart';
+import 'package:anyway/modules/help_dialog.dart';
+import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/pages/settings.dart';
 import 'package:flutter/material.dart';

@@ -8,22 +11,24 @@ import 'package:anyway/modules/trips_saved_list.dart';
 import 'package:anyway/utils/load_trips.dart';

 import 'package:anyway/pages/new_trip_location.dart';
-import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/pages/onboarding.dart';




-// BasePage is the scaffold that holds all other pages
-// A side drawer is used to switch between pages
+// BasePage is the scaffold that holds a child page and a side drawer
+// The side drawer is the main way to switch between pages
+
 class BasePage extends StatefulWidget {
-  final String mainScreen;
-  final Trip? trip;
+  final Widget mainScreen;
+  final Widget title;
+  final List<String> helpTexts;

  const BasePage({
    super.key,
    required this.mainScreen,
-    this.trip,
+    this.title = const Text(APP_NAME),
+    this.helpTexts = const [],
  });

  @override
@@ -34,53 +39,25 @@ class _BasePageState extends State<BasePage> {

  @override
  Widget build(BuildContext context) {
-    Widget currentView = const Text("loading...");
-    Future<List<Trip>> trips = loadTrips();
-    
-    
-    if (widget.mainScreen == "map") {
-      if (widget.trip != null) {
-        currentView = TripPage(trip: widget.trip!);
-      } else {
-        currentView = FutureBuilder(
-          future: trips,
-          builder: (context, snapshot) {
-            if (snapshot.hasData) {
-              List<Trip> availableTrips = snapshot.data!;
-              if (availableTrips.isNotEmpty) {
-                return TripPage(trip: availableTrips[0]);
-              } else {
-                return Scaffold(
-                  body: Center(
-                    child: Text("Wow, so empty!"),
-                  ),
-                  floatingActionButton: FloatingActionButton.extended(
-                    onPressed: () {
-                      Navigator.of(context).push(
-                        MaterialPageRoute(
-                          builder: (context) => const NewTripPage()
-                        )
-                      );
-                    },
-                    label: Text("Plan a trip"),
-                  ),
-                );
-              }
-            } else {
-              return const Text("loading...");
-            }
-          },
-        );
-      }
-    } else if (widget.mainScreen == "tutorial") {
-      currentView = OnboardingPage();
-    } else if (widget.mainScreen == "settings") {
-      currentView = SettingsPage();
-    }
+    savedTrips.loadTrips();
+

    return Scaffold(
-      appBar: AppBar(title: Text(APP_NAME)),
-      body: Center(child: currentView),
+      appBar: AppBar(
+        title: widget.title,
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.help),
+            tooltip: 'Help',
+            onPressed: () {
+              if (widget.helpTexts.isNotEmpty) {
+                helpDialog(context, widget.helpTexts[0], widget.helpTexts[1]);
+              }
+            }
+          ),
+        ],
+      ),
+      body: Center(child: widget.mainScreen),
      drawer: Drawer(
        child: Column(
          children: [
@@ -104,7 +81,8 @@ class _BasePageState extends State<BasePage> {
            ListTile(
              title: const Text('Your Trips'),
              leading: const Icon(Icons.map),
-              selected: widget.mainScreen == "map",
+              // TODO: this is not working!
+              selected: widget.mainScreen is TripPage,
              onTap: () {},
              trailing: ElevatedButton(
                onPressed: () {
@@ -122,11 +100,11 @@ class _BasePageState extends State<BasePage> {
            // through the options in the drawer if there isn't enough vertical
            // space to fit everything.
            Expanded(
-              child: TripsOverview(trips: trips),
+              child: TripsOverview(trips: savedTrips),
            ),
            ElevatedButton(
              onPressed: () async {
-                removeAllTripsFromPrefs();
+                savedTrips.clearTrips();
              },
              child: const Text('Clear trips'),
            ),
@@ -134,11 +112,12 @@ class _BasePageState extends State<BasePage> {
            ListTile(
              title: const Text('How to use'),
              leading: Icon(Icons.help),
-              selected: widget.mainScreen == "tutorial",
+              // TODO: this is not working!
+              selected: widget.mainScreen is OnboardingPage,
              onTap: () {
                Navigator.of(context).push(
                  MaterialPageRoute(
-                    builder: (context) => BasePage(mainScreen: "tutorial")
+                    builder: (context) => OnboardingPage()
                  )
                );
              },
@@ -148,11 +127,12 @@ class _BasePageState extends State<BasePage> {
            ListTile(
              title: const Text('Settings'),
              leading: const Icon(Icons.settings),
-              selected: widget.mainScreen == "settings",
+              // TODO: this is not working!
+              selected: widget.mainScreen is SettingsPage,
              onTap: () {
                Navigator.of(context).push(
                  MaterialPageRoute(
-                    builder: (context) => BasePage(mainScreen: "settings")
+                    builder: (context) => SettingsPage()
                  )
                );
              },
--- a/frontend/lib/pages/current_trip.dart
+++ b/frontend/lib/pages/current_trip.dart
@@ -1,4 +1,5 @@
 import 'package:anyway/constants.dart';
+import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';

@@ -10,7 +11,7 @@ final Shader textGradient = APP_GRADIENT.createShader(Rect.fromLTWH(0.0, 0.0, 20
 TextStyle greeterStyle = TextStyle(
  foreground: Paint()..shader = textGradient,
  fontWeight: FontWeight.bold,
-  fontSize: 26
+  fontSize: 25
 );


@@ -31,7 +32,8 @@ class _TripPageState extends State<TripPage> {

  @override
  Widget build(BuildContext context) {
-    return SlidingUpPanel(
+    return BasePage(
+      mainScreen: SlidingUpPanel(
        // use panelBuilder instead of panel so that we can reuse the scrollcontroller for the listview
        panelBuilder: (scrollcontroller) => CurrentTripPanel(controller: scrollcontroller, trip: widget.trip),
        // using collapsed and panelBuilder seems to show both at the same time, so we include the greeter in the panelBuilder
@@ -41,7 +43,7 @@ class _TripPageState extends State<TripPage> {
        maxHeight: MediaQuery.of(context).size.height * TRIP_PANEL_MAX_HEIGHT,
        // padding in this context is annoying: it offsets the notion of vertical alignment.
        // children that want to be centered vertically need to have their size adjusted by 2x the padding
-        padding: const EdgeInsets.all(10.0),
+        // padding: const EdgeInsets.all(10.0),
        // Panel snapping should not be disabled because it significantly improves the user experience
        // panelSnapping: false
        borderRadius: const BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)),
@@ -52,6 +54,13 @@ class _TripPageState extends State<TripPage> {
            color: Colors.black,
          )
        ],
+      ),
+      title: FutureBuilder(
+        future: widget.trip.cityName,
+        builder: (context, snapshot) => Text(
+          'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
+        )
+      ),
    );
  }
 }
--- a/frontend/lib/pages/new_trip_location.dart
+++ b/frontend/lib/pages/new_trip_location.dart
@@ -1,5 +1,5 @@
-import 'package:anyway/modules/new_trip_button.dart';
 import 'package:anyway/modules/new_trip_options_button.dart';
+import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';

 import "package:anyway/structs/trip.dart";
@@ -19,23 +19,28 @@ class _NewTripPageState extends State<NewTripPage> {
  final TextEditingController lonController = TextEditingController();
  Trip trip = Trip();

+
  @override
  Widget build(BuildContext context) {
    // floating search bar and map as a background
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('New Trip'),
+    return BasePage(
+      mainScreen: Scaffold(
+        body: Stack(
+          children: [
+            NewTripMap(trip),
+            Padding(
+              padding: EdgeInsets.all(15),
+              child: NewTripLocationSearch(trip),
+            ),
+          ],
+        ),
+        floatingActionButton: NewTripOptionsButton(trip: trip),
      ),
-      body: Stack(
-        children: [
-          NewTripMap(trip),
-          Padding(
-            padding: EdgeInsets.all(15),
-            child: NewTripLocationSearch(trip),
-          ),
-        ],
-      ),
-      floatingActionButton: NewTripOptionsButton(trip: trip),
+      title: Text("New Trip"),
+      helpTexts: [
+        "Setting the start location",
+        "To set the starting point, type a city name in the search bar. You can also navigate the map like you're used to and long press anywhere to set a starting point."
+      ],
    );
  }
 }
--- a/frontend/lib/pages/new_trip_preferences.dart
+++ b/frontend/lib/pages/new_trip_preferences.dart
@@ -1,4 +1,5 @@
 import 'package:anyway/modules/new_trip_button.dart';
+import 'package:anyway/pages/base_page.dart';
 import 'package:anyway/structs/preferences.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:flutter/cupertino.dart';
@@ -19,41 +20,54 @@ class _NewTripPreferencesPageState extends State<NewTripPreferencesPage> {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      body: ListView(
-        children: [
-          // Center(
-          //   child: CircleAvatar(
-          //     radius: 100,
-          //     child: Icon(Icons.person, size: 100),
-          //   )
-          // ),
-          Padding(padding: EdgeInsets.only(top: 30)),
-          Center(
-            child: FutureBuilder(
-              future: widget.trip.cityName,
-              builder: (context, snapshot) => Text(
-                'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
-                style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold)
-              )
-            )
-          ),
+    return BasePage(
+      mainScreen: Scaffold(
+        body: ListView(
+          children: [
+            // Center(
+            //   child: CircleAvatar(
+            //     radius: 100,
+            //     child: Icon(Icons.person, size: 100),
+            //   )
+            // ),
+            // Padding(padding: EdgeInsets.only(top: 30)),
+            // Center(
+            //   child: FutureBuilder(
+            //     future: widget.trip.cityName,
+            //     builder: (context, snapshot) => Text(
+            //       'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
+            //       style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold)
+            //     )
+            //   )
+            // ),

-          Center(
-            child: Padding(
-            padding: EdgeInsets.only(left: 10, right: 10, top: 20, bottom: 0),
-              child: Text('Tell us about your ideal trip.', style: TextStyle(fontSize: 18))
+            Center(
+              child: Padding(
+              padding: EdgeInsets.only(left: 10, right: 10, top: 20, bottom: 0),
+                child: Text('Tell us about your ideal trip.', style: TextStyle(fontSize: 18))
+              ),
            ),
-          ),

-          Divider(indent: 25, endIndent: 25, height: 50),
+            Divider(indent: 25, endIndent: 25, height: 50),

-          durationPicker(preferences.maxTime),
+            durationPicker(preferences.maxTime),

-          preferenceSliders([preferences.sightseeing, preferences.shopping, preferences.nature]),
-        ]
+            preferenceSliders([preferences.sightseeing, preferences.shopping, preferences.nature]),
+          ]
+        ),
+        floatingActionButton: NewTripButton(trip: widget.trip, preferences: preferences),
      ),
-      floatingActionButton: NewTripButton(trip: widget.trip, preferences: preferences),
+      
+      title: FutureBuilder(
+        future: widget.trip.cityName,
+        builder: (context, snapshot) => Text(
+          'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
+        )
+      ),
+      helpTexts: [
+        'Trip preferences',
+        'Set your preferences for this trip. These will be used to generate a custom itinerary.'
+      ],
    );
  }

--- a/frontend/lib/pages/onboarding.dart
+++ b/frontend/lib/pages/onboarding.dart
@@ -1,7 +1,33 @@
+import 'dart:ui';
+
+import 'package:anyway/constants.dart';
 import 'package:anyway/modules/onboarding_card.dart';
 import 'package:anyway/pages/new_trip_location.dart';
 import 'package:flutter/material.dart';

+const List<Widget> onboardingCards = [
+  OnboardingCard(
+    title: "Welcome to anyway!",
+    description: "Anyway helps you plan a city trip that suits your wishes.",
+    imagePath: "assets/city.svg"
+  ),
+  OnboardingCard(
+    title: "Find your way",
+    description: "Bored by churches? No problem! Hate shopping? No worries! Instead of suggesting the generic trips that bore you, anyway will try to give you recommendations that really suit you.",
+    imagePath: "assets/plan.svg"
+  ),
+  OnboardingCard(
+    title: "Change your mind",
+    description: "Feet get sore, the weather changes. Anyway understands that! Move or remove destinations, visit hidden gems along your journey, do your own thing. Anyway adapts to your spontaneous decisions.",
+    imagePath: "assets/cat.svg"
+  ),
+  OnboardingCard(
+    title: "Feeling lost?",
+    description: "Whenever you are confused or need help with the app, look out for the question mark in the top right corner. Help is just a tap away!",
+    imagePath: "assets/confused.svg"
+  ),
+];
+
 class OnboardingPage extends StatefulWidget {
  const OnboardingPage({super.key});

@@ -10,37 +36,83 @@ class OnboardingPage extends StatefulWidget {
 }

 class _OnboardingPageState extends State<OnboardingPage> {
+  final PageController _controller = PageController();
+
  @override
  Widget build(BuildContext context) {
-    final PageController _controller = PageController();
    return Scaffold(
      body: Stack(
        children: [
+          AnimatedBuilder(
+            animation: _controller,
+            builder: (context, child) {
+              return Stack(
+                children: [
+                  Container(
+                    decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                        begin: Alignment.topLeft,
+                        end: Alignment.bottomRight,
+                        colors: APP_GRADIENT.colors,
+                        stops: [
+                          (_controller.hasClients ? _controller.page ?? _controller.initialPage : _controller.initialPage) / onboardingCards.length,
+                          (_controller.hasClients ? _controller.page ?? _controller.initialPage + 1 : _controller.initialPage + 1) / onboardingCards.length,
+                        ],
+                      ),
+                    ),
+                  ),
+                  BackdropFilter(
+                    filter: ImageFilter.blur(sigmaX: 100, sigmaY: 100),
+                    child: Container(
+                      color: Colors.black.withOpacity(0),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
          PageView(
-            // horizontally scrollable list of pages
            controller: _controller,
-            
-            children: [
-              OnboardingCard(index: 1, title: "Welcome to anyway!", description: "Anyway helps you plan a city trip that suits your wishes.", imagePath: "assets/city.svg"),
-              OnboardingCard(index: 2, title: "Find your way", description: "Bored by churches? No problem! Hate shopping? No worries! More than showing you the typical 'must-sees' of a city, anyway will try to give you recommendations that really suit you.", imagePath: "assets/plan.svg"),
-              OnboardingCard(index: 3, title: "Change your mind", description: "Life happens when you're busy making plans. Anyway understands that! Move or remove destinations, visit hidden gems along your journey, do your own thing. Anyway adapts to your spontaneous decisions.", imagePath: "assets/cat.svg"),
-            ],
+            children: List.generate(
+              onboardingCards.length,
+              (index) {
+                return Container(
+                  alignment: Alignment.center,
+                  child: onboardingCards[index],
+                );
+              }
+            ),
          ),
        ],
      ),
-      floatingActionButton: FloatingActionButton(
-         onPressed: () {
-            if (_controller.page == 2) {
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (context) => const NewTripPage()
-                )
+      floatingActionButton: FloatingActionButton.extended(
+        onPressed: () {
+          if (_controller.page == onboardingCards.length - 1) {
+            Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (context) => const NewTripPage()
+              )
+            );
+          } else {
+            _controller.nextPage(duration: Duration(milliseconds: 500), curve: Curves.ease);
+          }
+        },
+        label: AnimatedBuilder(
+          animation: _controller,
+          builder: (context, child) {
+            if ((_controller.page ?? _controller.initialPage) == onboardingCards.length - 1) {
+              return Row(
+                children: [
+                  const Text("Start planning!"),
+                  Padding(padding: const EdgeInsets.only(right: 8.0)),
+                  const Icon(Icons.map_outlined)
+                ],
              );
            } else {
-              _controller.nextPage(duration: Duration(milliseconds: 500), curve: Curves.ease);
+              return const Icon(Icons.arrow_forward);
            }
-          },
-          child: Icon(Icons.arrow_forward),
+          }
+        )
      ),
    );
  }
--- a/frontend/lib/pages/settings.dart
+++ b/frontend/lib/pages/settings.dart
@@ -1,5 +1,6 @@
 import 'package:anyway/constants.dart';
 import 'package:anyway/main.dart';
+import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -16,30 +17,37 @@ class SettingsPage extends StatefulWidget {
 class _SettingsPageState extends State<SettingsPage> {
  @override
  Widget build(BuildContext context) {
-    return ListView(
-      padding: EdgeInsets.all(15),
-      children: [
-        // First a round, centered image
-        Center(
-          child: CircleAvatar(
-            radius: 75,
-            child: Icon(Icons.settings, size: 100),
-          )
-        ),
-        Center(
-          child: Text('Global settings', style: TextStyle(fontSize: 24))
-        ),
+    return BasePage(
+      mainScreen: ListView(
+        padding: EdgeInsets.all(15),
+        children: [
+          // First a round, centered image
+          Center(
+            child: CircleAvatar(
+              radius: 75,
+              child: Icon(Icons.settings, size: 100),
+            )
+          ),
+          Center(
+            child: Text('Global settings', style: TextStyle(fontSize: 24))
+          ),

-        Divider(indent: 25, endIndent: 25, height: 50),
+          Divider(indent: 25, endIndent: 25, height: 50),

-        darkMode(),
-        setLocationUsage(),
-        setDebugMode(),
+          darkMode(),
+          setLocationUsage(),
+          setDebugMode(),

-        Divider(indent: 25, endIndent: 25, height: 50),
+          Divider(indent: 25, endIndent: 25, height: 50),

-        privacyInfo(),
-      ]
+          privacyInfo(),
+        ]
+      ),
+      title: Text('Settings'),
+      helpTexts: [
+        'Settings',
+        'Preferences set in this page are global and will affect the entire application.'
+      ],
    );
  }

@@ -169,7 +177,9 @@ class _SettingsPageState extends State<SettingsPage> {
    return Center(
      child: Column(
        children: [
-          Text('Our privacy policy is available under:'),
+          Text('AnyWay does not collect or store any of the data that is submitted via the app. The location of your trip is not stored. The location feature is only used to show your current location on the map, it is not transmitted to our servers.', textAlign: TextAlign.center),
+          Padding(padding: EdgeInsets.only(top: 3)),
+          Text('Our full privacy policy is available under:', textAlign: TextAlign.center),
          
          TextButton.icon(
            icon: Icon(Icons.info),
--- a/frontend/lib/structs/landmark.dart
+++ b/frontend/lib/structs/landmark.dart
@@ -24,8 +24,7 @@ final class Landmark extends LinkedListEntry<Landmark>{
  // description to be shown in the overview
  final String? nameEN;
  final String? websiteURL;
-  final String? wikipediaURL;
-  final String? imageURL;
+  String? imageURL; // not final because it can be patched
  final String? description;
  final Duration? duration;
  final bool? visited;
@@ -44,7 +43,6 @@ final class Landmark extends LinkedListEntry<Landmark>{

    this.nameEN,
    this.websiteURL,
-    this.wikipediaURL,
    this.imageURL,
    this.description,
    this.duration,
@@ -70,7 +68,6 @@ final class Landmark extends LinkedListEntry<Landmark>{
      final isSecondary = json['is_secondary'] as bool?;
      final nameEN = json['name_en'] as String?;
      final websiteURL = json['website_url'] as String?;
-      final wikipediaURL = json['wikipedia_url'] as String?;
      final imageURL = json['image_url'] as String?;
      final description = json['description'] as String?;
      var duration = Duration(minutes: json['duration'] ?? 0) as Duration?;
@@ -85,7 +82,6 @@ final class Landmark extends LinkedListEntry<Landmark>{
        isSecondary: isSecondary,
        nameEN: nameEN,
        websiteURL: websiteURL,
-        wikipediaURL: wikipediaURL,
        imageURL: imageURL,
        description: description,
        duration: duration,
@@ -112,7 +108,6 @@ final class Landmark extends LinkedListEntry<Landmark>{
    'is_secondary': isSecondary,
    'name_en': nameEN,
    'website_url': websiteURL,
-    'wikipedia_url': wikipediaURL,
    'image_url': imageURL,
    'description': description,
    'duration': duration?.inMinutes,
@@ -130,7 +125,7 @@ class LandmarkType {
  LandmarkType({required this.name, this.icon = const Icon(Icons.location_on)}) {
    switch (name) {
      case 'sightseeing':
-        icon = const Icon(Icons.church);
+        icon = const Icon(Icons.castle);
        break;
      case 'nature':
        icon = const Icon(Icons.eco);
--- a/frontend/lib/structs/trip.dart
+++ b/frontend/lib/structs/trip.dart
@@ -113,10 +113,3 @@ LinkedList<Landmark> readLandmarks(SharedPreferences prefs, String? firstUUID) {
  }
  return landmarks;
 }
-
-
-
-void removeAllTripsFromPrefs () async {
-  SharedPreferences prefs = await SharedPreferences.getInstance();
-  prefs.clear();
-}
--- a/frontend/lib/utils/fetch_trip.dart
+++ b/frontend/lib/utils/fetch_trip.dart
@@ -1,5 +1,6 @@
 import "dart:convert";
 import "dart:developer";
+import "package:anyway/utils/load_landmark_image.dart";
 import 'package:dio/dio.dart';

 import 'package:anyway/constants.dart';
@@ -32,6 +33,7 @@ fetchTrip(
  UserPreferences preferences,
 ) async {
  Map<String, dynamic> data = {
+    // Add user ID here for API request
    "preferences": preferences.toJson(),
    "start": trip.landmarks!.first.location,
  };
@@ -85,6 +87,20 @@ fetchTrip(
 }


+patchLandmarkImage(Landmark landmark) async {
+  // patch the landmark to include an image from an external source
+  if (landmark.imageURL == null) {
+    String? newUrl = await getImageUrlFromName(landmark.name);
+    if (newUrl != null) {
+      landmark.imageURL = newUrl;
+    }
+  } else if (landmark.imageURL!.contains("photos.app.goo.gl")) {
+    // the image is a google photos link, we should get the image behind the link
+    String? newUrl = await getImageUrlFromGooglePhotos(landmark.imageURL!);
+    // also set the new url if it is null
+    landmark.imageURL = newUrl; 
+  }
+}

 Future<(Landmark, String?)> fetchLandmark(String uuid) async {
  final response = await dio.get(
@@ -101,5 +117,7 @@ Future<(Landmark, String?)> fetchLandmark(String uuid) async {
  log(response.data.toString());
  Map<String, dynamic> json = response.data;
  String? nextUUID = json["next_uuid"];
-  return (Landmark.fromJson(json), nextUUID);
+  Landmark landmark = Landmark.fromJson(json);
+  patchLandmarkImage(landmark);
+  return (landmark, nextUUID);
 }
--- a/frontend/lib/utils/get_first_page.dart
+++ b/frontend/lib/utils/get_first_page.dart
@@ -0,0 +1,41 @@
+import 'package:anyway/pages/current_trip.dart';
+import 'package:anyway/pages/onboarding.dart';
+import 'package:anyway/structs/trip.dart';
+import 'package:anyway/utils/load_trips.dart';
+import 'package:flutter/material.dart';
+
+Widget getFirstPage() {
+  SavedTrips trips = SavedTrips();
+  trips.loadTrips();
+
+  return ListenableBuilder(
+    listenable: trips,
+    builder: (BuildContext context, Widget? child) {
+      List<Trip> items = trips.trips;
+      if (items.isNotEmpty) {
+        return TripPage(trip: items[0]);
+      } else {
+        return OnboardingPage();
+      }
+    }
+  );
+  // Future<List<Trip>> trips = loadTrips();
+  // // test if there are any active trips
+  // // if there are, return the trip list
+  // // if there are not, return the onboarding page
+  // return FutureBuilder(
+  //   future: trips,
+  //   builder: (context, snapshot) {
+  //     if (snapshot.hasData) {
+  //       List<Trip> availableTrips = snapshot.data!;
+  //       if (availableTrips.isNotEmpty) {
+  //         return TripPage(trip: availableTrips[0]);
+  //       } else {
+  //         return OnboardingPage();
+  //       }
+  //     } else {
+  //       return CircularProgressIndicator();
+  //     }
+  //   }
+  // );
+}
--- a/frontend/lib/utils/load_landmark_image.dart
+++ b/frontend/lib/utils/load_landmark_image.dart
@@ -0,0 +1,71 @@
+import 'dart:developer';
+
+import 'package:dio/dio.dart';
+import 'package:fuzzywuzzy/fuzzywuzzy.dart';
+import 'dart:convert';
+
+import 'package:fuzzywuzzy/model/extracted_result.dart';
+
+const String baseUrl = "https://en.wikipedia.org/w/api.php";
+final Dio dio = Dio();
+
+Future<int?> bestPageMatch(String title) async {
+    final response = await dio.get(baseUrl, queryParameters: {
+        "action": "query",
+        "format": "json",
+        "list": "prefixsearch",
+        "pssearch": title,
+    });
+
+    final data = jsonDecode(response.toString());
+    log(data.toString());
+    final List<dynamic> results = data["query"]["prefixsearch"] ?? {};
+    final Map<String, int> titlesAndIds = {
+        for (var d in results) d["title"]: d["pageid"]
+    };
+    if (titlesAndIds.isEmpty) {
+        log("No pages found for $title");
+        return null;
+    }
+
+    // after the empty check, we can safely assume that there is a best match
+    final ExtractedResult<String> bestMatch = extractOne(
+      query: title,
+      choices: titlesAndIds.keys.toList(),
+      cutoff: 70,
+    );
+    return titlesAndIds[bestMatch.choice];
+}
+
+Future<String?> getImageUrl(int pageId) async {
+    final response = await dio.get(baseUrl, queryParameters: {
+        "action": "query",
+        "format": "json",
+        "prop": "pageimages",
+        "pageids": pageId,
+        "pithumbsize": 500,
+    });
+
+    final data = jsonDecode(response.toString());
+    final pageData = data["query"]["pages"][pageId.toString()];
+    return pageData["thumbnail"]?["source"];
+}
+
+Future<String?> getImageUrlFromName(String title) async {
+    int? pageId = await bestPageMatch(title);
+    if (pageId == null) {
+        return null;
+    }
+    return await getImageUrl(pageId);
+}
+
+
+Future<String?> getImageUrlFromGooglePhotos(String url) async {
+    // this is a very simple implementation that just gets the image behind the link
+    // it is not guaranteed to work for all google photos links
+    final response = await dio.get(url);
+    final data = response.toString();
+    final int start = data.indexOf("https://lh3.googleusercontent.com");
+    final int end = data.indexOf('"', start);
+    return data.substring(start, end);
+}
--- a/frontend/lib/utils/load_trips.dart
+++ b/frontend/lib/utils/load_trips.dart
@@ -1,19 +1,39 @@
-import 'dart:collection';
-
 import 'package:anyway/structs/trip.dart';
-import 'package:anyway/structs/landmark.dart';
 import 'package:shared_preferences/shared_preferences.dart';

-Future<List<Trip>> loadTrips() async {
-  SharedPreferences prefs = await SharedPreferences.getInstance();
+import 'package:flutter/foundation.dart';

-  List<Trip> trips = [];
-  Set<String> keys = prefs.getKeys();
-  for (String key in keys) {
-    if (key.startsWith('trip_')) {
-      String uuid = key.replaceFirst('trip_', '');
-      trips.add(Trip.fromPrefs(prefs, uuid));
+class SavedTrips extends ChangeNotifier {
+  List<Trip> _trips = [];
+
+  List<Trip> get trips => _trips;
+
+  void loadTrips() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+
+    List<Trip> trips = [];
+    Set<String> keys = prefs.getKeys();
+    for (String key in keys) {
+      if (key.startsWith('trip_')) {
+        String uuid = key.replaceFirst('trip_', '');
+        trips.add(Trip.fromPrefs(prefs, uuid));
+      }
    }
+    _trips = trips;
+    notifyListeners();
+  }
+
+  void addTrip(Trip trip) async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    trip.toPrefs(prefs);
+    _trips.add(trip);
+    notifyListeners();
+  }
+
+  void clearTrips () async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.clear();
+    _trips = [];
+    notifyListeners();
  }
-  return trips;
 }
--- a/frontend/pubspec.lock
+++ b/frontend/pubspec.lock
@@ -101,10 +101,10 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  crypto:
    dependency: transitive
    description:
@@ -232,6 +232,14 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  fuzzywuzzy:
+    dependency: "direct main"
+    description:
+      name: fuzzywuzzy
+      sha256: "3004379ffd6e7f476a0c2091f38f16588dc45f67de7adf7c41aa85dec06b432c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
  geocoding:
    dependency: "direct main"
    description:
@@ -404,18 +412,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
  leak_tracker_testing:
    dependency: transitive
    description:
@@ -700,7 +708,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  sliding_up_panel:
    dependency: "direct main"
    description:
@@ -745,10 +753,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
@@ -769,10 +777,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  synchronized:
    dependency: transitive
    description:
@@ -793,10 +801,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
  typed_data:
    dependency: transitive
    description:
@@ -913,10 +921,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
  web:
    dependency: transitive
    description:
--- a/frontend/pubspec.yaml
+++ b/frontend/pubspec.yaml
@@ -51,6 +51,7 @@ dependencies:
  flutter_launcher_icons: ^0.13.1
  permission_handler: ^11.3.1
  geolocator: ^13.0.1
+  fuzzywuzzy: ^1.2.0

 dev_dependencies:
  flutter_test:
--- a/frontend/test/widget_test.dart
+++ b/frontend/test/widget_test.dart
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-// import 'package:anyway/main.dart';
-import 'package:anyway/layout.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(BasePage(mainScreen: "map",));
-
-    // Verfiy that the title is displayed
-    expect(find.text('City Nav'), findsOneWidget);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}
--- a/report.html
+++ b/report.html
Author	SHA1	Message	Date
Helldragon67	dd277287af	basis for paypal transactions Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m48s Details Run linting on the backend code / Build (pull_request) Failing after 29s Details Run testing on the backend code / Build (pull_request) Failing after 50s Details Build and release debug APK / Build APK (pull_request) Failing after 3m50s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 27s Details	2025-02-17 11:54:03 +01:00
Helldragon67	f258df8e72	better endpoints Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 2m15s Details Run linting on the backend code / Build (pull_request) Successful in 27s Details Run testing on the backend code / Build (pull_request) Failing after 48s Details Build and release debug APK / Build APK (pull_request) Failing after 4m38s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 25s Details	2025-02-17 10:27:02 +01:00
Helldragon67	fd091a9ccc	fixed print Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m49s Details Run linting on the backend code / Build (pull_request) Successful in 30s Details Run testing on the backend code / Build (pull_request) Failing after 50s Details Build and release debug APK / Build APK (pull_request) Failing after 3m27s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 25s Details	2025-02-14 17:19:27 +01:00
Helldragon67	f81c28f2ac	user creation and deletetion endpoint Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m49s Details Run linting on the backend code / Build (pull_request) Successful in 46s Details Run testing on the backend code / Build (pull_request) Failing after 48s Details Build and release debug APK / Build APK (pull_request) Failing after 3m35s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 26s Details	2025-02-14 16:47:37 +01:00
Helldragon67	361b2b1f42	full passed tests Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 2m12s Details Run linting on the backend code / Build (pull_request) Successful in 28s Details Run testing on the backend code / Build (pull_request) Failing after 50s Details Build and release debug APK / Build APK (pull_request) Failing after 3m46s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 25s Details	2025-02-14 10:44:09 +01:00
Helldragon67	16918369d7	corrected supabase api communication Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 2m26s Details Run linting on the backend code / Build (pull_request) Successful in 27s Details Run testing on the backend code / Build (pull_request) Failing after 49s Details Build and release debug APK / Build APK (pull_request) Failing after 3m22s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 25s Details	2025-02-14 10:33:57 +01:00
Helldragon67	2c49480966	supabase implementation Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m42s Details Run linting on the backend code / Build (pull_request) Successful in 27s Details Run testing on the backend code / Build (pull_request) Failing after 50s Details Build and release debug APK / Build APK (pull_request) Failing after 3m6s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 24s Details	2025-02-12 21:36:15 +01:00
Helldragon67	3a9ef4e7d3	starting to implement paywall logic Some checks failed Run testing on the backend code / Build (pull_request) Has been cancelled Details Build and deploy the backend to staging / Deploy to staging (pull_request) Has been cancelled Details Build and deploy the backend to staging / Build and push image (pull_request) Has been cancelled Details Run linting on the backend code / Build (pull_request) Has been cancelled Details	2025-02-11 17:19:03 +01:00
Helldragon67	c15e257dea	add trip time update Some checks failed Build and deploy the backend to staging / Deploy to staging (pull_request) Has been cancelled Details Build and deploy the backend to staging / Build and push image (pull_request) Has been cancelled Details Run testing on the backend code / Build (pull_request) Has been cancelled Details Run linting on the backend code / Build (pull_request) Successful in 27s Details	2025-02-11 15:42:14 +01:00
kscheidecker	5a698dd02c	Merge pull request 'Adding licenses' (#58 ) from licenses into main Reviewed-on: #58	2025-02-11 08:36:16 +00:00
kscheidecker	7e4a4b3dc7	added general license	2025-02-11 08:25:02 +00:00
kscheidecker	84e5902436	Merge pull request 'fixed cluster names' (#57 ) from backend/fix/missing-cluster-names into main Some checks failed Build and deploy the backend to production / Build and push image (push) Successful in 2m9s Details / push-to-remote (push) Failing after 41s Details Build and deploy the backend to production / Deploy to production (push) Successful in 23s Details Reviewed-on: #57	2025-02-11 06:50:11 +00:00
Helldragon67	81330e5eb3	fixed cluster names Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m54s Details Run linting on the backend code / Build (pull_request) Successful in 27s Details Run testing on the backend code / Build (pull_request) Failing after 4m19s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 24s Details	2025-02-11 07:34:50 +01:00
kscheidecker	9002483036	Merge pull request 'Removes the rounding from the trip details' (#56 ) from frontend/no-more-rounding into main Reviewed-on: #56	2025-02-07 18:09:31 +00:00
Helldragon67	0271c3d7a7	removed rounding but app won't compile Some checks failed Build and release debug APK / Build APK (pull_request) Failing after 3m37s Details	2025-02-07 15:14:21 +01:00
Helldragon67	4fd1272ea4	test Some checks failed Build and release debug APK / Build APK (pull_request) Failing after 3m7s Details	2025-02-07 15:08:00 +01:00
Helldragon67	6bedd04a57	removed rounding Some checks failed Build and release debug APK / Build APK (pull_request) Failing after 4m10s Details	2025-02-07 14:44:18 +01:00
Remy Moll	d31ca9f81f	Merge pull request 'Frontend UX improvements' (#37 ) from feature/frontend/image-loading into main Reviewed-on: #37	2025-02-05 12:55:24 +00:00
Remy Moll	f6e396e54b	undo add test.py Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Has been cancelled Details Build and deploy the backend to staging / Deploy to staging (pull_request) Has been cancelled Details Build and release debug APK / Build APK (pull_request) Has been cancelled Details	2025-02-05 13:53:10 +01:00
Remy Moll	d4de945df8	cleaner trip loading indicator Some checks failed Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m57s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 26s Details Build and release debug APK / Build APK (pull_request) Has been cancelled Details	2025-02-05 13:50:38 +01:00
Remy Moll	d992b62533	tentatively shrink trip overview, nicer onboarding	2024-12-17 11:17:59 +01:00
Remy Moll	e78bee4597	some more images	2024-12-17 10:28:33 +01:00
Remy Moll	d186a51a87	WIP: ladnmark card adjustments	2024-12-15 16:30:17 +01:00
Remy Moll	4baf045c8c	better onboarding All checks were successful Build and deploy the backend to staging / Build and push image (pull_request) Successful in 2m1s Details Build and release debug APK / Build APK (pull_request) Successful in 10m54s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 14s Details	2024-12-02 10:43:42 +01:00
Remy Moll	3f1fe463bf	better help and onboarding All checks were successful Build and deploy the backend to staging / Build and push image (pull_request) Successful in 1m40s Details Build and release debug APK / Build APK (pull_request) Successful in 7m23s Details Build and deploy the backend to staging / Deploy to staging (pull_request) Successful in 14s Details	2024-11-18 17:42:52 +01:00
Remy Moll	d58ef2562d	image querying from within the frontend All checks were successful Build and release debug APK / Build APK (pull_request) Successful in 7m40s Details	2024-11-06 14:45:43 +01:00