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

Layout fixes #49

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
31673f6
minor styling changes to form component
ImieboGodson Aug 19, 2022
96810f4
Merge pull request #7 from ImieboGodson/layout-fixes
ImieboGodson Aug 19, 2022
164bd13
minor fixes to form input placeholder styling
ImieboGodson Aug 19, 2022
5038347
minor fixes to external page header
ImieboGodson Aug 19, 2022
6f65201
fixed faqs component
ImieboGodson Aug 20, 2022
91d6256
minor changes to the routeComponent
ImieboGodson Aug 20, 2022
59d068f
fix: fixed styling of contact form on landing page, and the other par…
ImieboGodson Aug 21, 2022
eb80767
Merge pull request #8 from ImieboGodson/layout-fixes
ImieboGodson Aug 21, 2022
e95f24d
Fix: fixed styling for sidebar components
ImieboGodson Aug 21, 2022
4de540f
fix: minor changes to sidebar
ImieboGodson Aug 21, 2022
85a3de9
added styling fixes to sidebar component
ImieboGodson Aug 22, 2022
3c74add
Merge pull request #9 from ImieboGodson/layout-fixes
ImieboGodson Aug 23, 2022
eab4588
feed components styling fixes
ImieboGodson Aug 23, 2022
727c984
Merge pull request #10 from ImieboGodson/layout-fixes
ImieboGodson Aug 23, 2022
2e70e28
Fix: styling fix for post comment feature
ImieboGodson Aug 23, 2022
5ec50fd
Fix: styling fix for post component
ImieboGodson Aug 23, 2022
c78a9c0
Merge pull request #11 from ImieboGodson/layout-fixes
ImieboGodson Aug 23, 2022
17bd459
fix: styling fixes for postAQuestion component button
ImieboGodson Aug 23, 2022
f9950d9
Fix: styling fix for createAPost Button
ImieboGodson Aug 23, 2022
6408f97
minor fixes to createAPost main part
ImieboGodson Aug 23, 2022
65beac5
adding text editor component to makeAPost feature
ImieboGodson Aug 25, 2022
0834926
feat: added Text Editor functionality
ImieboGodson Aug 27, 2022
bdf3960
Merge pull request #12 from ImieboGodson/layout-fixes
ImieboGodson Aug 27, 2022
afabc99
Text editor feature changes
ImieboGodson Aug 29, 2022
486d97e
Merge pull request #13 from ImieboGodson/layout-fixes
ImieboGodson Aug 29, 2022
399551e
feat: added community page
ImieboGodson Aug 29, 2022
9532af8
fixing community page
ImieboGodson Oct 1, 2022
2b8326d
added switch view state feature on community page
ImieboGodson Oct 2, 2022
1b619fa
minor style fixes and linked to community page
ImieboGodson Oct 2, 2022
a3577d6
added initail files for Cardwrapper component
ImieboGodson Oct 3, 2022
bd0040d
minor fix
ImieboGodson Oct 3, 2022
3eb5cee
major changes
ImieboGodson Oct 7, 2022
0c55a1f
Merge pull request #14 from ImieboGodson/community-page
ImieboGodson Oct 8, 2022
726b47b
progress with contributors component
ImieboGodson Oct 10, 2022
1cbef6f
Merge pull request #15 from ImieboGodson/community-page
ImieboGodson Oct 11, 2022
751b4e0
fixes: styling fix for faq component
ImieboGodson Oct 11, 2022
b8d84ff
minor style fix to header section of landing page
ImieboGodson Oct 11, 2022
2f6de34
minor styling fixes for contact us section on landing page
ImieboGodson Oct 11, 2022
7c90e5e
added icons and update react-icons package
ImieboGodson Oct 11, 2022
85ec122
major changes to profile page main area
ImieboGodson Oct 12, 2022
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
30,658 changes: 10,882 additions & 19,776 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.0",
"@mantine/core": "^5.2.3",
"@mantine/hooks": "^5.2.3",
"@mantine/rte": "^5.2.3",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.2.0",
"react-icons": "^4.4.0",
"react-router-dom": "^6.3.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.1.2"
"react-scripts": "^5.0.1",
"web-vitals": "^3.0.0"
},
"scripts": {
"predeploy": "npm run build",
Expand Down
Binary file added public/assets/communityBackgroundImage1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/communityBackgroundImage2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/communitySmallerImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useState } from 'react';
import { MantineProvider } from '@mantine/core';
import './App.css'
import RoutingComponent from './containers/routingComponent';
import Header from './components/Header/Header';
Expand All @@ -17,6 +18,7 @@ function App() {
}

