Skip to content

Commit acbcc1b

Browse files
jk
1 parent 2857cc1 commit acbcc1b

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

client/package-lock.json

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"axios": "^0.19.2",
1515
"draft-js": "^0.11.7",
1616
"draft-js-export-html": "^1.4.1",
17-
"draftjs-raw-parser": "^1.0.2",
17+
"draftjs-raw-parser": "^1.0.6",
1818
"framer-motion": "^3.10.0",
1919
"html-react-parser": "^0.13.0",
2020
"react": "^16.13.1",

client/src/components/layout components/Post/Post.js

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Skeleton, useMediaQuery, useToast } from "@chakra-ui/react";
33
import { ParsedData } from "draftjs-raw-parser";
44
import React, { useEffect, useState } from "react";
55
import { connect } from "react-redux";
6-
import styled, { css } from "styled-components";
6+
import styled from "styled-components";
77
import { postComment } from "../../../actions/commentAction";
88
import {
99
getLikedPosts,
@@ -163,7 +163,7 @@ const Post = ({
163163
alt="post"
164164
style={{
165165
width: isLargerThan500 ? "100%" : "300px",
166-
height: isLargerThan500 ? "600px" : "auto",
166+
height: "auto",
167167
display: imageLoaded ? "" : "none",
168168
}}
169169
onLoad={() => {
@@ -174,7 +174,7 @@ const Post = ({
174174
<S.Flex mt="30px">
175175
{post.content && (
176176
<TurnIn isLargerThan500>
177-
<ParsedData draftJSRawData={post.content.toString()} />
177+
<ParsedData fontSize={23} rawContent={post.content.toString()} />
178178
</TurnIn>
179179
)}
180180
</S.Flex>
@@ -195,20 +195,11 @@ const Post = ({
195195

196196
const TurnIn = styled.div`
197197
div {
198+
text-align: justify;
198199
span {
199200
font-size: 25px;
200201
}
201202
}
202-
203-
${(props) =>
204-
props.isLargerThan500 &&
205-
css`
206-
div {
207-
span {
208-
font-size: 16px;
209-
}
210-
}
211-
`}
212203
`;
213204

214205
const mapStateToProps = (state) => {

client/src/components/layout components/Trending/TrendingItem/TrendingItem.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ const TrendingItem = ({
137137
px="10px"
138138
py="5px"
139139
bg="#2a2c33"
140+
h="98px"
140141
>
141-
<Flex flexDir="column">
142+
<Flex flexDir="column" justifyContent="inherit">
142143
<Text onClick={openPost} fontSize="18px">
143144
{post.heading.length > 47
144145
? post.heading.substr(0, 47) + "..."
@@ -167,7 +168,7 @@ const TrendingItem = ({
167168
onClick={saveThisPost}
168169
className={`fa${checkSavedStatus() ? "s" : "r"} fa-bookmark`}
169170
></i>
170-
{adminPrivilages.postAccessibility && (
171+
{adminPrivilages.postAccessibility && forComp !== "home-trend" && (
171172
<Fragment>
172173
<Flex mt="10px" className="admin-post-drop">
173174
<Menu>

client/src/components/pages/DashboardHome.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import UserPost from "./user-post/UserPost";
99

1010
const DashboardHome = ({ routing, user, profile }) => {
1111
return (
12-
<Flex justifyContent="center" w="100vw">
12+
<Flex justifyContent="center" w="100%">
1313
<Flex w="calc(50vw - 400px)" h="100vh" justifyContent="flex-end">
1414
<Flex flexDir="column" w="15rem" pt="1rem">
1515
<S.Flex justifyContent="flex-start" alignItems="center">
@@ -50,7 +50,7 @@ const DashboardHome = ({ routing, user, profile }) => {
5050
<Flex
5151
borderX="1px solid #a6a6a680"
5252
px="0rem"
53-
h="100vh"
53+
h="100%"
5454
flexDir="column"
5555
w="800px"
5656
pt="1rem"

client/src/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ html,
88
body {
99
width: 100%;
1010
height: 100%;
11-
/* overflow-x: hidden; */
11+
overflow-x: hidden;
1212
}
1313

1414
.admin-post-drop div span {

0 commit comments

Comments
 (0)