Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign of Posts screen for talawa user portal. #1896

Merged
merged 62 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
46933e4
Removed `jest-enzyme` package
git-init-priyanshu Jan 26, 2024
af26e36
Adding check for
git-init-priyanshu Jan 30, 2024
b562c8e
Merge branch
git-init-priyanshu Jan 30, 2024
e95eb75
Merge branch
git-init-priyanshu Jan 30, 2024
a4a2c1e
Added CommunityProfile page
git-init-priyanshu Mar 1, 2024
54c54ca
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Mar 1, 2024
772537f
Added tests for CommunityProfile page
git-init-priyanshu Mar 1, 2024
dd186b5
Merge branch 'priyanshu' of https://github.com/git-init-priyanshu/tal…
git-init-priyanshu Mar 1, 2024
236af13
Fixed formatting errors
git-init-priyanshu Mar 2, 2024
95a8f02
Format fix
git-init-priyanshu Mar 2, 2024
65041ad
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Mar 2, 2024
2a026b5
Fixed merge conflicts
git-init-priyanshu Mar 4, 2024
901f937
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 4, 2024
03275eb
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 4, 2024
e5d7ad1
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 5, 2024
c20d208
Format fix
git-init-priyanshu Mar 5, 2024
45b19df
Fix typecheck error
git-init-priyanshu Mar 5, 2024
a580938
Added language support
git-init-priyanshu Mar 5, 2024
c4ed40a
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Mar 6, 2024
9e383ce
Lint error fix
git-init-priyanshu Mar 6, 2024
c72594c
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Mar 15, 2024
6b81ffc
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Mar 15, 2024
1ef86c0
Integrated APIs
git-init-priyanshu Mar 20, 2024
0735964
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 20, 2024
c5862e4
Revert changes
git-init-priyanshu Mar 20, 2024
42bc5b5
Fixed Failing Test
git-init-priyanshu Mar 20, 2024
78a746a
FIxed failing test
git-init-priyanshu Mar 21, 2024
c01efea
Fixed LoginPage failing tests
git-init-priyanshu Mar 21, 2024
065108e
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 23, 2024
bfce2a6
branch 'develop' of https://github.com/git-init-priyanshu/talawa-admi…
git-init-priyanshu Mar 24, 2024
cfb0dd3
Merge branch 'priyanshu' of https://github.com/git-init-priyanshu/tal…
git-init-priyanshu Mar 24, 2024
984aa6c
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 24, 2024
791c922
Full code coverage
git-init-priyanshu Mar 25, 2024
c85e41e
Fixed merge conflicts
git-init-priyanshu Mar 25, 2024
f4ced89
Redesigned the Donations page
git-init-priyanshu Mar 29, 2024
d044b9a
Fixed merge conflict
git-init-priyanshu Mar 29, 2024
f772ae9
Merge branch 'develop' into priyanshu
git-init-priyanshu Mar 31, 2024
28e1943
Merge branch 'develop' into priyanshu
git-init-priyanshu Apr 3, 2024
fdd8370
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Apr 3, 2024
1029107
Added Tests
git-init-priyanshu Apr 3, 2024
7a37851
Merge branch 'priyanshu' of https://github.com/git-init-priyanshu/tal…
git-init-priyanshu Apr 3, 2024
99d9836
Fixed formatting errors
git-init-priyanshu Apr 3, 2024
76a451d
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Apr 7, 2024
af9af11
100% code coverage for OrgListCard.tsx
git-init-priyanshu Apr 7, 2024
a988a3b
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Apr 7, 2024
804991e
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu Apr 10, 2024
b5df470
Redesign of Post screen
git-init-priyanshu Apr 10, 2024
e22cc1d
View Post
git-init-priyanshu Apr 11, 2024
bf839b2
Changed start post UI
git-init-priyanshu Apr 13, 2024
c90f75c
Fixed merge conflicts
git-init-priyanshu Apr 15, 2024
654d0a1
Merge branch 'develop' into priyanshu
git-init-priyanshu Apr 15, 2024
b1e59f4
Merge branch 'develop' into priyanshu
git-init-priyanshu Apr 18, 2024
d6f1b4c
Merge branch 'develop' of https://github.com/git-init-priyanshu/talaw…
git-init-priyanshu May 5, 2024
4f4a8d4
Merge branch 'develop' into priyanshu
git-init-priyanshu May 5, 2024
c8e80c9
Added Tests
git-init-priyanshu May 6, 2024
495c0da
Merge branch 'priyanshu' of https://github.com/git-init-priyanshu/tal…
git-init-priyanshu May 6, 2024
2761a94
Fixed failing tests
git-init-priyanshu May 7, 2024
64d62e5
Merge branch 'develop' into priyanshu
git-init-priyanshu May 7, 2024
16c8c9e
Added Edit Post & Delete Post Functionality
git-init-priyanshu May 9, 2024
30261c3
Merge branch 'develop' into priyanshu
git-init-priyanshu May 9, 2024
4e30282
100% code coverage
git-init-priyanshu May 9, 2024
b73be99
Merge branch 'priyanshu' of https://github.com/git-init-priyanshu/tal…
git-init-priyanshu May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -885,12 +885,21 @@
"noMembers": "No Members to show"
},
"postCard": {
"edit": "Edit",
"delete": "Delete",
"likes": "Likes",
"comments": "Comments"
},
"home": {
"posts": "Posts",
"post": "Post",
"title": "Title",
"textArea": "Something on your mind?",
"feed": "Feed",
"pinnedPosts": "View Pinned Posts",
"loading": "Loading",
"pinnedPosts": "Pinned Posts",
"yourFeed": "Your Feed",
"nothingToShowHere": "Nothing to show here",
"somethingOnYourMind": "Something on your mind?",
"addPost": "Add Post",
"startPost": "Start a post",
Expand Down
12 changes: 5 additions & 7 deletions src/components/UserPortal/CommentCard/CommentCard.module.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
.mainContainer {
width: 100%;
display: flex;
flex-direction: row;
padding: 10px;
width: auto;
overflow: hidden;
background-color: white;
margin-top: 1rem;
padding: 0.5rem;
border: 1px solid #dddddd;
border-radius: 10px;
box-shadow: 2px 2px 8px 0px #c8c8c8;
overflow: hidden;
margin-top: 10px;
}

.personDetails {
Expand Down
6 changes: 5 additions & 1 deletion src/components/UserPortal/CommentCard/CommentCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { toast } from 'react-toastify';
import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
import ThumbUpOffAltIcon from '@mui/icons-material/ThumbUpOffAlt';
import useLocalStorage from 'utils/useLocalstorage';
import AccountCircleIcon from '@mui/icons-material/AccountCircle';

interface InterfaceCommentCardProps {
id: string;
Expand Down Expand Up @@ -80,7 +81,10 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
return (
<div className={styles.mainContainer}>
<div className={styles.personDetails}>
<b>{creatorName}</b>
<div className="d-flex align-items-center gap-2">
<AccountCircleIcon className="my-2" />
<b>{creatorName}</b>
</div>
<span>{props.text}</span>
<div className={`${styles.cardActions}`}>
<Button
Expand Down
145 changes: 135 additions & 10 deletions src/components/UserPortal/PostCard/PostCard.module.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,131 @@
.cardActions {
.cardStyles {
height: 28rem;
max-height: 30rem;
width: 20rem;
background-color: white;
padding: 0;
border: none !important;
outline: none !important;
}

.cardHeader {
display: flex;
width: 100%;
padding-inline: 0;
padding-block: 0;
flex-direction: row;
gap: 0.5rem;
align-items: center;
gap: 1px;
background-color: white;
border-bottom: 1px solid #dddddd;
}

.cardActionBtn {
background-color: rgba(0, 0, 0, 0);
.creator {
display: flex;
width: 100%;
padding-inline: 1rem;
padding-block: 0;
flex-direction: row;
gap: 0.5rem;
align-items: center;
}
.creator p {
margin-bottom: 0;
font-weight: 500;
}
.creator svg {
width: 2rem;
height: 2rem;
}

.customToggle {
padding: 0;
background: none;
border: none;
margin-right: 1rem;
--bs-btn-active-bg: none;
}
.customToggle svg {
color: black;
}

.cardActionBtn:hover {
background-color: ghostwhite;
.customToggle::after {
content: none;
}
.customToggle:hover,
.customToggle:focus,
.customToggle:active {
background: none;
border: none;
color: black !important;
}
.customToggle svg {
color: black;
}

.cardBody div {
padding: 0.5rem;
}

.imageContainer {
max-width: 100%;
}

.cardHeader {
.cardTitle {
--max-lines: 1;
display: -webkit-box;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: var(--max-lines);

font-size: 1.3rem !important;
font-weight: 600;
}

.date {
font-weight: 600;
}

.cardText {
--max-lines: 2;
display: -webkit-box;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: var(--max-lines);

padding-top: 0;
font-weight: 300;
margin-top: 0.7rem !important;
text-align: justify;
}

.viewBtn {
display: flex;
justify-content: flex-end;
margin: 0.5rem;
}
.viewBtn Button {
padding-inline: 1rem;
}

.cardActions {
display: flex;
flex-direction: row;
gap: 10px;
align-items: center;
gap: 1px;
justify-content: flex-end;
}

.cardActionBtn {
background-color: rgba(0, 0, 0, 0);
padding: 0;
border: none;
color: black;
}

.cardActionBtn:hover {
background-color: ghostwhite;
border: none;
color: black !important;
}

.creatorNameModal {
Expand All @@ -40,7 +140,7 @@
display: flex;
flex-direction: row;
align-items: center;
gap: 1px;
gap: 1rem;
margin: 5px 0px;
}

Expand All @@ -53,3 +153,28 @@
color: white;
cursor: pointer;
}

.commentContainer {
overflow: auto;
max-height: 18rem;
padding-bottom: 1rem;
}

.modalFooter {
background-color: white;
position: absolute;
width: calc(100% - 1rem);
padding-block: 0.5rem;
display: flex;
flex-direction: column;
border-top: 1px solid #dddddd;
bottom: 0;
right: 0.5rem;
margin-left: 1rem;
}

.inputArea {
border: none;
outline: none;
background-color: #f1f3f6;
}
Loading
Loading