css

thomaspwang · Oct 16, 2022 · a53dab8 · a53dab8
2 parents 54a42e4 + 1904428
commit a53dab8
Show file tree

Hide file tree

Showing 7 changed files with 438 additions and 140 deletions.
diff --git a/backend/twilio_routes.py b/backend/twilio_routes.py
@@ -8,9 +8,14 @@
 import json, os, time, multiprocessing
 
 twilio_bp = Blueprint('twilio', __name__)
+try:
+    account_sid = os.environ['TWILIO_ACCOUNT_SID']
+    auth_token = os.environ['TWILIO_AUTH_TOKEN']
+except:
+    account_sid = 0
+    auth_token = 0
+
 
-account_sid = os.environ['TWILIO_ACCOUNT_SID']
-auth_token = os.environ['TWILIO_AUTH_TOKEN']
 client = Client(account_sid, auth_token)
 
 queue = {} # phonenum : bool[]
@@ -31,7 +36,7 @@ def childProcess(data):
     session = Session()
 
     response = VoiceResponse()
-    response.say("YOU ARE A VEGETABLE. GET UP NOW NOW NOW NOW NOW")
+    response.say("YOU ARE A VEGETABLE. GET UP NOW. NOW. NOW. NOW. NOW.")
     count = 0
     for friend in friends:
         user = session.query(User).filter_by(username=friend).first()

diff --git a/frontend/src/components/FormAndTimer/FormAndTimer.css b/frontend/src/components/FormAndTimer/FormAndTimer.css
@@ -24,21 +24,22 @@ form {
     display: flex;
     flex-direction: row;
     justify-content: center;
+    padding-bottom: 5vh;
 }
 
 label {
     font-family: "DM Sans";
 }
 
 #countdown-date-time {
-    border-radius: 6vh;
+    border-radius: 1vh;
     font-family: "DM Sans";
-    width: 8vw;
+    width: 10vw;
     border-style: none;
 }
 
 #sleebee {
-    max-width: 20vw;
+    max-width: 19vw;
     height: auto;
 }
 

diff --git a/frontend/src/components/FriendsDropdown/FriendDropdown.css b/frontend/src/components/FriendsDropdown/FriendDropdown.css
@@ -26,6 +26,7 @@
     text-transform: unset !important;
     background-color: rgba(186, 209, 250, .4);
     width: 300px;
+    height: 40px;
 }
 
 #beepbeep {

diff --git a/frontend/src/pages/Login/Login.css b/frontend/src/pages/Login/Login.css
@@ -43,91 +43,91 @@
 }
 
 .text-large {
-    /* wake the f*ck up */
-    width: 324px;
-    height: 52px;
-    margin-bottom: 10px;
-    /* left: 255px;
-    top: 420px; */
-
-    font-family: 'DM Sans';
-    font-style: normal;
-    font-weight: 700;
-    font-size: 40px;
-    line-height: 52px;
-    /* identical to box height */
-
-    display: flex;
-    align-items: center;
-
-    color: #000000;
-  }
-
-  .text-subtitle {
-    /* never sleep through an alarm ever again. */
-
-    /* position: absolute; */
-    width: 371px;
-    height: 26px;
-    margin-bottom: 30px;
-    /* left: 255px;
-    top: 488px; */
-
-    font-family: 'DM Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 20px;
-    line-height: 26px;
-    /* identical to box height */
-
-    display: flex;
-    align-items: center;
-
-    color: #000000;
-  }
-
-  .form-title {
-    /* username */
-
-    /* position: absolute; */
-    width: 97px;
-    height: 26px;
-    margin-bottom: 10px;
-    /* left: 255px;
-    top: 550px; */
-
-    font-family: 'DM Sans';
-    font-style: normal;
-    font-weight: 700;
-    font-size: 20px;
-    line-height: 26px;
-    /* identical to box height */
-
-    display: flex;
-    align-items: center;
-
-    color: #000000;
-  }
-
-  .form-extra {
-    /* don’t have an account? sign up. */
-
-    /* position: absolute; */
-    /* width: 292px; */
-    margin-top: 20px;
-    height: 26px;
-    /* left: 330px;
-    top: 852px; */
-
-    font-family: 'DM Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 15px;
-    line-height: 26px;
-    /* identical to box height */
-
-    align-items: center;
-    text-align: center;
-
-    color: #000000;
-  }
+  /* wake the f*ck up */
+  width: 324px;
+  height: 52px;
+  margin-bottom: 10px;
+  /* left: 255px;
+  top: 420px; */
+
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-size: 40px;
+  line-height: 52px;
+  /* identical to box height */
+
+  display: flex;
+  align-items: center;
+
+  color: #000000;
+}
+
+.text-subtitle {
+  /* never sleep through an alarm ever again. */
+
+  /* position: absolute; */
+  width: 371px;
+  height: 26px;
+  margin-bottom: 30px;
+  /* left: 255px;
+  top: 488px; */
+
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 20px;
+  line-height: 26px;
+  /* identical to box height */
+
+  display: flex;
+  align-items: center;
+
+  color: #000000;
+}
+
+.form-title {
+  /* username */
+
+  /* position: absolute; */
+  width: 100%;
+  height: 26px;
+  margin-bottom: 10px;
+  /* left: 255px;
+  top: 550px; */
+
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-size: 20px;
+  line-height: 26px;
+  /* identical to box height */
+
+  display: flex;
+  align-items: center;
+
+  color: #000000;
+}
+
+.form-extra {
+  /* don’t have an account? sign up. */
+
+  /* position: absolute; */
+  /* width: 292px; */
+  margin-top: 20px;
+  height: 26px;
+  /* left: 330px;
+  top: 852px; */
+
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 26px;
+  /* identical to box height */
+
+  align-items: center;
+  text-align: center;
+
+  color: #000000;
+}
diff --git a/frontend/src/pages/Login/Login.js b/frontend/src/pages/Login/Login.js
@@ -67,35 +67,37 @@ function Login() {
   }
 
   return (
-    <div class="login">
-      <div class="left-half">
-        <div class="login-stuff">
-          <div class="text-large">
+    <div className="login">
+      <div className="left-half">
+        <div className="login-stuff">
+          <div className="text-large">
             wake the f*ck up
           </div>
 
-          <div class="text-subtitle">
+          <div className="text-subtitle">
             using the power of friendship.
           </div>
 
           <div>
-            <div class="form-title">username</div>
+            <div className="form-title">username</div>
 
             <TextField
               style={{ width: "100%" }}
               variant="outlined"
+              size="small"
               onChange={handleUsernameChange}
             />
 
             {/* <input class='inputLogin' type="text" {...username} autoComplete="new-password" /> */}
           </div>
 
           <div style={{ marginTop: 10 }}>
-            <div class="form-title">password</div>
+            <div className="form-title">password</div>
 
             <TextField
               style={{ width: "100%" }}
               variant="outlined"
+              size="small"
               onChange={handlePasswordChange}
             />
 
@@ -119,16 +121,16 @@ function Login() {
 
           {/* <input class='btnLogin' type="button" value={loading ? 'Loading...' : 'Login'} disabled={loading} /> */}
 
-          <div class="form-extra">
+          <div className="form-extra">
             <a href="http://localhost:3000/signup">
                 don't have an account? sign up here.
             </a>
           </div>
         </div>
       </div>
-      <div class="right-half">
-        <div class="rectangle">
-          <img class="tire" src={require("../../assets/tirealarmbee.png")}></img>
+      <div className="right-half">
+        <div className="rectangle">
+          <img className="tire" src={require("../../assets/tirealarmbee.png")}></img>
         </div>
       </div>
     </div>