return (
<MantineProvider >
<div className="App">
<>
{
Expand All @@ -30,6 +32,7 @@ function App() {
</>
<RoutingComponent setAuth={onAuth} isUserAuth={isAuth}/>
</div>
</MantineProvider>
);
}

Expand Down
Empty file.
21 changes: 21 additions & 0 deletions src/components/AboutCommunity/AboutCommunity.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import './AboutCommunity.css'
import ContentWrapper from '../ContentWrapper/ContentWrapper'

const AboutCommunity = () => {
return (
<ContentWrapper>
<header className='contentWrapper-header'>
<p className='contentWrapper-title'>About</p>
</header>
<div className='contentWrapper-main'>
<p>Google Question Hub is a Platform to gather a lot of Knowledge.<br></br><br></br>
There are two main Goals here: <br></br><br></br>
1. To spread interesting content: Any content that might be interesting for people to see is welcome in this space. It could be in any format: a link, a share of another Quora answer, or an answer to a question already in this space, but it shouldn’t be of excessively low quality.<br></br><br></br>
2. Invite and Sharing: Make sure to invite your followers to this space, click on any ads you see, and otherwise simply be engaged in the space.
</p>
</div>
</ContentWrapper>
)
}

export default AboutCommunity
49 changes: 37 additions & 12 deletions src/components/Comment/Comment.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.comment {
padding: 10px 0;
border-top: 1px solid rgba(0, 0, 0, 0.207);
border-bottom: 1px solid rgba(0, 0, 0, 0.207);
/* border-bottom: 1px solid rgba(0, 0, 0, 0.207); */
background-color: rgba(204, 204, 204, 0.138);
/* background-color: rgba(204, 204, 204, 0.138); */
background-color: rgba(252, 253, 253, 0.927);
}


Expand Down Expand Up @@ -37,22 +38,31 @@
}

.commentInfo .userName {
font-size: 0.7rem;
line-height: 15px;
font-weight: bold;
cursor: pointer;
}

.userTitle {
margin-right: 10px;
font-size: 0.6rem;
font-weight: 300;
}

.commentBody {
padding: 5px 35px 5px 70px;
cursor: pointer;
/* cursor: pointer; */
}

.commentBody p {
margin: 10px 0;
margin: 5px 0;
}

.commentBody .commentBodyText {
font-size: 14px;
font-size: 0.75rem;
font-weight: 400;
line-height: 20px;
}

.commentFooter {
Expand All @@ -65,7 +75,7 @@

.commentFooter p {
margin: 0 0 0 5px;
font-size: 16px;
font-size: 0.8rem;
font-weight: 400;
}

Expand All @@ -86,6 +96,7 @@
cursor: pointer;
color: rgba(0, 0, 0, 0.713);
border-radius: 5px;
background-color: rgba(227, 226, 226, 0.333);
}

.likeIcon.liked,
Expand All @@ -99,7 +110,7 @@

.commentLikes:hover,
.commentReply:hover {
background-color: rgba(55, 87, 255, 0.05);
background-color: rgba(227, 226, 226, 0.694);
}

.commentReplies.noDisplay {
Expand All @@ -125,16 +136,30 @@
}

.postAReply textarea {
width: 65%;
width: 68% !important;
height: 34px;
padding: 6px;
border-radius: 10px;
border-radius: 3px;
box-sizing: border-box;
padding: 8px 10px;
background: #FFFFFF;
border: 1px solid #9C9797;
font-size: 0.8rem;
font-weight: 500;
border: 1px solid #9C9797;
}

.postAReplyBtn {
padding: 10px 15px;
border: none;
padding: 15px;
border-radius: 10px;
border-radius: 3px;
font-size: 0.7rem;
font-weight: 500;
color: #fff;
background-color: #516df8;
cursor: pointer;
transition: .2s;
}

.postAReplyBtn:hover {
background-color: #3757FF;
}
8 changes: 4 additions & 4 deletions src/components/Comment/Comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react';
import './Comment.css';
import { BiLike } from 'react-icons/bi';
import { RiReplyLine } from 'react-icons/ri';
import { Users } from '../../dummyData';
import { Users } from '../../db';

