Merge branch 'main' of https://github.com/thomaspwang/WakeTheF-ckUp

thomaspwang · Oct 16, 2022 · de5851c · de5851c
2 parents c93e549 + aa850e4
commit de5851c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/backend/users.py b/backend/users.py
@@ -88,7 +88,7 @@ def setOncall():
     session.close()
     return jsonify(ret)
 
-# post body: {"username": USERNAME, "friends" : ["username1", ...]}
+# post body: {"username": USERNAME, "friend" : "username1"}
 @users_bp.route('/addFriend/', methods=['POST'])
 def addFriends():
     data = request.json

diff --git a/frontend/src/assets/angybees.png b/frontend/src/assets/angybees.png
diff --git a/frontend/src/components/FriendSearch/FriendSearch.css b/frontend/src/components/FriendSearch/FriendSearch.css
@@ -31,3 +31,9 @@
     align-items: center;
 }
 
+.angybee {
+    max-width: 25%;
+    height: auto;
+    margin-left: 10px;
+    margin-bottom: -20px;
+}
diff --git a/frontend/src/components/FriendSearch/FriendSearch.js b/frontend/src/components/FriendSearch/FriendSearch.js
@@ -11,7 +11,7 @@ import ListItemText from '@mui/material/ListItemText';
 import "./FriendSearch.css";
 
 function FriendSearch() {
-  const searchUrl = "http://localhost:4000/users/addFriend/"
+  const searchUrl = "http://34.168.40.206:4000/users/addFriend/"
 
   const [user, setUser] = useAtom(currUserAtom);
   const [inputText, setInputText] = useState("");
@@ -77,9 +77,17 @@ function FriendSearch() {
     // }
   };
 
+  useEffect(() => {
+    getFriends();
+    console.log(user)
+    console.log(typeof friends)
+    console.log(friends)
+  }, [])
+
   return (
     <div className="outer-box">
       <div className="main">
+        <img className="angybee" src={require("../../assets/angybees.png")}></img>
         <div className="title">find friends</div>
           <div className="search">
             <TextField
@@ -101,7 +109,7 @@ function FriendSearch() {
             </Button>
           </div>
           <p class="title"> current friends</p>
-          <List>
+          <List style={{ textAlignLast: "center" }}>
             <>
               {
                 friends.map(friend =>

diff --git a/frontend/src/components/FriendsDropdown/FriendsDropdown.js b/frontend/src/components/FriendsDropdown/FriendsDropdown.js
@@ -83,7 +83,7 @@ export default function FriendsDropdown() {
   };
 
   const handleSubmit = async () =>{
-    const response = await fetch("http://localhost:4000/users/setOncall/", {
+    const response = await fetch("http://34.168.40.206:4000/users/setOncall/", {
       mode: 'cors',
       method: 'POST',
       headers: {
@@ -161,4 +161,4 @@ export default function FriendsDropdown() {
       </div>
     </div>
   );
-}
+}
diff --git a/frontend/src/pages/Login/Login.js b/frontend/src/pages/Login/Login.js
@@ -33,7 +33,7 @@ function Login() {
 
   const handleLogin = async () => {
 
-    const response = await fetch("http://localhost:4000/users/login/", {
+    const response = await fetch("http://34.168.40.206:4000/users/login/", {
     mode: 'cors',
     method: 'POST',
     headers: {
@@ -140,4 +140,4 @@ function Login() {
   )
 }
 
-export default Login
+export default Login
diff --git a/frontend/src/pages/SignUp/SignUp.js b/frontend/src/pages/SignUp/SignUp.js
@@ -40,7 +40,7 @@ function SignUp() {
 
 
     const handleSignUp = async () => {
-      const response = await fetch("http://localhost:4000/users/newUser/", {
+      const response = await fetch("http://34.168.40.206:4000/users/newUser/", {
         mode: 'cors',
         method: 'POST',
         headers: {
@@ -239,4 +239,4 @@ function SignUp() {
     )
 }
 
-export default SignUp
+export default SignUp