Merge branch 'staging' into 'main'

more cleanup See merge request !4

Merge branch 'staging' into 'main'
476c16b3 · hanfi · 153fd1a7 · f64d64a4 · 476c16b3 · 153fd1a7
Commit 476c16b3 authored 1 year ago by hanfi
--- a/README.md
+++ b/README.md
+# Chaos Parcel Service: Customer frontend
+
+This is the customer facing part of the Chaos Parcel Service.
+
+This will be the main point to adjust for your Event.
+
+You need a working npm installation to build the frontend from src
+
+## Customizing
+*As the software is still in heavy development, you most likely will encounter bugs we want to fix.  
+Use your own branch to ease the merging of bugfixes from main.  
+We like patches
+
+### building
+The files are all delivered from the "dist" folder. You can always delete all files inside and run
+```
+npm run build
+```
+to reset your files.
+
+### Assets
+- src/static/favicon.png
+  The sites favicon
+- src/static/logo.png
+  The logo used in the qr codes
+- src/static/facility.svg
+  The image display on the index/welcome page
+
+- src/static/fonts
+  src/scss/index.scss
+  Adjust these to your events font.
+
+### html
+- src/views/index.html  
+  Your main page.  
+  Go wild here. The only required item is the button to generate a new delivery
+- src/views/edit.html  
+  The Sticker page.  
+  Be carefull when editing these.  
+  The text part are in the components subfolder.  
+  We very much like patches here.
--- a/dist/Fisty-sprayed-Stencil_Neonpink_logo.png
+++ b/dist/Fisty-sprayed-Stencil_Neonpink_logo.png
--- a/dist/PostOffice_BGP-simple_Black.png
+++ b/dist/PostOffice_BGP-simple_Black.png
--- a/dist/bootstrap.bundle.min.js
+++ b/dist/bootstrap.bundle.min.js
--- a/dist/bordered.html
+++ b/dist/bordered.html
-<fieldset id="{{ id }}"> <legend><label>{{ label }}</label></legend> <label class="content"></label> </fieldset>
\ No newline at end of file
--- a/dist/edit.html
+++ b/dist/edit.html
-<!DOCTYPE html><html lang="de"><head><title>Paketshop</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon" href="Favicon_BGP.png" type="image/png"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <h1><span>Tracking Code: </span><span><strong id="title"></strong></span><span id="amount" class="badge badge-secondary float-right">#0</span></h1> <div id="editor" class="border border-secondary d-print-none rounded row"> <div class="col-lg-6"> <div class="form-group"> <label for="addressee">Addressee</label> <input class="form-control" type="text" name="addressee" id="addressee" aria-describedby="helpAddressee" onchange="return lib.updateItem(this,document.location.search.substring(1)),!1"> <small id="helpAddressee" class="form-text text-muted">The person to receive this Package</small> </div> </div> <div class="col-lg-6"> <div class="form-group"> <label for="team">Team</label> <input class="form-control" type="text" name="team" id="team" aria-describedby="helpTeam" onchange="return lib.updateItem(this,document.location.search.substring(1)),!1"> <small id="helpTeam" class="form-text text-muted">Only relevant for Orga people</small> </div> </div> </div> <div id="edit" class="border border-danger rounded row"> <div class="col-lg-5"> <div class="d-flex justify-content-center"><canvas class="qrcode"></canvas></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-danger">Do not share this with anyone!</li> <li>This Link allows you to check if your Item has arrived at the camp</li> <li>This Link allows you to update your Items Data</li> <li>Print this page or bookmark it to access it later! Once it's gone, it's gone</li> </ul> </div> </div> <div id="receive" class="border border-warning rounded row"> <div class="col-lg-5"> <div class="d-flex justify-content-center"><canvas class="qrcode"></canvas></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-warning">Do not share this with anyone except the handout Angel at the camp!!</li> <li>This code is required to get your Item at the camp</li> <li>Please check if your item has arrived before pickup</li> <li>If you loose this code, you need to convice us you are the rightfull owner</li> <li>You should add your nick or real name in the addressee field at the top to prove ownership</li> </ul> </div> </div> <div id="sticker" class="border border-success rounded row"> <div class="col-lg-5"> <canvas class="float-left qrcode"></canvas> <div class="address pt-3"></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-success">Put this sticker on your Item</li> <li>Use the Address on Delivery Services too</li> <li>Use the Address in online shops as delivery Address.</li> <li>We <strong>urge</strong> you to set a Addressee in the form at the top</li> <li>The 6-char hex-code is your items tracking code. Add it to your online shipping in the adress field.</li> <li>Please do not send stuff to the camp to arrive before the <strong>10th</strong> or after the <strong>24th</strong> of August.</li> </ul> </div> </div> </div> <hr> <div class="text-center"> <small> <a href="https://legal.cccv.de/">Impressum und Datenschutzerklärung</a> | <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcels">FAQ</a> | <a href="mailto:camp2023-pakete@cccv.de">Support</a> </small> </div>  <script src="./bundle.js"></script> <img style="display: None" src="logo.png" id="logo"> <script>window.onload=function(){lib.showData(document.location.hash.substring(1),document.location.search.substring(1))};</script> </body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="de"><head><title>Paketshop</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon" href="favicon.png" type="image/png"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <h1><span>Tracking Code: </span><span><strong id="title"></strong></span><span id="amount" class="badge badge-secondary float-right">#0</span></h1> <div id="editor" class="border border-secondary d-print-none rounded row"> <div class="col-lg-6"> <div class="form-group"> <label for="addressee">Addressee</label> <input class="form-control" type="text" name="addressee" id="addressee" aria-describedby="helpAddressee" onchange="return lib.updateItem(this,document.location.search.substring(1)),!1"> <small id="helpAddressee" class="form-text text-muted">The person to receive this Package</small> </div> </div> <div class="col-lg-6"> <div class="form-group"> <label for="team">Team</label> <input class="form-control" type="text" name="team" id="team" aria-describedby="helpTeam" onchange="return lib.updateItem(this,document.location.search.substring(1)),!1"> <small id="helpTeam" class="form-text text-muted">Only relevant for Orga people</small> </div> </div> </div> <div id="edit" class="border border-danger rounded row"> <div class="col-lg-5"> <div class="d-flex justify-content-center"><canvas class="qrcode"></canvas></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-danger">Do not share this with anyone!</li> <li>This Link allows you to check if your Item has arrived at the camp</li> <li>This Link allows you to update your Items Data</li> <li>Print this page or bookmark it to access it later! Once it's gone, it's gone</li> </ul> </div> </div> <div id="receive" class="border border-warning rounded row"> <div class="col-lg-5"> <div class="d-flex justify-content-center"><canvas class="qrcode"></canvas></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-warning">Do not share this with anyone except the handout Angel at the camp!!</li> <li>This code is required to get your Item at the camp</li> <li>Please check if your item has arrived before pickup</li> <li>If you loose this code, you need to convice us you are the rightfull owner</li> <li>You should add your nick or real name in the addressee field at the top to prove ownership</li> </ul> </div> </div> <div id="sticker" class="border border-success rounded row"> <div class="col-lg-5"> <canvas class="float-left qrcode"></canvas> <div class="address pt-3"></div> </div> <div class="col pt-3"> <ul> <li class="font-weight-bold text-success">Put this sticker on your Item</li> <li>Use the Address on Delivery Services too</li> <li>Use the Address in online shops as delivery Address.</li> <li>We <strong>urge</strong> you to set a Addressee in the form at the top</li> <li>The 6-char hex-code is your items tracking code. Add it to your online shipping in the adress field.</li> <li>Please do not send stuff to the camp to arrive before the <strong>10th</strong> or after the <strong>24th</strong> of August.</li> </ul> </div> </div> </div> <hr> <div class="text-center"> <small> <a href="https://legal.cccv.de/">Impressum und Datenschutzerklärung</a> | <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcels">FAQ</a> | <a href="mailto:camp2023-pakete@cccv.de">Support</a> </small> </div>  <script src="./bundle.js"></script> <img style="display: None" src="logo.png" id="logo"> <script>window.onload=function(){lib.showData(document.location.hash.substring(1),document.location.search.substring(1))};</script> </body></html>
\ No newline at end of file
--- a/dist/PostOffice_BGP_PinkGreen.svg
+++ b/dist/PostOffice_BGP_PinkGreen.svg
--- a/dist/Favicon_BGP.png
+++ b/dist/Favicon_BGP.png
--- a/dist/fonts/SairaStencilOne-Regular.ttf
+++ b/dist/fonts/SairaStencilOne-Regular.ttf
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html lang="de"><head><title>Paketshop</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon" href="Favicon_BGP.png" type="image/png"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <div class="row"> <div class="col text-center"> <h1>Border Gateway for Parcels</h1> <p>Handling your Parcels since Camp2023</p> <img src="PostOffice_BGP_PinkGreen.svg" width="300px"> </div> </div> <hr> <div class="row"> <ul> <li>See <a href="https://events.ccc.de/camp/2023/infos/parcel.html">Getting your Stuff there</a> for a general overview on how to ship things to and from the Camp2023</li> <li>See <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcel-delivery-to-and-from-the-camp">The FAQ</a> for answers to frequently asked questions</li> <li>You should generate a shipping sticker <strong>before</strong> sending items to the camp. This will make our life easier and therefore yours too</li> <li>If your ready to send or order things to the camp, click the "generate" button below</li> <li>Please do not send stuff to the camp to arrive before the <strong>10th</strong> or after the <strong>24th</strong> of August. </li></ul> </div> <div class="d-flex justify-content-center"><button type="button" class="btn btn-primary" onclick="lib.newItem()">Generate Sticker</button></div> <hr> <div class="text-center"> <small> <a href="https://legal.cccv.de/">Impressum und Datenschutzerklärung</a> | <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcels">FAQ</a> | <a href="mailto:camp2023-pakete@cccv.de">Support</a> </small> </div>  <script src="./bundle.js"></script> </div> </body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="de"><head><title>Paketshop</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon" href="favicon.png" type="image/png"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <div class="row"> <div class="col text-center"> <h1>Border Gateway for Parcels</h1> <p>Handling your Parcels since Camp2023</p> <img src="facility.svg" width="300px"> </div> </div> <hr> <div class="row"> <ul> <li>See <a href="https://events.ccc.de/camp/2023/infos/parcel.html">Getting your Stuff there</a> for a general overview on how to ship things to and from the Camp2023</li> <li>See <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcel-delivery-to-and-from-the-camp">The FAQ</a> for answers to frequently asked questions</li> <li>You should generate a shipping sticker <strong>before</strong> sending items to the camp. This will make our life easier and therefore yours too</li> <li>If your ready to send or order things to the camp, click the "generate" button below</li> <li>Please do not send stuff to the camp to arrive before the <strong>10th</strong> or after the <strong>24th</strong> of August. </li></ul> </div> <div class="d-flex justify-content-center"><button type="button" class="btn btn-primary" onclick="lib.newItem()">Generate Sticker</button></div> <hr> <div class="text-center"> <small> <a href="https://legal.cccv.de/">Impressum und Datenschutzerklärung</a> | <a href="https://events.ccc.de/camp/2023/infos/faq.html#parcels">FAQ</a> | <a href="mailto:camp2023-pakete@cccv.de">Support</a> </small> </div>  <script src="./bundle.js"></script> </div> </body></html>
\ No newline at end of file
--- a/src/static/Fisty-sprayed-Stencil_Neonpink_logo.png
+++ b/src/static/Fisty-sprayed-Stencil_Neonpink_logo.png
--- a/src/static/PostOffice_BGP-simple_Black.png
+++ b/src/static/PostOffice_BGP-simple_Black.png
--- a/src/static/bootstrap.bundle.min.js
+++ b/src/static/bootstrap.bundle.min.js
--- a/src/static/config.json
+++ b/src/static/config.json
 {
-  "backend_url": "http://localhost:8000",
-  "qr_logo": "PostOffice_BGP-simple_Black.png"
+  "backend_url": "http://localhost:8000"
 }
--- a/src/static/PostOffice_BGP_PinkGreen.svg
+++ b/src/static/PostOffice_BGP_PinkGreen.svg
--- a/src/static/Favicon_BGP.png
+++ b/src/static/Favicon_BGP.png
--- a/src/static/fonts/SairaStencilOne-Regular.ttf
+++ b/src/static/fonts/SairaStencilOne-Regular.ttf
--- a/src/views/components/head.html
+++ b/src/views/components/head.html
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="Favicon_BGP.png" type="image/png">
+<link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="/bootstrap.min.css">
 <link rel="stylesheet" type="text/css" href="/bootstrap-icons.css">
 <link rel="stylesheet" type="text/css" href="/index.css">

--- a/src/views/index.html
+++ b/src/views/index.html
@@ -11,7 +11,7 @@
        <div class="col text-center">
          <h1>Border Gateway for Parcels</h1>
          <p>Handling your Parcels since Camp2023</p>
-          <img src="PostOffice_BGP_PinkGreen.svg" width="300px">
+          <img src="facility.svg" width="300px">
        </div>
      </div>
      <hr/>