began switch to hilo

admin/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

admin/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AdminConfig(AppConfig):
+    name = 'admin'

admin/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

admin/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

admin/urls.py

@@ -0,0 +1,6 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    
+]

admin/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

config/urls.py

@@ -18,5 +18,6 @@ from django.urls import path, include
 
 urlpatterns = [
     path ('', include('homepage.urls')),
-    path('admin/', admin.site.urls),
+    path ('admin/', include('admin.urls')),
+    path( 'adminpanel/', admin.site.urls),
 ]

homepage/admin.py

@@ -1,3 +1,6 @@
 from django.contrib import admin
+from .models import Poll
 
 # Register your models here.
+
+admin.site.register(Poll)

homepage/migrations/0001_initial.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1 on 2020-08-18 22:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Poll',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question1', models.CharField(max_length=200)),
+                ('question2', models.CharField(max_length=200)),
+                ('question3', models.CharField(max_length=200)),
+                ('askEmotion', models.BooleanField(default=True)),
+                ('pub_date', models.DateTimeField(verbose_name='date published')),
+            ],
+        ),
+    ]

homepage/models.py

@@ -1,3 +1,13 @@
 from django.db import models
 
 # Create your models here.
+
+class Poll (models.Model):
+	askHi = models.BooleanField(default=True)
+	askLo = models.BooleanField(default=True)
+	askEmotion = models.BooleanField(default=True)
+	askEmotion = models.BooleanField(default=True)
+	pub_date = models.DateTimeField('date published')
+	extraQuestion1 = models.CharField(max_length=50, blank=True, null=True)
+	extraQuestion2 = models.CharField(max_length=50, blank=True, null=True)
+	extraQuestion3 = models.CharField(max_length=50, blank=True, null=True)

homepage/templates/homepage/index.html

@@ -13,28 +13,20 @@
       <link rel="stylesheet" type="text/css" href="{% static 'css/styles.css' %}">
 
       <!-- Favicon -->
-      <link rel="apple-touch-icon" sizes="57x57" href="{% static 'icon/apple-icon-57x57.png' %}">
-      <link rel="apple-touch-icon" sizes="60x60" href="{% static 'icon/apple-icon-60x60.png' %}">
-      <link rel="apple-touch-icon" sizes="72x72" href="{% static 'icon/apple-icon-72x72.png' %}">
-      <link rel="apple-touch-icon" sizes="76x76" href="{% static 'icon/apple-icon-76x76.png' %}">
-      <link rel="apple-touch-icon" sizes="114x114" href="{% static 'icon/apple-icon-114x114.png' %}">
-      <link rel="apple-touch-icon" sizes="120x120" href="{% static 'icon/apple-icon-120x120.png' %}">
-      <link rel="apple-touch-icon" sizes="144x144" href="{% static 'icon/apple-icon-144x144.png' %}">
-      <link rel="apple-touch-icon" sizes="152x152" href="{% static 'icon/apple-icon-152x152.png' %}">
-      <link rel="apple-touch-icon" sizes="180x180" href="{% static 'icon/apple-icon-180x180.png' %}">
-      <link rel="icon" type="image/png" sizes="192x192"  href="{% static 'icon/android-icon-192x192.png' %}">
-      <link rel="icon" type="image/png" sizes="32x32" href="{% static 'icon/favicon-32x32.png' %}">
-      <link rel="icon" type="image/png" sizes="96x96" href="{% static 'icon/favicon-96x96.png' %}">
-      <link rel="icon" type="image/png" sizes="16x16" href="{% static 'icon/favicon-16x16.png' %}">
-      <link rel="manifest" href="{% static 'icon/manifest.json' %}">
-      <meta name="msapplication-TileColor" content="#1df8ec">
-      <meta name="msapplication-TileImage" content="{% static 'icon/ms-icon-144x144.png' %}">
-      <meta name="theme-color" content="#1df8ec">
+      <link rel="shortcut icon" href="{% static 'icon/favicon.ico' %}" type="image/x-icon">
+      <link rel="icon" href="{% static 'icon/favicon.ico' %}" type="image/x-icon">
 
       <!-- Font Awesome -->
       <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 
-      <title>What's Your Story?</title>
+      <title>HiLo Arlington</title>
+
+     <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+     <script>
+       function onSubmit(token) {
+         document.getElementById("demo-form").submit();
+       }
+     </script>
     </head>
     <body>
         <section class="jumbotron hero jumbotron-fluid m-0">
@@ -100,13 +92,28 @@
             -->
 
           <section>
