diff --git a/pass/public/fonts/liberation-sans/LiberationSans-Bold.ttf b/pass/public/fonts/liberation-sans/LiberationSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4581ebf3ee005eb2857f65af52efbe6ab186ac33
Binary files /dev/null and b/pass/public/fonts/liberation-sans/LiberationSans-Bold.ttf differ
diff --git a/pass/public/fonts/liberation-sans/LiberationSans-BoldItalic.ttf b/pass/public/fonts/liberation-sans/LiberationSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..bfbcd26b5593b23de315277a735638b1bd0be1c0
Binary files /dev/null and b/pass/public/fonts/liberation-sans/LiberationSans-BoldItalic.ttf differ
diff --git a/pass/public/fonts/liberation-sans/LiberationSans-Italic.ttf b/pass/public/fonts/liberation-sans/LiberationSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..fcdab8850b2af3104dee91e45d389744b995eaa3
Binary files /dev/null and b/pass/public/fonts/liberation-sans/LiberationSans-Italic.ttf differ
diff --git a/pass/public/fonts/liberation-sans/LiberationSans-Regular.ttf b/pass/public/fonts/liberation-sans/LiberationSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..626dd9364f12c6036ec8eae38c4fc73735b9ed23
Binary files /dev/null and b/pass/public/fonts/liberation-sans/LiberationSans-Regular.ttf differ
diff --git a/pass/public/fonts/liberation-sans/SIL Open Font License.txt b/pass/public/fonts/liberation-sans/SIL Open Font License.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f2473f9cce31f403f67588f01c7d70a1127db927
--- /dev/null
+++ b/pass/public/fonts/liberation-sans/SIL Open Font License.txt
@@ -0,0 +1,46 @@
+Digitized data copyright (c) 2010 Google Corporation
+ with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+ with Reserved Font Name Liberation.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/pass/public/images/metager-schloss-orange.svg b/pass/public/images/metager-schloss-orange.svg
new file mode 100644
index 0000000000000000000000000000000000000000..626e94ca3dac409c599473957eea69bee6d34733
--- /dev/null
+++ b/pass/public/images/metager-schloss-orange.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="99.168" height="106.51" version="1.1" viewBox="0 0 99.167999 106.51305" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g transform="matrix(1.3333 0 0 -1.3333 -373.81 107.43)"><g transform="scale(.1)"><path d="m2828 805.72v-230.32h69.31c27.25 0 40.87 14.426 40.87 42.879v78.789h345.86c101.01 0 151.51-53.668 151.51-157.63v-85.7h-497.37l0.01-52.015c0-28.313-13.75-42.871-40.87-42.871h-93.81v-140.79c0-140.79 70.4-211.19 212.72-211.19h281.59c165.27 0 249.45 85.699 249.45 255.57v287.7c0 169.87-84.18 255.57-249.45 255.57zm289.79-446.87h74.76c50.36 0 69.52-25.856 69.52-74.098v-112.79c0-38.305-19.21-58.168-56.76-58.168h-38.57c-32.53 0-48.95 19.25-48.95 57.465v187.59" fill="#f47216"/></g></g><script xmlns=""/></svg>
\ No newline at end of file
diff --git a/pass/public/styles/base.css b/pass/public/styles/base.css
index 19ddb3254988e1963acd8eca3b3c6487d2cb1bbd..4aa7a9cb3c49be36ca69563531a49102781fd0f0 100644
--- a/pass/public/styles/base.css
+++ b/pass/public/styles/base.css
@@ -1 +1 @@
-html{font-family:Liberation Sans}.hidden{display:none}
\ No newline at end of file
+@font-face{font-family:"LiberationSans";src:local("Liberation Sans"),url("/fonts/liberation-sans/LiberationSans-Regular.ttf");font-weight:normal;font-style:normal}@font-face{font-family:"LiberationSans";src:local("Liberation Sans"),url("/fonts/liberation-sans/LiberationSans-Bold.ttf");font-weight:bold;font-style:normal}@font-face{font-family:"LiberationSans";src:local("Liberation Sans"),url("/fonts/liberation-sans/LiberationSans-Italic.ttf");font-weight:normal;font-style:italic}@font-face{font-family:"LiberationSans";src:local("Liberation Sans"),url("/fonts/liberation-sans/LiberationSans-BoldItalic.ttf");font-weight:bold;font-style:italic}html{font-family:Liberation Sans}html body{margin:0;padding:0}.hidden{display:none}button{cursor:pointer}nav{background-color:#ff7f00;color:white;display:flex;align-items:center;gap:2rem}nav #page-logo a{display:flex;align-items:center;gap:.5rem;text-decoration:none;color:inherit}nav #page-logo a>img{width:2.5rem;filter:brightness(0) invert(1)}nav ul{list-style-type:none;margin:0;padding:0;display:flex;flex-grow:1}nav ul li.whitespace{flex-grow:1}nav ul li>a{text-decoration:none;color:inherit;white-space:nowrap;padding:1rem;font-weight:bold}nav ul li>a:hover{background-color:#ff8c1a}
\ No newline at end of file
diff --git a/pass/public/styles/base.less b/pass/public/styles/base.less
index e00c1b2922e70065cef4a3763b169235a8c42d0a..1270bebbea67955e75f6e8a3a3e9f404d0be2440 100644
--- a/pass/public/styles/base.less
+++ b/pass/public/styles/base.less
@@ -1,7 +1,96 @@
+@import "./misc/vars.less";
+
+@font-face {
+ font-family: "LiberationSans";
+ src: local("Liberation Sans"),
+ url("/fonts/liberation-sans/LiberationSans-Regular.ttf");
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "LiberationSans";
+ src: local("Liberation Sans"),
+ url("/fonts/liberation-sans/LiberationSans-Bold.ttf");
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "LiberationSans";
+ src: local("Liberation Sans"),
+ url("/fonts/liberation-sans/LiberationSans-Italic.ttf");
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: "LiberationSans";
+ src: local("Liberation Sans"),
+ url("/fonts/liberation-sans/LiberationSans-BoldItalic.ttf");
+ font-weight: bold;
+ font-style: italic;
+}
+
html {
font-family: Liberation Sans;
+
+ body {
+ margin: 0;
+ padding: 0;
+ }
}
.hidden {
display: none;
-}
\ No newline at end of file
+}
+
+button {
+ cursor: pointer;
+}
+
+nav {
+ background-color: @color-main;
+ color: @color-main-font-color;
+ display: flex;
+ align-items: center;
+ gap: 2rem;
+ padding: 0 1rem;
+
+ #page-logo a {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ text-decoration: none;
+ color: inherit;
+
+ > img {
+ width: 2.5rem;
+ filter: brightness(0) invert(1);
+ }
+ }
+
+ ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ display: flex;
+ flex-grow: 1;
+
+ li {
+ &.whitespace {
+ flex-grow: 1;
+ }
+ > a {
+ text-decoration: none;
+ color: inherit;
+ white-space: nowrap;
+ padding: 1rem;
+ font-weight: bold;
+ &:hover {
+ background-color: @color-main-hover;
+ }
+ }
+ }
+ }
+}
diff --git a/pass/public/styles/misc/vars.less b/pass/public/styles/misc/vars.less
new file mode 100644
index 0000000000000000000000000000000000000000..06b5e9c47947f77a56871a557033c15829ddb16a
--- /dev/null
+++ b/pass/public/styles/misc/vars.less
@@ -0,0 +1,3 @@
+@color-main: rgb(255, 127, 0);
+@color-main-hover: lighten(@color-main, 5%);
+@color-main-font-color: white;
diff --git a/pass/routes/checkout/checkout.js b/pass/routes/checkout/checkout.js
index d224d2ddfc2737301fc022295769ccde42001785..8dfb3b77f4b6d5a70a575d9cac657551786d2068 100644
--- a/pass/routes/checkout/checkout.js
+++ b/pass/routes/checkout/checkout.js
@@ -11,7 +11,7 @@ const { query, body, validationResult } = require("express-validator");
router.get(
"/",
query("amount")
- .isInt({ min: 0, max: 12 })
+ .isInt({ min: -1, max: 12 })
.withMessage("Amount needs to be between 0 and 4.")
.toInt(),
async function (req, res, next) {
@@ -44,7 +44,10 @@ router.get(
let crypto = new Crypto();
let order_date = dayjs();
- let expiration_date = order_date.add(Order.PURCHASE_STORAGE_TIME_MONTHS, "month");
+ let expiration_date = order_date.add(
+ Order.PURCHASE_STORAGE_TIME_MONTHS,
+ "month"
+ );
let private_key = await crypto.private_key_get(order_date, expiration_date);
params.crypto = {
N: private_key.keyPair.n,
diff --git a/pass/views/index.ejs b/pass/views/index.ejs
index fcd1438d4af3de1693a58d1054607211b309abfd..ec9df6a9f12fdcf00c5ec7f5081922ae5fbd8164 100644
--- a/pass/views/index.ejs
+++ b/pass/views/index.ejs
@@ -17,6 +17,14 @@
<button type="submit" class="select">- €</button>
</form>
</div>
+ <div id="continue">
+ <form action="/checkout" method="get">
+ <input type="hidden" name="amount" value="-1">
+ <button type="submit">
+ Einkauf fortsetzen / MetaGer-Pass Coupon einlösen
+ </button>
+ </form>
+ </div>
<div id="info-container">
<h1>MetaGer Pass</h1>
<div id="first">
diff --git a/pass/views/templates/page_header.ejs b/pass/views/templates/page_header.ejs
index 06e1a9b77af4dcf88835c6fba1a01ab78882a066..cdefd1ce1806ae600a683f19700f9f645cdce8b8 100644
--- a/pass/views/templates/page_header.ejs
+++ b/pass/views/templates/page_header.ejs
@@ -14,4 +14,20 @@
<%_ }) _%>
<%_ } _%>
</head>
-<body>
\ No newline at end of file
+<body>
+ <nav>
+ <div id="page-logo">
+ <a href="#">
+ <img src="/images/metager-schloss-orange.svg" alt="MetaGer Schloss">
+ <h1>Pass</h1>
+ </a>
+ </div>
+ <ul>
+ <li><a href="#">Informationen</a></li>
+ <li><a href="#">Preise</a></li>
+ <li><a href="#">Hilfe</a></li>
+ <li class="whitespace"></li>
+ <li><a href="#">Schlüssel verwalten</a></li>
+ <li><a href="#">Starten</a></li>
+ </ul>
+ </nav>
\ No newline at end of file