Modified avatar showing bug #29

sopra-fs24-group-09 · Apr 14, 2024 · 63f2e08 · 63f2e08
1 parent 440de70
commit 63f2e08
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/components/routing/routeProtectors/LobbyGuard.js b/src/components/routing/routeProtectors/LobbyGuard.js
@@ -17,8 +17,8 @@ export const LobbyGuard = () => {
     return <Outlet />;
   }
   // Debugging
-  // return <Outlet />;
-  return <Navigate to="/login" replace />;
+  return <Outlet />;
+  //return <Navigate to="/login" replace />;
 };
 
 LobbyGuard.propTypes = {

diff --git a/src/components/views/Lobby.tsx b/src/components/views/Lobby.tsx
@@ -60,8 +60,8 @@ Player.propTypes = {
 
 const mockRoomPlayers: User[] = [
 
-  { id: 1, username: "Alice", avatar: "twa twa-smiling-face-with-smiling-eyes", name: "Alice Wonderland", status: "ONLINE", registerDate: new Date("2021-08-01"), birthday: new Date("1990-01-01") },
-  { id: 2, username: "Bob", avatar: "https://twemoji.maxcdn.com/v/latest/72x72/1f602.png", name: "Bob Builder", status: "OFFLINE", registerDate: new Date("2021-09-01"), birthday: new Date("1985-02-02") },
+  { id: 1, username: "Alice", avatar: "smiling-face-with-smiling-eyes", name: "Alice Wonderland", status: "ONLINE", registerDate: new Date("2021-08-01"), birthday: new Date("1990-01-01") },
+  { id: 2, username: "Bob", avatar: "grinning-face-with-sweat", name: "Bob Builder", status: "OFFLINE", registerDate: new Date("2021-09-01"), birthday: new Date("1985-02-02") },
 
 ];
 
@@ -160,7 +160,7 @@ const Lobby = () => {
         <div className="room-players">
           {room.roomPlayersList?.map((user, index) => (
             <div className="player" key={index}>
-              <img src={user.avatar} alt={user.name} className="player-avatar" />
+              <i className={"twa twa-" + user.avatar} style={{fontSize: "3.8rem"}}/>
               <div className="name">{user.username}</div>
             </div>
           ))}
@@ -183,8 +183,7 @@ const Lobby = () => {
   return (
     <BaseContainer>
       <div className="user-container">
-        <i className={"twa twa-" + user.avatar} style={{fontSize: "3.8rem"}}/>
-        {/*<img src={user.avatar} alt={user.name} className="player-avatar" />*/}
+        <i className={"twa twa-" + user.avatar} style={{fontSize: "3.8rem", marginTop:"0.8rem"}}/>
         <div className="name">{user.username}</div>
       </div>
       <div className="big-title">Kaeps</div>

diff --git a/src/components/views/Login.tsx b/src/components/views/Login.tsx
@@ -79,6 +79,7 @@ const Login = () => {
               disabled={!username || !password || username.trim() ===" " || password.trim() ===" "}
               width="100%"
               onClick={() => doLogin()}
+              style={{ color: "black"}}
             >
               Login
             </Button>

diff --git a/src/components/views/Register.tsx b/src/components/views/Register.tsx
@@ -79,6 +79,7 @@ const Register = () => {
               disabled={!username || !password ||password.indexOf(" ") !== -1|| username.indexOf(" ") !== -1}
               width="75%"
               onClick={() => doRegister()}
+              style={{ color: "black"}}
             >
               register
             </Button>

diff --git a/src/styles/ui/BaseContainer.scss b/src/styles/ui/BaseContainer.scss
@@ -7,5 +7,4 @@
   padding-right: 15px;
   max-width: $DESKTOP_WIDTH;
   color: $textColor;
-  background-color: aqua;
 }
diff --git a/src/styles/views/Login.scss b/src/styles/views/Login.scss
@@ -20,7 +20,7 @@
     padding-top: 30px;
     padding-left: 37px;
     padding-right: 37px;
-    background-color: $background;
+    background-color: #C9D7DD;
     transition: opacity 0.5s ease, transform 0.5s ease;
     box-shadow: $dropShadow;
     border-radius: 1.5em;

diff --git a/src/styles/views/Register.scss b/src/styles/views/Register.scss
@@ -20,7 +20,7 @@
     padding-top: 30px;
     padding-left: 37px;
     padding-right: 37px;
-    background-color: $background;
+    background-color: #C9D7DD;
     transition: opacity 0.5s ease, transform 0.5s ease;
     box-shadow: $dropShadow;
     border-radius: 1.5em;