-              <div class="jumbotron poll jumbotron-fluid m-0">
-                  <div class="container">
-                    <div class="row short-answer">
-                      <label for="test" class="mx-auto">Lorem ipsum docet docet?</label>
+              <div style="height=50px!important;" class="jumbotron poll jumbotron-fluid m-0">
+                <div class="container">
+                  <form method="post">
+                    {% csrf_token %} 
+                    <div class="row title pb-3 ">
+                      <p for="test" class="mx-auto subtitle">NOW IS YOUR TIME TO SHINE</p>
+                    </div>
+                    <div class="row pb-3 short-answer">
+                      <label for="test" class="mx-auto">What was the <span class="hi">Hi</span> of this week?</label>
                       <input class="w-75 mx-auto rounded" type="text" name="test" value="">
                     </div>
-                    <div class="row pb-4">
+                    <div class="row pb-3 short-answer">
+                      <label for="test" class="mx-auto">What was the <span class="lo">Lo</span> of this week?</label>
+                      <input class="w-75 mx-auto rounded" type="text" name="test" value="">
+                    </div>
+                    <div class="row pb-1 subtitle">
+                      <p class="mx-auto">SOME MORE QUESTIONS FOR THE SOUL</p>
+                    </div>
+                    <div class="row pb-3 short-answer">
+                      <label for="test" class="mx-auto">how are you feeling today?</label>
+                    </div>
+                    <div class="row pb-5">
                       <div class="col emote">
                           <img src="{% static 'css/res/happy.svg' %}" alt="">
                       </div>
@@ -117,12 +124,12 @@
                           <img src="{% static 'css/res/sad.svg' %}" alt="">
                       </div>
                     </div>
-                    <div class="row short-answer pb-4">
-                      <label for="test" class="mx-auto">Lorem ipsum docet docet?</label>
+                    <div class="row short-answer pb-3">
+                      <label for="test" class="mx-auto">what's your name?</label>
                       <input class="w-75 mx-auto rounded" type="text" name="test" value="">
                     </div>                    
-                    <div class="row short-answer">
-                      <label for="test" class="mx-auto">Lorem ipsum docet docet?</label>
+                    <div class="row short-answer pt-1 pb-3">
+                      <label for="test" class="mx-auto">where are you from?</label>
                       <input class="w-75 mx-auto rounded" type="text" name="test" value="">
                     </div>
                     <div class="row">
@@ -130,7 +137,8 @@
                         <img src="{% static 'css/res/submit.png' %}">
                       </button>
                     </div>
-                  </div>
+                  </form>
+                </div>
               </div>
           </section>
         <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>

static/css/res/arrow.svg

@@ -55,7 +55,7 @@
      id="g3769"
      style="display:inline">
     <path
-       style="display:inline;fill:#16fef0"
+       style="display:inline;fill:#ffffff"
        d="M 17.577378,78.345371 1.0121662,57.5 11.006083,57.215017 21,56.930034 V 28.465017 0 H 34.5 48 V 28.5 57 H 58.505454 69.010909 L 51.878213,77.75 C 42.45523,89.1625 34.609859,98.655417 34.444054,98.845371 c -0.165805,0.189955 -7.755809,-9.035045 -16.866676,-20.5 z M 49.826682,76.928599 64.153363,59.5 57.326682,59.245668 C 53.572007,59.105785 49.4875,58.759711 48.25,58.476616 L 46,57.961896 V 30.480948 3 H 34.5 23 v 26.418213 c 0,14.530016 -0.273145,27.130016 -0.606989,28 C 21.909717,58.677657 20.16057,59 13.809678,59 c -4.9639746,0 -7.8482687,0.384228 -7.637217,1.017383 0.8455728,2.536718 27.274901,35.001487 28.24094,34.690082 0.59763,-0.192647 7.533606,-8.193136 15.413281,-17.778866 z"
        id="path3773"
        inkscape:connector-curvature="0" />

static/css/styles.css

@@ -2,9 +2,21 @@
 @font-face {
   src: url("./fonts/Hanson-Bold.ttf");
   font-family: "Hanson-Bold"; }
