12 files changed, 82 insertions, 41 deletions

diff --git a/public/css/style.css b/public/css/style.css
index 3060098..70c6657 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,5 +1,30 @@
 /* TYPOGRAPHY */
 @font-face {
+    font-family: Charter;
+    src: url(/fonts/charter_regular.woff2) format('woff2-variations');
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Charter;
+    src: url(/fonts/charter_italic.woff2) format('woff2-variations');
+    font-style: italic;
+}
+
+@font-face {
+    font-family: Charter;
+    src: url(/fonts/charter_bold.woff2) format('woff2-variations');
+    font-weight: bold;
+}
+
+@font-face {
+    font-family: Charter;
+    src: url(/fonts/charter_bold_italic.woff2) format('woff2-variations');
+    font-style: italic;
+    font-weight: bold;
+}
+
+@font-face {
     font-family: "Fredoka";
     font-style: normal;
     font-weight: 300 700;
@@ -12,13 +37,14 @@
 }
 
 body {
+    font-family: "", sans-serif;
     color: var(--color--black);
 }
 
 h1,
 h2,
 h3 {
-    font-family: "Fredoka", sans-serif;
+    font-family: "Charter", sans-serif;
     font-weight: 400;
     font-optical-sizing: auto;
     font-weight: 400;
@@ -26,7 +52,7 @@ h3 {
 }
 
 .lead {
-    font-family: "Fredoka", sans-serif;
+    font-family: "Charter", sans-serif;
     font-weight: 300;
     font-optical-sizing: auto;
     font-style: normal;
@@ -225,26 +251,25 @@ html {
 }
 
 body {
-    background: var(--color-grey-97);
+    background: #fdfdfd;
 }
 
 body > #container {
     min-height: 100vh;
     width: 100%;
-    max-width: 75rem;
+    max-width: 55em;
     display: grid;
     margin: 0 auto;
-    grid-template-columns: 1fr;
-    grid-template-rows: min-content auto;
     padding: 0;
 }
 
 #container > #content {
     overflow: hidden;
     border: 1px solid var(--color-grey-90);
-    background: #fff;
+    background: #fdfdfd;
     display: flex;
     flex-direction: column;
+	padding: 1em;
 }
 
 #container > #content > main {
@@ -252,7 +277,7 @@ body > #container {
 }
 
 #container > #content > main.page {
-    padding: 1rem;
+    /* padding: 1rem; */
 }
 
 #container > #content > main.event > *:not(.event-header-image,.event__editing-banner) {
@@ -274,29 +299,22 @@ body > #container {
 @media (min-width: 768px) {
     body > #container {
         padding: 1rem;
-        grid-template-columns: 1fr 4fr;
-        grid-template-rows: auto;
+        margin-top: 6%;
         gap: 1rem;
     }
     #container > #content {
-        border-radius: 1rem;
-        box-shadow: 0 0 6px rgba(0, 0, 0, 0.1);
-    }
-    #container > #content > main.page {
-        padding: 2rem;
+        border-radius: 4px;
+        border: 1px DarkSlateGrey dotted;
+        box-shadow: 4px 4px 0px rgba(0, 0, 0, .5);
     }
+    #container > #content > main.page {}
 }
 
-@media (min-width: 992px) {
-    body > #container {
-        grid-template-columns: 1fr 5fr;
-    }
-}
 
 /* SIDEBAR */
 
 #sidebar h1 {
-    font-family: "Fredoka", sans-serif;
+    font-family: "Charter", sans-serif;
     font-weight: 700;
     font-optical-sizing: auto;
     font-style: normal;
@@ -799,3 +817,17 @@ article.static-page header {
     margin-bottom: 1rem;
     border-bottom: 1px solid #e0e0e0;
 }
