From 27334dc38a48cddbd6ce4b39a94101551fd3add8 Mon Sep 17 00:00:00 2001 From: Ashish Kohad <107983345+AshishKohad27@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:39:18 +0530 Subject: [PATCH 1/6] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 55c8f00..f0b24ec 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ according to their age, food choices and hobbies.**

## 🤝 **_Collaborators_** -## 🤝 **Team Name:- Web-Sprit** # 👨🏻 **Nikhil Sahni** `Team Leader` @@ -105,24 +104,24 @@ Form validation

Signin Page

- +
User Can Create their Sign in details and after that he can able to Login to website.

Login Page

- +
User Can Create their Sign in details and after that he can able to Login to website.

Landing page

- +


Chatting Page

- +


From 34ed3b530fb55b5db371677fe2b96121c1711ae0 Mon Sep 17 00:00:00 2001 From: snikhil2001 Date: Fri, 23 Dec 2022 14:55:38 +0530 Subject: [PATCH 2/6] readme --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b7993fd..b50d82f 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,10 @@ according to their age, food choices and hobbies.**
## Functionalities + - SignIn - Login - ## Project as - ### **Frontend** @@ -50,6 +50,7 @@ according to their age, food choices and hobbies.** - ### **Web Socket**

+ ## 🤝 **_Collaborators_** # 👨🏻 **Nikhil Sahni** `Team Leader` @@ -58,7 +59,6 @@ according to their age, food choices and hobbies.** - Linkedin: [Nikhil Sahni](https://www.linkedin.com/in/nikhil-sahni-8a3562239/) - Email: (nikhilsahni2001@gmail.com) - # 👩🏼 **Akanksha Malviya** - Github: [@Utopian-Akanksha](https://github.com/Utopian-Akanksha) @@ -77,8 +77,8 @@ according to their age, food choices and hobbies.** - Linkedin: [Ankit Singh](https://www.linkedin.com/in/ankit-singh-rajawat-08579521a/) - Email: (ankit.s8080@gmail.com) -

+ # ** Tech Stacks used **
    @@ -102,9 +102,10 @@ according to their age, food choices and hobbies.** Form validation

    +

    Signin Page

    -![Alt text](img/Sweetmeet_signup.PNG) +![Alt text](img/Sweetmeet_signup.png)
    User Can Create their Sign in details and after that he can able to Login to website.

    From 7ffdcca6261cbece447c8322c21718bcff781ce4 Mon Sep 17 00:00:00 2001 From: snikhil2001 Date: Fri, 23 Dec 2022 14:57:44 +0530 Subject: [PATCH 3/6] readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b50d82f..3f13df5 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Form validation

    Signin Page

    -![Alt text](img/Sweetmeet_signup.png) +![signup](img/Sweetmeet_signup.png)
    User Can Create their Sign in details and after that he can able to Login to website.

    From f157119c66d8a868b15e3e47667a8d3a706c8138 Mon Sep 17 00:00:00 2001 From: snikhil2001 Date: Fri, 23 Dec 2022 15:01:35 +0530 Subject: [PATCH 4/6] readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f13df5..1ff3c57 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Form validation

    Signin Page

    -![signup](img/Sweetmeet_signup.png) +
    User Can Create their Sign in details and after that he can able to Login to website.

    From 49986a46bf90c89c1f77314cea1673731bcf0392 Mon Sep 17 00:00:00 2001 From: snikhil2001 Date: Fri, 23 Dec 2022 15:05:15 +0530 Subject: [PATCH 5/6] readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1ff3c57..669b6e8 100644 --- a/README.md +++ b/README.md @@ -111,18 +111,18 @@ User Can Create their Sign in details and after that he can able to Login to web

    Login Page

    -![Alt text](img/Sweetmeet_login.PNG) +
    User Can Create their Sign in details and after that he can able to Login to website.

    Landing page

    -![Alt text](img/Sweetmeet_Landing.PNG) +


    Chatting Page

    -![Alt text](img/Sweetmeet_Chattingapp.PNG) +


    From d4878106d2e601c4976a68326a27b0a8da046df5 Mon Sep 17 00:00:00 2001 From: Akanksha <23utopian.97@gmail.com> Date: Mon, 26 Dec 2022 13:03:15 +0530 Subject: [PATCH 6/6] ui_changes --- sweetmeet/components/Card.js | 69 ++++++++++++++-------------- sweetmeet/components/Conversation.js | 5 +- sweetmeet/components/Messenger.js | 40 ++++++++-------- 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/sweetmeet/components/Card.js b/sweetmeet/components/Card.js index 5c7cf6c..7136d2f 100644 --- a/sweetmeet/components/Card.js +++ b/sweetmeet/components/Card.js @@ -9,6 +9,7 @@ import { useColorModeValue, HStack, Stack, + Image } from '@chakra-ui/react'; import { BsArrowUpRight, BsHeartFill, BsHeart } from 'react-icons/bs'; @@ -26,68 +27,68 @@ export default function PostWithLike({disable,data}) { return (
    - + bg={' #F5F5F5'} + borderBottomRadius={'10px'} + > + {'Blog - - - + + + {data?data.name:null} - + + + + - - {data?data.age:null},{data?data.gender:null} - + display={'flex'} + justifyContent={'left'} + alignItems={'center'}> + {data?data.age:null},{data?data.gender:null} + + - + + {data.desc} - - - My hobbies: {data.hobbies?data.hobbies.join(","):null} - Favourite cuisine:{data.food?data.food:null} - - + + + My hobbies: {data.hobbies?data.hobbies.join(","):null} + Favourite cuisine: {data.food?data.food:null} + + + setLiked(!liked)}> {liked ? ( - + ) : ( - + )} - + Chat - +
    ); diff --git a/sweetmeet/components/Conversation.js b/sweetmeet/components/Conversation.js index 4c1d11e..b04f963 100644 --- a/sweetmeet/components/Conversation.js +++ b/sweetmeet/components/Conversation.js @@ -9,12 +9,13 @@ export default function Conversation({ name, conversation, currentUser }) { - {name} + {name} diff --git a/sweetmeet/components/Messenger.js b/sweetmeet/components/Messenger.js index 22ca500..311e296 100644 --- a/sweetmeet/components/Messenger.js +++ b/sweetmeet/components/Messenger.js @@ -10,6 +10,7 @@ import { io } from "socket.io-client"; import axios from "axios"; import Navbar from "./Navbar"; import Card from "./Card"; +import { BsArrowLeftShort} from 'react-icons/bs'; let conversationId = ""; @@ -159,20 +160,13 @@ export default function Messenger({ data }) { className={styles.chatMenu} bgGradient={"linear(to-r, red.400, orange.500)"} > - + My Profile - + {show ? ( - - {data && - data.map((item, index) => ( - - ))} - - ) : ( <> @@ -191,17 +185,20 @@ export default function Messenger({ data }) { ) : ( - + Start a conversation{" "} - - setShow(true)} - fontSize={"18px"} - fontWeight={"bold"} + + + + setShow(false)} + fontSize={"20px"} cursor={"pointer"} - > + fontWeight={'semibold'} + > Go back - + + )} @@ -219,7 +216,7 @@ export default function Messenger({ data }) { - Most Recent + Most Recent {data && data.map((el, index) => ( @@ -241,6 +238,13 @@ export default function Messenger({ data }) { ))} + ):( + + {data && + data.map((item, index) => ( + + ))} + )}