Skip to content

Commit 1f48f6a

Browse files
vaibhavdarenvaibhavdaren
authored
Merge pull request #573 from AuraOfDivinity/dashboard-fixes
Minor fixes
2 parents d9c9f80 + b8f7e9f commit 1f48f6a

File tree

5 files changed

+68
-50
lines changed

5 files changed

+68
-50
lines changed

‎src/user/dashboard/dashboard.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
flex-grow: 4;
1919
.notify-user {
2020
display: flex;
21-
padding: 20px 10px 20px 30px;
21+
padding: 20px 0px 20px 30px;
2222
}
2323
}
2424
.promotions {

‎src/user/dashboard/insights/insight.scss‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
.insight_main_container {
22
display: flex;
33
.insight_left_nav {
4-
width: 15%;
5-
left: -1px;
6-
top: -1px;
7-
height: 100vh;
8-
border: 1px solid #CCCCCC;
9-
box-sizing: border-box;
4+
border-right: solid 1px #dfe9f1;
5+
position: fixed;
6+
top: 0px;
7+
bottom: 0px;
8+
left: 0px;
9+
overflow-y: scroll;
10+
background: #f5f5f5;
1011
}
1112
.right_view_container {
1213
.right_view {
14+
margin-left: 13vw;
1315
margin-top: 10px;
1416
.right_view_header {
1517
font-family: Qanelas;
@@ -25,28 +27,28 @@
2527
.org_btn {
2628
width: 11vw;
2729
height: 5vh;
28-
background: #1A73E8;
30+
background: #1a73e8;
2931
padding: 0.3em;
3032
margin-right: 1em;
3133
}
3234
.member_btn {
3335
width: 11vw;
3436
height: 5vh;
3537
background: rgb(250, 251, 252);
36-
color: #1A73E8;
38+
color: #1a73e8;
3739
padding: 0.3em;
3840
}
3941
}
4042
.community_overview {
41-
.community_overview_header {
42-
padding-top: 0.7em;
43-
font-family: Qanelas;
44-
font-style: normal;
45-
font-weight: 600;
46-
font-size: 1.3em;
47-
line-height: 27px;
48-
color: #000000;
49-
}
43+
.community_overview_header {
44+
padding-top: 0.7em;
45+
font-family: Qanelas;
46+
font-style: normal;
47+
font-weight: 600;
48+
font-size: 1.3em;
49+
line-height: 27px;
50+
color: #000000;
51+
}
5052
}
5153
.overview_stats {
5254
display: flex;
@@ -57,8 +59,8 @@
5759
width: 15vw;
5860
height: 22vh;
5961
min-width: 150px;
60-
background: #FFFFFF;
61-
border: 1px solid #CCCCCC;
62+
background: #ffffff;
63+
border: 1px solid #cccccc;
6264
box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
6365
text-align: center;
6466
margin-right: 2vw;
@@ -84,4 +86,8 @@
8486
}
8587
}
8688
}
87-
}
89+
}
90+
91+
.insight_left_nav::-webkit-scrollbar {
92+
display: none;
93+
}

‎src/user/dashboard/news-feed/news-feed.js‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { withRouter } from "react-router-dom";
3535
import { rsvpYes } from "../../../actions/eventAction";
3636
import { FaEllipsisH, FaThumbtack } from "react-icons/fa";
3737
import ReactionsElement from "./ReactionsElement";
38-
import { pinPost } from '../../../actions/postAction'
38+
import { pinPost } from "../../../actions/postAction";
3939
import Moment from "react-moment";
4040

4141
// const reactionVariant = {
@@ -46,7 +46,15 @@ import Moment from "react-moment";
4646
// },
4747
// };
4848

49-
const navStyles = { position: 'fixed', width: '83%', top: '0', zIndex:1, background: '#fff', marginTop: '0px', marginBottom:'0px'}
49+
const navStyles = {
50+
position: "fixed",
51+
width: "83%",
52+
top: "0",
53+
zIndex: 1,
54+
background: "#fff",
55+
marginTop: "0px",
56+
marginBottom: "0px",
57+
};
5058