+
+.navi {
+    text-align: center;
+}
+
+.instance-description {
+    text-align: center;
+}
+
+.logo {
+    width: 250px;
+    max-width: 60%;
+    margin: 3em;
+3
diff --git a/public/fonts/charter_bold.woff2 b/public/fonts/charter_bold.woff2
new file mode 100644
index 0000000..008c4f5
--- /dev/null
+++ b/public/fonts/charter_bold.woff2
diff --git a/public/fonts/charter_bold_italic.woff2 b/public/fonts/charter_bold_italic.woff2
new file mode 100644
index 0000000..8a2cacc
--- /dev/null
+++ b/public/fonts/charter_bold_italic.woff2
diff --git a/public/fonts/charter_italic.woff2 b/public/fonts/charter_italic.woff2
new file mode 100644
index 0000000..ea15e1a
--- /dev/null
+++ b/public/fonts/charter_italic.woff2
diff --git a/public/fonts/charter_regular.woff2 b/public/fonts/charter_regular.woff2
new file mode 100644
index 0000000..d4bc9e0
--- /dev/null
+++ b/public/fonts/charter_regular.woff2
diff --git a/public/hex.ico b/public/hex.ico
new file mode 100644
index 0000000..304edfb
--- /dev/null
+++ b/public/hex.ico
diff --git a/public/js/modules/new.js b/public/js/modules/new.js
index 70df641..1dd8843 100644
--- a/public/js/modules/new.js
+++ b/public/js/modules/new.js
@@ -32,25 +32,34 @@ $(document).ready(function () {
 });
 
 function newEventForm() {
+    data = {
+        eventName: "",
+        eventLocation: "",
+        eventStart: "",
+        eventEnd: "",
+        timezone: "",
+        eventDescription: "",
+        eventURL: "",
+        hostName: "",
+        creatorEmail: "",
+        eventGroupID: "",
+        eventGroupEditToken: "",
+        publicCheckbox: false,
+        interactionCheckbox: false,
+        joinCheckbox: false,
+        maxAttendeesCheckbox: false,
+        maxAttendees: "",
+    }
+    const urlParams = new URLSearchParams(window.location.search);
+    var els = ['eventName', 'eventLocation', 'eventStart', 'eventEnd', 'timezone', 'eventDescription', 'eventURL', 'hostName', 'creatorEmail', 'interactionCheckbox', 'joinCheckbox', 'maxAttendeesCheckbox', 'maxAttendees']
+    for (var el of els) {
+        const attr = urlParams.get(el);
+        if (attr) {
+            data[el] = attr
+        }
+    }
     return {
-        data: {
-            eventName: "",
-            eventLocation: "",
-            eventStart: "",
-            eventEnd: "",
-            timezone: "",
-            eventDescription: "",
-            eventURL: "",
-            hostName: "",
-            creatorEmail: "",
-            eventGroupID: "",
-            eventGroupEditToken: "",
-            publicCheckbox: false,
-            interactionCheckbox: false,
-            joinCheckbox: false,
-            maxAttendeesCheckbox: false,
-            maxAttendees: "",
-        },
+        data: data,
         errors: [],
         submitting: false,
         init() {
@@ -66,7 +75,7 @@ function newEventForm() {
             this.data.interactionCheckbox = false;
             this.data.joinCheckbox = false;
             this.data.maxAttendeesCheckbox = false;
-            this.data.publicCheckbox = false;
+            this.data.publicCheckbox = true;
         },
         updateEventEnd() {
             if (this.data.eventEnd === "" || this.data.eventEnd < this.data.eventStart) {
@@ -129,7 +138,7 @@ function newEventGroupForm() {
         },
         init() {
             // Reset checkboxes
-            this.data.publicCheckbox = false;
+            this.data.publicCheckbox = true;
         },
         errors: [],
         submitting: false,
diff --git a/public/logo2-min.png b/public/logo2-min.png
new file mode 100644
index 0000000..96579e0
--- /dev/null
+++ b/public/logo2-min.png
diff --git a/public/pictures/bookclub.jpg b/public/pictures/bookclub.jpg
new file mode 100644
index 0000000..b323e4b
--- /dev/null
+++ b/public/pictures/bookclub.jpg
diff --git a/public/pictures/jefferson.jpg b/public/pictures/jefferson.jpg
new file mode 100644
index 0000000..d8dd448
--- /dev/null
+++ b/public/pictures/jefferson.jpg
diff --git a/public/pictures/marthas.jpg b/public/pictures/marthas.jpg
new file mode 100644
index 0000000..f7cee87
--- /dev/null
+++ b/public/pictures/marthas.jpg
diff --git a/public/pictures/mccarren.jpg b/public/pictures/mccarren.jpg
new file mode 100644
index 0000000..6a580f3
--- /dev/null
+++ b/public/pictures/mccarren.jpg