prettified alarm add friends

thomaspwang · Oct 16, 2022 · 259c6e1 · 259c6e1
1 parent baa7040
commit 259c6e1
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 9 deletions.
diff --git a/backend/__pycache__/database.cpython-310.pyc b/backend/__pycache__/database.cpython-310.pyc
diff --git a/backend/__pycache__/model.cpython-310.pyc b/backend/__pycache__/model.cpython-310.pyc
diff --git a/backend/__pycache__/twilio_routes.cpython-310.pyc b/backend/__pycache__/twilio_routes.cpython-310.pyc
diff --git a/backend/__pycache__/users.cpython-310.pyc b/backend/__pycache__/users.cpython-310.pyc
diff --git a/frontend/src/components/FriendSearch/FriendSearch.js b/frontend/src/components/FriendSearch/FriendSearch.js
@@ -71,7 +71,13 @@ function FriendSearch() {
               onChange={inputHandler}
             />
             {response && <><small style={{ color: 'red' }}>{response}</small><br /></>}<br />
-            <Button onClick={handleSubmit}>Add Friend</Button>
+            <Button
+              style={{ marginTop: "10px", backgroundColor: "rgba(186,209,250)", fontFamily: "DM SANS", textTransform: "lowercase", color: "black", boxShadow: "none", marginRight: "10px" }}
+              onClick={handleSubmit}
+              variant="contained"
+            >
+              Add Friend
+            </Button>
           </div>
           <p class="title"> current friends</p>
           {/* <List>

diff --git a/frontend/src/components/FriendsDropdown/FriendDropdown.css b/frontend/src/components/FriendsDropdown/FriendDropdown.css
@@ -13,6 +13,7 @@
 
 .title {
     font-weight: bold;
+    font-size: 25px;
 }
 
 #second-box {
@@ -43,14 +44,19 @@
 }
 
 #curr-oncall {
-    margin-top: 8vh;
+    margin-top: 25px;
 }
 
-#demo-multiple-name {
+/* #demo-multiple-name {
     text-align-last: center;
     width: 5vw;
-}
+} */
 
 #demo-multiple-name-label {
     font-family: 'DM Sans';
+}
+
+.button-box {
+    display: flex;
+    flex-direction: row;
 }
diff --git a/frontend/src/components/FriendsDropdown/FriendsDropdown.js b/frontend/src/components/FriendsDropdown/FriendsDropdown.js
@@ -91,7 +91,7 @@ export default function FriendsDropdown() {
     <div id="outer-box">
         <div id="inner-box">
         <img id="beepbeep" src={require("../../assets/beepbeep.png")}></img>
-        <p class="title">add friends to your alarm!</p>
+        <div class="title" style={{ marginBottom: "15px" }}>add friends to your alarm!</div>
         <FormControl sx={{ m: 1, width: 300 }}>
           <InputLabel id="demo-multiple-name-label">friends</InputLabel>
           <Select
@@ -116,10 +116,25 @@ export default function FriendsDropdown() {
         </FormControl>
       </div>
       <div id="second-box">
-        <Button id="oncall-button" onClick={handleSubmit}>add</Button>
-        <Button id="oncall-button" onClick={navigateFriends}>find more friends</Button>
-        <p class="title" id="curr-oncall">current oncall friends</p>
-        <List>
+        <div id="button-box">
+          <Button
+            style={{ marginTop: "10px", backgroundColor: "rgba(186,209,250)", fontFamily: "DM SANS", textTransform: "lowercase", color: "black", boxShadow: "none", marginRight: "10px" }}
+            id="oncall-button"
+            onClick={handleSubmit}
+            variant="contained"
+          >
+            add
+          </Button>
+          <Button
+            style={{ marginTop: "10px", backgroundColor: "rgba(255, 242, 134, .7)", fontFamily: "DM SANS", textTransform: "lowercase", color: "black", boxShadow: "none" }}
+            id="oncall-button"
+            onClick={navigateFriends}
+          >
+            find more friends
+          </Button>
+        </div>
+        <div class="title" id="curr-oncall">current oncall friends</div>
+        <List style={{ textAlignLast: "center" }}>
           <>
             {
               onCall.map(friend =>