const Comment = ({ comment }) => {

Expand All @@ -28,7 +28,7 @@ const Comment = ({ comment }) => {
<img alt="user" src={process.env.PUBLIC_URL + Users.filter(u => u.id === comment.userId)[0].profilePicture} className='userprofileImage'/>
<div className='commentInfo'>
<p className='userName'>{Users.filter(u => u.id === comment.userId)[0].username}</p>
<p className='userTitle'>{Users.filter(u => u.id === comment.userId)[0].jobRole}</p>
<p className='userTitle'>{Users.filter(u => u.id === comment.userId)[0].jobRole}<span> · </span><span className='postTimeStamp'>5 days ago</span></p>
</div>
</div>
</div>
Expand All @@ -38,11 +38,11 @@ const Comment = ({ comment }) => {
<div className='commentFooter'>
<div className='commentfooterLeftSide'>
<div className='commentLikes' onClick={likeHandler}>
<BiLike className={`likeIcon ${isLiked ? 'liked' : ''}`} size='1.5em'/>
<BiLike className={`likeIcon ${isLiked ? 'liked' : ''}`} size='1.2rem'/>
<p className={`likeCounter ${isLiked ? 'liked' : ''}`}>{likes}</p>
</div>
<div className='commentReply' onClick={commentDisplayHandler}>
<RiReplyLine className='replyIcon' size='1.5em'/>
<RiReplyLine className='replyIcon' size='1.2rem'/>
<p>Reply</p>
</div>
</div>
Expand Down
12 changes: 7 additions & 5 deletions src/components/CommunitiesToFollow/CommunitiesToFollow.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
/* padding-bottom: 20px; */
background-color: #fff;
box-sizing: border-box;
border-radius: 5px;
border-radius: 3px;
border: 1px solid #ccc;
}

.communitiesToFollowHeader {
padding: 5px 10px;
padding: 10px;
border-bottom: 1px solid #ccc;
}

.communitiesToFollowHeaderText {
margin: 0;
font-size: 0.88rem;
font-size: 0.8rem;
font-weight: 700;
color: rgba(0, 0, 0, 0.85);
cursor: pointer;
Expand All @@ -42,11 +42,13 @@

.communitiesToFollowListItem p {
margin: 0;
font-size: 0.85rem;
font-size: 0.7rem;
font-weight: 500;
color: rgba(0, 0, 0, 0.775);
}

.communitiesToFollowListItem:hover {
background-color: rgba(250, 250, 241, 0.849);
/* background-color: rgba(250, 250, 241, 0.849); */
/* color: #000; */
background-color: rgba(227, 226, 226, 0.734);
}
83 changes: 83 additions & 0 deletions src/components/ContentWrapper/ContentWrapper.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.contentWrapper-container {
margin-bottom: 20px;
width: 100%;
background-color: #fff;
box-sizing: border-box;
border-radius: 3px;
border: 1px solid #ccc;
}

.contentWrapper-padding-1 {
padding: 5px;
}

.contentWrapper-padding-2 {
padding: 10px;
}

.contentWrapper-header {
padding: 10px 15px;
display: flex;
justify-content: space-between;
align-items: center;

border-bottom: 0.5px solid #ccc;
}

.contentWrapper-header-text {
font-size: 0.8rem;
font-weight: 300;
color: rgba(0, 0, 0, 0.85);
}

.contentWrapper-title {
font-size: 0.8rem;
font-weight: 700;
color: rgba(0, 0, 0, 0.85);
}

.contentWrapper-list {
list-style: none;
}

.contentWrapper-list > li {
padding: 8px 15px;
border-bottom: 0.5px solid #ccc;
font-size: 0.7rem;
line-height: 20px;
cursor: pointer;
color: rgba(0, 0, 0, 0.79);
transition: ease-in-out 0.3s all;
}

.contentWrapper-list > li:hover {
color: #000;
background-color: rgba(227, 226, 226, 0.103);
}

.contentWrapper-main {
padding: 10px 15px;
}

.contentWrapper-main > p {
font-size: 0.72rem;
font-weight: 400;
color: rgba(0, 0, 0, 0.85);
}

.contentWrapper-footer {
padding: 10px 10px;
display: flex;
justify-content: center;
align-items: center;
font-size: 0.7rem;
font-weight: 400;
color: rgba(0, 0, 0, 0.85);
border-bottom: 0.5px solid #ccc;
cursor: pointer;
}

.contentWrapper-footer:hover {
color: #000;
background-color: rgba(227, 226, 226, 0.367);
}
27 changes: 27 additions & 0 deletions src/components/ContentWrapper/ContentWrapper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import './ContentWrapper.css'

const ContentWrapper = ({ children, type }) => {

// const checkWrapperType = (wrapperType) => {
// switch(wrapperType) {
// case 'list':
// return (
// 'Hello'
// );
// case 'card':
// return (
// <main>Admins can manage submissions, content, and settings</main>
// );
// default:
// return 'Error: wrapper type not specified.';
// }
// }

return (
<div className='contentWrapper-container'>
{children}
</div>
)
}

export default ContentWrapper;
Loading