5159
const CustomToggle = React.forwardRef(({ children, onClick }, ref) => (
5260
<a
@@ -68,8 +76,6 @@ const styles = makeStyles((theme) => ({
6876
},
6977
listStyle: {
7078
background: "#ffffff",
71-
border: "1px solid #cccccc",
72-
boxShadow: "1px 2px 5px rgba(0, 0, 0, 0.1)",
7379
borderRadius: "5px",
7480
},
7581
listStyle2: {
@@ -148,7 +154,7 @@ function NewsFeed(props) {
148154
useEffect(() => {
149155
window.addEventListener("scroll", () => {
150156
const scrollAmount = window.scrollY;
151-
scrollAmount > 369 ? setisTop(true) : setisTop(false)
157+
scrollAmount > 369 ? setisTop(true) : setisTop(false);
152158
});
153159
}, [window]);
154160

@@ -223,9 +229,9 @@ function NewsFeed(props) {
223229
};
224230

225231
let onPinPost = (postId) => {
226-
console.log('Pinning post ', postId)
227-
props.pinPost(postId)
228-
}
232+
console.log("Pinning post ", postId);
233+
props.pinPost(postId);
234+
};
229235

230236
useEffect(() => {
231237
if (Object.keys(votes).length !== 0) {
@@ -269,7 +275,7 @@ function NewsFeed(props) {
269275
return (
270276
<div className="grid" key={post._id}>
271277
<Paper elevation={1} className={classes.paper}>
272-
<Card className={classes.root}>
278+
<Card className={classes.root} variant="outlined">
273279
<List className={classes.listStyle}>
274280
<ListItem className={classes.listStyle2}>
275281
<ListItemAvatar>
@@ -285,8 +291,8 @@ function NewsFeed(props) {
285291
</h2>
286292
<Moment format="DD MMM YYYY">{post?.createdAt}</Moment>
287293
</ListItemText>
288-
<FaThumbtack
289-
style={{ margin: "10px", width: "10px", cursor: "pointer" }}
294+
<FaThumbtack
295+
style={{ margin: "10px", width: "10px", cursor: "pointer" }}
290296
onClick={() => onPinPost(post._id)}
291297
/>
292298
<Dropdown>
@@ -560,9 +566,12 @@ function NewsFeed(props) {
560566
</div>
561567
</div>
562568
<div className="news__feed__container">
563-
<div className="tabs__container" style={isTop? navStyles: {}}>
569+
<div className="tabs__container" style={isTop ? navStyles : {}}>
564570
<span className="nav__tab container">
565-
<ul className="nav__list__container" style={isTop ? {marginBottom: '0px'}: {}}>
571+
<ul
572+
className="nav__list__container"
573+
style={isTop ? { marginBottom: "0px" } : {}}
574+
>
566575
<li
567576
className={
568577
type === "All"

‎src/user/dashboard/news-feed/news-feed.scss‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
column-count: 2;
4040
width: 100%;
4141
counter-reset: item-counter;
42+
4243
.individual-post {
44+
break-inside: avoid-column;
4345
// position: relative;
4446
display: inline-block;
4547
counter-increment: item-counter;
@@ -363,8 +365,8 @@
363365
color: #1eb025;
364366
}
365367

366-
.reactions-container{
367-
.reaction-element{
368+
.reactions-container {
369+
.reaction-element {
368370
display: inline-block;
369371
margin-right: 10px;
370372
padding: 4px;
@@ -376,7 +378,7 @@
376378
}
377379
.news__feed__container {
378380
.news-feed {
379-
.post-article{
381+
.post-article {
380382
.article {
381383
margin-left: auto;
382384
margin-right: auto;
@@ -426,11 +428,11 @@
426428
}
427429

428430
.posts {
429-
width: 140%;
431+
width: 140%;
430432
// margin-top: 25px;
431-
margin-left: 20px;
432-
margin-right: 10px;
433-
margin-bottom: 24px;
433+
margin-left: 20px;
434+
margin-right: 10px;
435+
margin-bottom: 24px;
434436
.category {
435437
.category-btn {
436438
background-color: white;
@@ -463,7 +465,7 @@
463465
align-items: center;
464466
list-style: none;
465467
border-bottom: 2px solid #eee;
466-
transition: all .5s;
468+
transition: all 0.5s;
467469
font-weight: 300;
468470
color: #262727;
469471

@@ -496,7 +498,7 @@
496498
}
497499
}
498500
.show__comment__section {
499-
.comment__input{
501+
.comment__input {
500502
.comment__wrap {
501503
display: flex;
502504
.comment__img {
@@ -516,6 +518,7 @@
516518
}
517519
.post {
518520
.grid {
521+
break-inside: avoid-column;
519522
.com-btn {
520523
.btn-primary {
521524
background-color: #ffffff;
@@ -526,6 +529,6 @@
526529
}
527530
}
528531
}
529-
.post .main h2 {
530-
cursor: pointer;
531-
}
532+
.post .main h2 {
533+
cursor: pointer;
534+
}

‎src/user/dashboard/portfolio/portfolio.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
text-align: center;
44
border-top-right-radius: 2%;
55
border-bottom-right-radius: 2%;
6-
height: 269px;
6+
height: 270px;
77
flex-direction: row;
8-
border-bottom: 1px solid #dfe9f1;
8+
// border-bottom: 1px solid #dfe9f1;
99
box-shadow: -1px 2px 2px -1px rgba(0, 0, 0, 0.1);
1010
.items-list {
1111
padding: 40px 0px;
@@ -35,8 +35,8 @@
3535
.admins__list {
3636
cursor: pointer;
3737
}
38-
.followers__pointer{
38+
.followers__pointer {
3939
cursor: pointer;
4040
}
4141
}
42-
}
42+
}

0 commit comments

Comments
 (0)