From a697b5fd0c15e84f859e51246c1279c5232260b1 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Wed, 12 Jan 2022 12:32:53 -0700
Subject: [PATCH] Reorganize menus

---
 www/pages/home.html | 44 ++++++++++++++++++++----------------
 www/pages/send.html | 42 ++++++++++++++++++++++++++++++++++
 www/routes.js       | 55 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 107 insertions(+), 34 deletions(-)
 create mode 100644 www/pages/send.html

diff --git a/www/pages/home.html b/www/pages/home.html
index 473cc41..3b978d9 100644
--- a/www/pages/home.html
+++ b/www/pages/home.html
@@ -24,26 +24,12 @@
 
     <div class="page-content noselect">
         <div class="row justify-content-center margin-top">
-            <div class="col-100 medium-90 xlarge-75 margin-horizontal">
+            <div class="col-100 medium-90 xlarge-75">
                 <div class="row justify-content-center">
-                    <div class="col-100 small-50 large-33 no-margin-vertical">
-                        <div class="card hapticbtn pointercursor margin-bottom" onclick="router.navigate('/track');">
-                            <div class="card-content padding display-flex justify-content-center align-items-center">
-                                <h2 class="no-margin"><i class="fad fa-search"></i></h2>
-                                <span style="font-weight: 700; margin-left: 1em;">Track Package</span>
-                            </div>
-                        </div>
-                        <div class="card hapticbtn pointercursor" onclick="router.navigate('/rates');">
-                            <div class="card-content padding display-flex justify-content-center align-items-center">
-                                <h2 class="no-margin"><i class="fad fa-calculator"></i></h2>
-                                <span style="font-weight: 700; margin-left: 1em;">Shipping Rates</span>
-                            </div>
-                        </div>
-                    </div>
                     {{#if accountsetup}}{{else}}
-                    <div class="col-100 small-50 large-33 no-margin-vertical" id="finishaccountsetupnag">
+                    <div class="col-100 small-33 large-25 no-margin" id="finishaccountsetupnag">
                         <div class="card hapticbtn pointercursor" onclick="router.navigate('/account');">
-                            <div class="card-content text-align-center padding">
+                            <div class="card-content text-align-center padding-half">
                                 <h1 class="no-margin"><i class="fad fa-user-check"></i></h1>
                                 <br />
                                 <span style="font-weight: 700;">Finish Account Setup</span>
@@ -56,10 +42,30 @@
                         </div>
                     </div>
                     {{/if}}
+                    <div class="col-100 small-33 large-25 no-margin">
+                        <div class="row justify-content-center">
+                            <div class="col-50 small-100">
+                                <div class="card hapticbtn pointercursor margin-h-half" onclick="router.navigate('/track');">
+                                    <div class="card-content padding-half display-flex justify-content-center align-items-center">
+                                        <h2 class="no-margin"><i class="fad fa-search"></i></h2>
+                                        <span style="font-weight: 700; margin-left: 1em;">Track Package</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-50 small-100">
+                                <div class="card hapticbtn pointercursor margin-h-half" onclick="router.navigate('/rates');">
+                                    <div class="card-content padding-half display-flex justify-content-center align-items-center">
+                                        <h2 class="no-margin"><i class="fad fa-calculator"></i></h2>
+                                        <span style="font-weight: 700; margin-left: 1em;">Shipping Rates</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     {{#each pages}}
-                    <div class="col-100 small-50 large-33 no-margin-vertical">
+                    <div class="col-50 small-33 large-25 no-margin">
                         <div class="card hapticbtn pointercursor" onclick="router.navigate('{{href}}');">
-                            <div class="card-content text-align-center padding">
+                            <div class="card-content text-align-center padding-half">
                                 <h1 class="no-margin"><i class="{{icon}}"></i></h1>
                                 <br />
                                 <span style="font-weight: 700;">{{title}}</span>
diff --git a/www/pages/send.html b/www/pages/send.html
new file mode 100644
index 0000000..d8b6a63
--- /dev/null
+++ b/www/pages/send.html
@@ -0,0 +1,42 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<div class="page" data-name="send">
+
+    <div class="navbar">
+        <div class="navbar-bg"></div>
+        <div class="navbar-inner">
+            <div class="left">
+                <a class="link back hapticbtn" href="#">
+                    <i class="icon icon-back"></i>
+                    <span class="if-not-md">Back</span>
+                </a>
+            </div>
+            <div class="title">Send</div>
+        </div>
+    </div>
+
+    <div class="page-content noselect">
+        <div class="row justify-content-center margin-top">
+            <div class="col-100 medium-90 xlarge-75 margin-horizontal">
+                <div class="row justify-content-center">
+                    {{#each pages}}
+                    <div class="col-100 small-50 large-33 no-margin-vertical">
+                        <div class="card hapticbtn pointercursor" onclick="router.navigate('{{href}}');">
+                            <div class="card-content text-align-center padding">
+                                <h1 class="no-margin"><i class="{{icon}}"></i></h1>
+                                <br />
+                                <span style="font-weight: 700;">{{title}}</span>
+                                <br />
+                                <span>{{text}}</span>
+                            </div>
+                        </div>
+                    </div>
+                    {{/each}}
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/www/routes.js b/www/routes.js
index bf4fbc9..a86f75b 100644
--- a/www/routes.js
+++ b/www/routes.js
@@ -7,6 +7,7 @@
 var compiledPages = {};
 var pagesToCompile = [
     "home",
+    "send",
     "welcome",
     "appointment",
     "dropandsend",
@@ -63,34 +64,58 @@ var routes = [
                     escapehatch: escapehatch,
                     pages: [
                         {
-                            title: "Package Pickup",
-                            href: "/pickup",
+                            title: "Send a Package",
+                            href: "/send",
                             icon: "fad fa-boxes",
-                            text: "Leave your package somewhere and we'll pick it up and ship it for you. No postage or appointment needed."
+                            text: "Find a drop box or schedule a pickup."
                         },
                         {
-                            title: "Drop and Send",
-                            href: "/dropandsend",
-                            icon: "fad fa-box-alt",
-                            text: "Bring your package to a secure drop location and we'll ship it for you. No postage or appointment needed."
-                        },
-                        {
-                            title: "Book Appointment",
-                            href: "/appointment",
-                            icon: "fad fa-calendar-alt",
-                            text: "Get mailing, shipping, and notary services on your schedule anywhere in the Helena area."
+                            title: "Notarize a Document",
+                            href: "/appointment/21",
+                            icon: "fad fa-file-signature",
+                            text: "Book a mobile notary visit."
                         },
                         {
                             title: "My Account",
                             href: "/account",
                             icon: "fad fa-user-circle",
-                            text: "Manage your Helena Express account and check rewards points balance."
+                            text: "Manage your Helena Express account."
                         },
                         {
                             title: "Send a Telegram",
                             href: "/telegram",
                             icon: "fad fa-typewriter",
-                            text: "Send a telegram anywhere in the Helena area. Hand-delivered within 24 hours."
+                            text: "Send a hand-delivered telegram anywhere in the Helena area."
+                        }
+                    ]
+                })
+            }, {});
+        }
+    },
+    {
+        path: '/send',
+        name: 'send',
+        async: function ( { resolve, reject }) {
+            resolve({
+                content: compiledPages.send({
+                    pages: [
+                        {
+                            title: "Package Pickup",
+                            href: "/pickup",
+                            icon: "fad fa-home",
+                            text: "Leave your package on your porch and we'll pick it up and ship it for you. No postage or appointment needed."
+                        },
+                        {
+                            title: "Drop and Send",
+                            href: "/dropandsend",
+                            icon: "fad fa-box-alt",
+                            text: "Bring your package to a secure drop location and we'll ship it for you. No postage or appointment needed."
+                        },
+                        {
+                            title: "Book Appointment",
+                            href: "/appointment/19",
+                            icon: "fad fa-calendar-alt",
+                            text: "A courier will come to you on your schedule. No account required."
                         }
                     ]
                 })