+@font-face {
+  src: url("./fonts/FuturaPTMedium.otf");
+  font-family: "Futura";
+  font-weight: normal;
+  font-style: normal; }
+@font-face {
+  src: url("./fonts/FuturaPTLight.otf");
+  font-family: "Futura-Light"; }
+@font-face {
+  src: url("./fonts/FuturaPTHeavy.otf");
+  font-family: "Futura-Heavy"; }
 html {
   background-color: #333;
-  font-family: "Hanson-Bold", "Arial", sans-serif; }
+  font-family: "Hanson-Bold", "Arial", sans-serif;
+  overflow-x: none; }
 
 body {
   overflow-y: scroll;
@@ -20,14 +32,14 @@ body::-webkit-scrollbar {
 .hero {
   color: #333 !important;
   background-color: #333 !important;
-  background-image: url("res/hero.png");
+  background-image: url("res/hilo-hero-text.png");
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
   background-attachment: fixed; }
   @media (max-width: 768px) {
     .hero {
-      background-image: url("res/hero-mobile.png"); } }
+      background-image: url("res/hilo-hero-text-mobile.png"); } }
 
 .arrow {
   cursor: pointer;
@@ -93,9 +105,19 @@ body::-webkit-scrollbar {
 #insta-section {
   background-color: #333; }
 
+.bg-colored:before {
+  right: -999em;
+  background: #0b3b52;
+  content: '';
+  display: block;
+  position: absolute;
+  width: 999em;
+  top: 0;
+  bottom: 0; }
+
 .poll {
   color: white;
-  background-image: url("res/poll-gradient.png");
+  background-image: url("res/gradient-mobile.png");
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
@@ -105,10 +127,18 @@ body::-webkit-scrollbar {
   font-size: .75em; }
   @media (max-width: 768px) {
     .poll {
-      background-image: url("res/poll-gradient.png"); } }
+      background-image: url("res/gradient-mobile.png"); } }
 
 .short-answer {
-  padding-bottom: 10vh; }
+  font-size: 1.2em; }
+
+.title {
+  color: #42b8c7;
+  font-size: 1.45em; }
+
+.subtitle {
+  color: #42b8c7;
+  font-size: 1.15em; }
 
 label {
   font-size: 1.25em; }
@@ -121,4 +151,10 @@ label {
   color: #2b5291;
   border-image-repeat: none; }
 
+.hi {
+  color: #48B93E; }
+
+.lo {
+  color: #E34848; }
+
 /*# sourceMappingURL=styles.css.map */

static/css/styles.scss

@@ -11,14 +11,6 @@
   }
 }
 
-// mobile
-
-$mobile-width: 768px;
-
-@mixin mobile {
-  @media (max-width: $mobile-width) { @content }
-}
-
 // fonts
 $font-stack: 'Hanson-Bold','Arial',sans-serif;
 
@@ -27,16 +19,50 @@ $font-stack: 'Hanson-Bold','Arial',sans-serif;
     font-family: "Hanson-Bold";
 }
 
+@font-face {
+    src: url("./fonts/FuturaPTMedium.otf");
+    font-family: "Futura";
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    src: url("./fonts/FuturaPTLight.otf");
+    font-family: "Futura-Light";
+}
+
+@font-face {
+    src: url("./fonts/FuturaPTHeavy.otf");
+    font-family: "Futura-Heavy";
+}
+
+// mobile
+
+$mobile-width: 768px;
+
+@mixin mobile {
+  @media (max-width: $mobile-width) { @content }
+}
+
+@mixin desktop {
+  @media (min-width: $mobile-width) { @content }
+}
+
 
 // colors
 $dark-grey: #333;
 $text: #2b5291;
+$text-light: #42b8c7;
 $header-stroke: #305899;
 
+$green: #48B93E;
+$red: #E34848;
 
 html {
   background-color: $dark-grey;
   font-family: $font-stack;
+
+  overflow-x: none;
 }
 
 body {
@@ -52,18 +78,19 @@ body::-webkit-scrollbar {
 .hero {
   color: $dark-grey !important;
   background-color: $dark-grey !important;
-  background-image: url("res/hero.png");
+  background-image: url("res/hilo-hero-text.png");
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
   background-attachment: fixed;
 
   @include mobile {
-    background-image: url("res/hero-mobile.png");
+    background-image: url("res/hilo-hero-text-mobile.png");
   };
 }
 
 .container .arrow {
+
 }
 
 .arrow {
@@ -151,9 +178,20 @@ body::-webkit-scrollbar {
   background-color: $dark-grey;
 }
 
+.bg-colored:before {
+    right: -999em;
+    background:  #0b3b52;
+    content: '';
+    display: block;
+    position: absolute;
+    width: 999em;
+    top: 0;
+    bottom: 0;
+}
+
 .poll {
   color: white;
-  background-image: url("res/poll-gradient.png");
+  background-image: url("res/gradient-mobile.png");
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
@@ -162,12 +200,22 @@ body::-webkit-scrollbar {
   font-weight: lighter;
   font-size: .75em;
   @include mobile {
-    background-image: url("res/poll-gradient.png");
+    background-image: url("res/gradient-mobile.png");
   };
 }
 
 .short-answer {
-  padding-bottom: 10vh;
+  font-size: 1.2em;
+}
+
+.title {
+  color: $text-light;
+  font-size: 1.45em;
+}
+
+.subtitle {
+  color: $text-light;
+  font-size: 1.15em;
 }
 
 label {
@@ -182,4 +230,12 @@ label {
 .btn {
   color: $text;
   border-image-repeat: none;
+}
+
+.hi {
+  color: $green;
+}
+
+.lo {
+  color: $red;
 }

static/icon/browserconfig.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

static/icon/manifest.json

@@ -1,41 +0,0 @@
-{
- "name": "App",
- "icons": [
-  {
-   "src": "\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/android-icon-192x192.png",
-   "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
-  }
- ]
-}