Merge branch 'avatar' into dev

Johnhvy · Jul 7, 2024 · aac41b7 · aac41b7
2 parents 5a99dbc + 5f2bd31
commit aac41b7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/client/public/assets/avatars/default.jpg b/client/public/assets/avatars/default.jpg
diff --git a/client/src/containers/Layout.js b/client/src/containers/Layout.js
@@ -18,18 +18,18 @@ function Layout() {
   const dispatch = useDispatch();
   const { newNotificationMessage, newNotificationStatus } = useSelector((state) => state.header);
 
-  useEffect(() => {
-    socket = io(process.env.REACT_APP_BASE_URL);
-    socket.on("connect", function () {
-      socket.emit("id", { userId: user.username });
-      socket.on("like", function (data) {
-        NotificationManager.success(data.msg, "Success");
-      });
-      socket.on("comment", function (data) {
-        NotificationManager.success(data.msg, "Success");
-      });
-    });
-  }, [user.username]);
+  // useEffect(() => {
+  //   socket = io(process.env.REACT_APP_BASE_URL);
+  //   socket.on("connect", function () {
+  //     socket.emit("id", { userId: user.username });
+  //     socket.on("like", function (data) {
+  //       NotificationManager.success(data.msg, "Success");
+  //     });
+  //     socket.on("comment", function (data) {
+  //       NotificationManager.success(data.msg, "Success");
+  //     });
+  //   });
+  // }, [user.username]);
 
   useEffect(() => {
     if (newNotificationMessage !== "") {

diff --git a/client/src/features/settings/team/index.js b/client/src/features/settings/team/index.js
@@ -23,31 +23,31 @@ const TopSideButtons = () => {
 const TEAM_MEMBERS = [
     {
         name: "TrueSt@r",
-        avatar: "http://192.168.6.2:3000/avatars/12?s=287",
+        avatar: "https://camo.githubusercontent.com/e54b230d033920ef460bec600a6fb74dfcfb4794ef701a9cdc62bbed49880eb5/68747470733a2f2f696d672e6672656570696b2e636f6d2f667265652d766563746f722f667269656e646c792d726f626f742d666c6f6174696e672d73706163655f313330382d3136313933342e6a70673f67613d4741312e312e313933313431393539332e313732303331343837352673656d743d6169735f75736572",
         email: "truestar@gmail.com",
         role: "admin",
         bio: "AI Engineer",
         lastActive: "2 days ago",
     },
     {
         name: "Shine",
-        avatar: "http://192.168.6.2:3000/avatars/1?s=287",
+        avatar: "https://avatars.githubusercontent.com/u/135434950",
         email: "shine@gmail.com",
         role: "admin",
         bio: "BlockChain",
         lastActive: "2 days ago",
     },
     {
         name: "Yonex",
-        avatar: "http://192.168.6.2:3000/avatars/9",
+        avatar: "https://avatars.githubusercontent.com/u/172279973",
         email: "yandex@gmail.com",
         role: "admin",
         bio: "FullStack",
         lastActive: "20 hr ago",
     },
     {
         name: "Luckystar",
-        avatar: "http://192.168.6.2:3000/avatars/2?s=287",
+        avatar: "https://camo.githubusercontent.com/e54b230d033920ef460bec600a6fb74dfcfb4794ef701a9cdc62bbed49880eb5/68747470733a2f2f696d672e6672656570696b2e636f6d2f667265652d766563746f722f667269656e646c792d726f626f742d666c6f6174696e672d73706163655f313330382d3136313933342e6a70673f67613d4741312e312e313933313431393539332e313732303331343837352673656d743d6169735f75736572",
         email: "luckystar@gmail.com",
         role: "admin",
         bio: "FrontEnd",

diff --git a/server/src/models/userModel.js b/server/src/models/userModel.js
@@ -23,7 +23,7 @@ const userSchema = new mongoose.Schema({
   },
   avatar: {
     type: String,
-    default: "http://192.168.6.2:3000/avatars/default.jpg",
+    default: "/assets/avatars/default.jpg",
   },
   followers: [
     {