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

thomaspwang · Oct 16, 2022 · 070b22f · 070b22f
2 parents 66db3c8 + d814c4c
commit 070b22f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/backend/users.py b/backend/users.py
@@ -26,7 +26,7 @@ def addUser():
     lat, long = geocode(data['address'])
 
     session = Session()
-    newUser = User(name=data['name'], username=data['username'], password=data['password'], \
+    newUser = User(username=data['username'], password=data['password'], \
                    friends=[], oncall=[], lat=lat, long=long, phone=data["phone"])
     session.add(newUser)
     try:

diff --git a/frontend/src/components/FriendSearch/FriendSearch.js b/frontend/src/components/FriendSearch/FriendSearch.js
@@ -19,6 +19,34 @@ function FriendSearch() {
   const [friends, setFriends] = useState([]);
   // const [error, setError] = useState(null);
 
+  const getFriends = async () => {
+    const endpoint = `http://localhost:4000/users/getFriends/?username=${user}`
+    const res = await fetch(endpoint, {
+      mode: 'cors',
+      method: 'GET',
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'Origin' : 'http://localhost:3000'
+      }
+    })
+    const data = await res.json();
+    console.log(data)
+    setFriends(data['friends'])
+    // ).then(response =>
+    //   response.json().then(data => data['friends'])
+    //   .then(data => {
+    //     setFriends(data)
+    //   }))
+  }
+
+  useEffect(() => {
+    getFriends();
+    // console.log(user)
+    // console.log(typeof friends)
+    console.log(friends)
+  }, [])
+
   let inputHandler = (e) => {
     setInputText(e.target.value);
   };
@@ -40,6 +68,7 @@ function FriendSearch() {
     });
 
     console.log(response)
+    getFriends()
 
     // if (response == "true") {
     //   setUser(inputText)
@@ -93,18 +122,17 @@ function FriendSearch() {
             </Button>
           </div>
           <p class="title"> current friends</p>
-          {/* <List>
+          <List>
             <>
               {
                 friends.map(friend =>
                   <ListItemText primary={friend}/>)
               }
             </>
-          </List> */}
-    </div>
-
-    </div>
-  );
+          </List>
+        </div>
+      </div>
+    );
 }
 
 export default FriendSearch;

diff --git a/frontend/src/pages/Login/Login.js b/frontend/src/pages/Login/Login.js
@@ -29,6 +29,7 @@ function Login() {
   const [error, setError] = useState(null);
   const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
+  const [showPassword, setShowPassword] = useState(false);
 
   const handleLogin = async () => {
 
@@ -98,6 +99,8 @@ function Login() {
               style={{ width: "100%" }}
               variant="outlined"
               size="small"
+              type={showPassword ? "text" : 
+            "password"}
               onChange={handlePasswordChange}
             />
 

diff --git a/frontend/src/pages/SignUp/SignUp.js b/frontend/src/pages/SignUp/SignUp.js
@@ -34,6 +34,7 @@ function SignUp() {
     const [error, setError] = useState(null);
     const [loading, setLoading] = useState(false);
     const [user, setUser] = useAtom(currUserAtom);
+    const [showPassword, setShowPassword] = useState(false);
 
     const navigate = useNavigate();
 
@@ -120,6 +121,8 @@ function SignUp() {
                 style={{ width: "100%" }}
                 variant="outlined"
                 size="small"
+                type={showPassword ? "text" : 
+            "password"}
                 onChange={handlePasswordChange}
               />
             </div>