rename team field to comment

9d0c41b2 · hanfi · 85b62157 · 9d0c41b2 · 9d0c41b2 · 9d0c41b2
Verified Commit 9d0c41b2 authored 1 year ago by hanfi
--- a/dist/bundle.js
+++ b/dist/bundle.js
--- 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.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>
+<!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" placeholder="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="comment">Comment</label> <input class="form-control" type="text" name="comment" placeholder="Comment" aria-describedby="helpComment" onchange="return lib.updateItem(this,document.location.search.substring(1)),!1"> <small id="helpComment" class="form-text text-muted">Additional comment (your team/group/village for examplae)</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/src/js/main.js
+++ b/src/js/main.js
@@ -68,7 +68,8 @@ export async function showData(private_key, item_uuid) {
    document.querySelector("#title").textContent = delivery.tag;
    document.querySelector("#addressee").value = delivery.addressee;
-    document.querySelector("#team").value = delivery.team;
+    document.querySelector("#addressee").value = delivery.addressee;
+    document.querySelector('input[name="comment"]').value = delivery.comment;
    print_address(delivery.addressee, delivery.tag);
    generateQR(document.querySelector("#edit canvas"), editUrl(private_key, delivery.uuid), "Q");

--- a/src/views/components/editor.html
+++ b/src/views/components/editor.html
@@ -5,6 +5,7 @@
      <input class="form-control"
             type="text"
             name="addressee"
+             placeholder="Addressee"
             id="addressee"
             aria-describedby="helpAddressee"
             onchange="lib.updateItem(this, document.location.search.substring(1)); return false">
@@ -13,14 +14,14 @@
  </div>
  <div class="col-lg-6">
    <div class="form-group">
-      <label for="team">Team</label>
+      <label for="comment">Comment</label>
      <input class="form-control"
             type="text"
-             name="team"
+             name="comment"
-             id="team"
+             placeholder="Comment"
-             aria-describedby="helpTeam"
+             aria-describedby="helpComment"
             onchange="lib.updateItem(this, document.location.search.substring(1)); return false">
-      <small id="helpTeam" class="form-text text-muted">Only relevant for Orga people</small>
+      <small id="helpComment" class="form-text text-muted">Additional comment (your team/group/village for examplae)</small>
    </div>
  </div>
 </div>