diff --git a/mysite/dpp/static/css/landing.css b/mysite/dpp/static/css/landing.css new file mode 100644 index 0000000..7d67f26 --- /dev/null +++ b/mysite/dpp/static/css/landing.css @@ -0,0 +1,125 @@ +/* Landing page, in the style of lasers4maas.eu */ +:root { + --l4m-cyan: #31B9CF; + --l4m-indigo: #2E3585; + --l4m-pale: #DAF6F7; + --l4m-navy: #162043; + --l4m-ink: #1F2437; + --l4m-muted: #4A4F63; + --l4m-line: #E3E7EF; + --l4m-tint: #F5F7FB; + --font-display: Outfit, "Helvetica Neue", Arial, sans-serif; + --font-body: Roboto, "Helvetica Neue", Arial, sans-serif; +} + +* { box-sizing: border-box; } +body.landing { margin: 0; font-family: var(--font-body); color: var(--l4m-ink); background: #fff; line-height: 1.55; } +.landing a { color: var(--l4m-indigo); } +.landing a:hover { color: var(--l4m-navy); } +.landing h1, .landing h2, .landing h3 { font-family: var(--font-display); margin: 0; } + +.container { max-width: 1200px; margin: 0 auto; padding-left: 24px; padding-right: 24px; } +.section { padding-top: 88px; padding-bottom: 88px; } +.section--white { background: #fff; } +.section--pale { background: var(--l4m-pale); } +.section--tint { background: var(--l4m-tint); } + +.section-title { font-weight: 700; font-size: 38px; line-height: 1.15; color: var(--l4m-indigo); text-transform: uppercase; } +.bar { width: 64px; height: 6px; background: var(--l4m-cyan); margin: 24px 0 16px; } +.bar--wide-gap { margin-bottom: 40px; } +.lead { margin: 0 0 40px; font-size: 19px; max-width: 760px; } + +/* Buttons */ +.btn { display: inline-flex; align-items: center; min-height: 44px; padding: 12px 26px; border-radius: 6px; + font-family: var(--font-display); font-weight: 600; font-size: 19px; text-decoration: none; border: 2px solid transparent; } +.landing .btn-primary { background: var(--l4m-cyan); color: var(--l4m-indigo); } +.landing .btn-primary:hover { background: #5cc9db; color: var(--l4m-indigo); } +.landing .btn-outline-light { color: #fff; border-color: var(--l4m-pale); } +.landing .btn-outline-light:hover { background: rgba(255, 255, 255, 0.1); color: #fff; } +.landing .btn-dark { background: var(--l4m-indigo); color: #fff; } +.landing .btn-dark:hover { background: var(--l4m-navy); color: #fff; } +.landing .btn-outline-dark { color: var(--l4m-indigo); border-color: var(--l4m-indigo); } +.btn-row { display: flex; flex-wrap: wrap; gap: 16px; } + +/* Header */ +.site-header { background: #fff; border-bottom: 1px solid var(--l4m-line); } +.site-header .container { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 16px; padding-top: 16px; padding-bottom: 16px; } +.brand { display: flex; align-items: center; gap: 16px; text-decoration: none; } +.brand img { height: 48px; width: auto; display: block; } +.brand span { font-family: var(--font-display); font-weight: 600; font-size: 18px; line-height: 1.2; color: var(--l4m-indigo); border-left: 2px solid var(--l4m-cyan); padding-left: 16px; } +.main-nav { display: flex; flex-wrap: wrap; align-items: center; gap: 8px 28px; font-family: var(--font-display); font-weight: 600; font-size: 17px; } +.landing .main-nav a:not(.btn) { color: var(--l4m-navy); text-decoration: none; } +.landing .main-nav a:not(.btn):hover { color: var(--l4m-indigo); text-decoration: underline; } +.main-nav .btn { font-size: 17px; padding: 10px 22px; } + +/* Hero */ +.hero { background: var(--l4m-indigo); color: #fff; } +.hero .container { display: flex; flex-wrap: wrap; gap: 56px; align-items: center; padding-top: 96px; padding-bottom: 96px; } +.hero-text { flex: 1 1 520px; min-width: 0; } +.eyebrow { margin: 0 0 16px; font-family: var(--font-display); font-weight: 600; font-size: 15px; letter-spacing: 0.12em; text-transform: uppercase; color: var(--l4m-pale); } +.hero h1 { font-weight: 700; font-size: 60px; line-height: 1.05; text-transform: uppercase; } +.hero .bar { margin: 28px 0; } +.hero-lead { margin: 0 0 40px; font-family: var(--font-display); font-weight: 500; font-size: 26px; line-height: 1.35; } +.steps { flex: 1 1 380px; min-width: 0; display: flex; flex-direction: column; gap: 12px; margin: 0; padding: 0; list-style: none; } +.step { background: #fff; color: var(--l4m-navy); border-radius: 10px; padding: 18px 22px; display: flex; gap: 16px; align-items: center; } +.step--accent { background: var(--l4m-cyan); } +.step-num { flex: none; width: 44px; height: 44px; border-radius: 50%; background: var(--l4m-pale); color: var(--l4m-indigo); + display: flex; align-items: center; justify-content: center; font-family: var(--font-display); font-weight: 700; font-size: 20px; } +.step--accent .step-num { background: #fff; } +.step-title { font-family: var(--font-display); font-weight: 600; font-size: 19px; } +.step-text { font-size: 15px; color: var(--l4m-muted); } +.step--accent .step-text { color: var(--l4m-navy); } + +/* Objective */ +.objective { display: flex; flex-wrap: wrap; gap: 48px; } +.objective-head { flex: 1 1 360px; min-width: 0; } +.objective-body { flex: 2 1 560px; min-width: 0; font-size: 19px; } +.objective-body p { margin: 0 0 20px; } +.objective-body p:last-child { margin-bottom: 0; } + +/* Cards and grids */ +.grid { display: grid; gap: 24px; } +.grid--3 { grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); } +.grid--2 { grid-template-columns: repeat(auto-fit, minmax(340px, 1fr)); } +.grid--kpi { grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 16px; } +.grid--4 { grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 32px; } +.card { background: #fff; border-radius: 12px; padding: 32px; } +.card h3 { margin: 20px 0 12px; font-weight: 600; font-size: 23px; color: var(--l4m-indigo); text-transform: uppercase; } +.card p { margin: 0; font-size: 17px; color: var(--l4m-muted); } +.role { border: 2px solid var(--l4m-pale); border-radius: 12px; padding: 32px; display: flex; flex-direction: column; gap: 16px; } +.role .eyebrow { color: var(--l4m-muted); font-size: 14px; margin: 0; } +.role h3 { font-weight: 700; font-size: 28px; color: var(--l4m-indigo); } +.role-question { margin: 0; font-family: var(--font-display); font-weight: 500; font-size: 21px; color: var(--l4m-navy); } +.role ul { margin: 0; padding-left: 20px; font-size: 17px; color: var(--l4m-muted); display: flex; flex-direction: column; gap: 8px; } +.kpi { background: #fff; border-radius: 10px; padding: 24px; border-top: 6px solid var(--l4m-cyan); } +.kpi h3 { margin: 0 0 12px; font-weight: 600; font-size: 20px; color: var(--l4m-indigo); text-transform: uppercase; } +.kpi ul { margin: 0; padding: 0; list-style: none; font-size: 16px; color: var(--l4m-muted); } +.part h3 { margin: 0 0 8px; font-weight: 600; font-size: 20px; color: var(--l4m-navy); } +.part p { margin: 0; font-size: 16px; color: var(--l4m-muted); } + +/* Get started */ +.cta { display: flex; flex-wrap: wrap; gap: 32px; align-items: center; justify-content: space-between; } +.cta-text { flex: 1 1 480px; min-width: 0; } +.cta-text p { margin: 16px 0 0; font-size: 19px; } + +/* Footer */ +.site-footer { background: var(--l4m-navy); color: var(--l4m-pale); font-size: 14px; } +.site-footer .container { display: flex; flex-wrap: wrap; gap: 32px; justify-content: space-between; padding-top: 48px; padding-bottom: 48px; } +.footer-title { margin: 0 0 8px; font-family: var(--font-display); font-weight: 600; font-size: 17px; color: #fff; } +.site-footer p { margin: 0; } +.landing .site-footer a { color: #fff; } +.footer-main { flex: 1 1 520px; min-width: 0; } +.footer-side { flex: 0 1 320px; } + +/* Keyboard focus */ +.landing a:focus-visible { outline: 3px solid var(--l4m-cyan); outline-offset: 3px; } + +/* Small screens */ +@media (max-width: 640px) { + .section { padding-top: 56px; padding-bottom: 56px; } + .hero .container { padding-top: 56px; padding-bottom: 56px; } + .hero h1 { font-size: 40px; } + .hero-lead { font-size: 21px; } + .section-title { font-size: 30px; } + .grid--2, .grid--3 { grid-template-columns: 1fr; } +} diff --git a/mysite/dpp/tests/test_landing.py b/mysite/dpp/tests/test_landing.py new file mode 100644 index 0000000..081a2b4 --- /dev/null +++ b/mysite/dpp/tests/test_landing.py @@ -0,0 +1,34 @@ +"""Tests for the public landing page at /.""" +from django.contrib.auth.models import User +from django.test import TestCase +from django.urls import reverse + + +class LandingPageTests(TestCase): + def test_public_page_renders(self): + response = self.client.get(reverse("landing")) + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, "landing.html") + self.assertContains(response, "Sustainability and Cost Evaluator") + self.assertContains(response, "css/landing.css") + + def test_anonymous_user_sees_sign_in_and_request_access(self): + response = self.client.get(reverse("landing")) + login = reverse("login") + "?next=" + reverse("dpp:home") + self.assertContains(response, f'href="{login}"') + self.assertContains(response, f'href="{reverse("accounts:signup")}"') + self.assertNotContains(response, "Open the app") + + def test_logged_in_user_gets_link_to_the_app(self): + user = User.objects.create_user("alice", password="pw-alice-123") + self.client.force_login(user) + response = self.client.get(reverse("landing")) + self.assertContains(response, "Open the app") + self.assertContains(response, f'href="{reverse("dpp:home")}"') + self.assertNotContains(response, "Request access") + + def test_logout_returns_to_landing_page(self): + user = User.objects.create_user("bob", password="pw-bob-123") + self.client.force_login(user) + response = self.client.post(reverse("logout")) + self.assertRedirects(response, reverse("landing"), fetch_redirect_response=False) diff --git a/mysite/mysite/settings.py b/mysite/mysite/settings.py index 8180402..561f4b6 100644 --- a/mysite/mysite/settings.py +++ b/mysite/mysite/settings.py @@ -201,8 +201,8 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' # Redirect users to the homepage -LOGIN_REDIRECT_URL = "/dpp/welcome" -LOGOUT_REDIRECT_URL = "/dpp/welcome" +LOGIN_REDIRECT_URL = "/dpp/welcome/" +LOGOUT_REDIRECT_URL = "/" # REST API: login required unless a view explicitly allows otherwise. REST_FRAMEWORK = { diff --git a/mysite/mysite/urls.py b/mysite/mysite/urls.py index 4d9b6f8..d912acc 100644 --- a/mysite/mysite/urls.py +++ b/mysite/mysite/urls.py @@ -16,9 +16,11 @@ """ from django.contrib import admin from django.urls import path, include +from django.views.generic import TemplateView from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView urlpatterns = [ + path('', TemplateView.as_view(template_name="landing.html"), name='landing'), # Public landing page path('admin/', admin.site.urls), path('api/', include("api.urls")), # API endpoints for DPP models path('dpp/', include("dpp.urls")), # Frontend for DPP creation diff --git a/mysite/templates/landing.html b/mysite/templates/landing.html new file mode 100644 index 0000000..972ffc7 --- /dev/null +++ b/mysite/templates/landing.html @@ -0,0 +1,189 @@ +{% load static %} + + + + + Sustainability and Cost Evaluator | Lasers4MaaS + + + + + + + +{% if user.is_authenticated %}{% url 'dpp:home' as app_url %}{% else %}{% url 'login' as login_url %}{% url 'dpp:home' as home_url %}{% endif %} + + + +
+
+
+
+

Lasers4MaaS · Work package 14

+

Sustainability and Cost Evaluator

+ +

Choose the laser welding set-up that best fits your goals for cost, quality, productivity, sustainability and circularity, then publish its Digital Product Passport.

+
+ {% if user.is_authenticated %} + Start a decision session + {% else %} + Start a decision session + {% endif %} + See what it does +
+
+
    +
  1. Platform data in
    Welding experiments or stations, sent by the Lasers4MaaS platform
  2. +
  3. KPIs calculated
    Costs, energy and carbon footprint from life cycle data
  4. +
  5. Ranked by your priorities
    Set what matters most; see the ranking and how robust it is
  6. +
  7. Passport out
    A Digital Product Passport with link and QR code for the chosen set-up
  8. +
+
+
+ +
+
+
+

From product data to better decisions

+ +
+
+

Digital Product Passports are usually seen as a compliance task: manufacturers collect product data and hand it over. The Sustainability and Cost Evaluator (SCE) also puts that data to work for the manufacturer.

+

It adds a new step to the passport life cycle, use the DPP for decisions. Process developers and key account managers compare laser welding options on the same evidence that ends up in the passport.

+

The SCE is the sustainability and cost module of the Lasers4MaaS platform. It supports the move to customised, flexible and decentralised manufacturing as a service.

+
+
+
+ +
+
+

Three things the SCE does

+ +
+
+ +

KPI calculation

+

Calculates 13 key performance indicators for every option, including costs, energy use and carbon footprint. The values reach the platform through a dedicated KPI API.

+
+
+ +

Decision support

+

Combines the KPIs with your preferences to rank and score the options. It handles uncertain values and weights, groups of criteria and hard limits, and shows how robust each ranking is.

+
+
+ +

Product passport

+

Creates the Digital Product Passport for the chosen welding set-up, with a link and QR code. The supply chain's environmental impacts are calculated as part of it.

+
+
+
+
+ +
+
+

Built for two roles

+ +

The process developer decides which process is fit for purpose. The key account manager decides where and how it runs at scale.

+
+
+

Research and development

+

Process developer

+

“Which successful welding experiments should we recommend for industrial use?”

+
    +
  • Compare experiments that passed the platform's quality screening
  • +
  • Weigh weld quality against operating costs, energy use and process carbon footprint
  • +
  • Send the preferred experiments back to the platform
  • +
+
+
+

Industrial operations

+

Key account manager

+

“Which plant with a dynamic beam laser welding station should we prioritise?”

+
    +
  • Compare welding stations across plants, including pre- and post-processing
  • +
  • Include total production costs, product carbon footprint, scrap rate and productivity
  • +
  • Publish the passport for the chosen set-up
  • +
+
+
+
+
+ +
+
+

13 KPIs in five categories

+ +

The indicators were agreed with the industrial partners. Each role uses the subset that matches its decision.

+
+

Costs

  • Total production costs
  • Maintenance costs
+

Quality

  • Process automation level
  • Operator specialisation level
  • Process monitoring
+

Productivity

  • Production lead time
  • Production cycle time
  • Machine saturation
+

Sustainability

  • Process energy consumption
  • Product carbon footprint
  • Process carbon footprint
+

Circularity

  • Scrap rate
  • Recyclability
+
+
+
+ +
+
+

How it is built

+ +
+

Data collection, three ways

A spreadsheet for the lab, a web application for passport data, and APIs that connect the SCE to the Lasers4MaaS platform.

+

Interactive decision support

Multi-criteria analysis based on PROMETHEE, extended with stochastic weights (SMAA) and veto thresholds.

+

Passport creator

Turns the production line into passport data: composition, components, transport and environmental impacts.

+

Supply chain model

A parameterised life cycle assessment model of the supply chain, reporting climate change impact with the Environmental Footprint 3.1 method.

+
+
+
+ +
+
+
+

Get started

+

Sessions usually start from the Lasers4MaaS platform. Sign in to continue a session, review your production lines or publish a passport.

+
+
+ {% if user.is_authenticated %} + Open the app + {% else %} + Sign in + Request access + {% endif %} +
+
+
+
+ + + +