Skip to content

Commit b0acd42

Browse files
committed
Merge branch 'main' of github.com:AswinBarath/ju-query
2 parents 697c638 + 1b3a058 commit b0acd42

File tree

10 files changed

+97
-3
lines changed

10 files changed

+97
-3
lines changed

.eslintcache

+1-1
Large diffs are not rendered by default.

src/App.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import React, { useEffect } from 'react';
22
import { useDispatch, useSelector } from 'react-redux';
33
import { Switch, Route } from 'react-router-dom';
4+
45
import { login, logout, selectUser } from './features/userSlice';
56
import { auth } from './firebase';
6-
import HomePage from './pages/homepage/HomePage';
7+
78
import Login from './components/auth/Login';
9+
import HomePage from './pages/homepage/HomePage';
10+
import Following from './pages/followingpage/FollowingPage';
11+
import Questions from './pages/questionpage/QuestionsPage';
12+
813
import './App.css';
9-
import Following from './pages/followingpage/Following';
1014

1115
function App() {
1216
const user = useSelector(selectUser);
@@ -44,6 +48,7 @@ function App() {
4448
<Switch>
4549
<Route exact={true} path='/' component={HomePage} />
4650
<Route exact path='/following' component={Following} />
51+
<Route exact path='/question' component={Questions} />
4752
</Switch>
4853
</div>
4954
)

src/components/sidebar/Question.css

Whitespace-only changes.

src/components/sidebar/Question.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React from 'react';
2+
import QuestionOptions from './QuestionOptions';
3+
import './Question.css';
4+
5+
function Question() {
6+
return (
7+
<div className = "sidebar">
8+
<QuestionOptions />
9+
</div>
10+
)
11+
}
12+
13+
export default Question;

src/components/sidebar/QuestionOptions.css

Whitespace-only changes.
+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react';
2+
import './QuestionOptions.css';
3+
4+
function QuestionOptions() {
5+
return (
6+
<div>
7+
<div className="options">
8+
<div className="heading">
9+
<strong>Questions</strong>
10+
</div>
11+
<div className="option">
12+
<img src="https://qphs.fs.quoracdn.net/main-thumb-t-2177-100-JiR07D1TQSfeQzRvWXomVaY4Poj2f8Yb.jpeg" alt="Tech" />
13+
<p>Questions for you</p>
14+
</div>
15+
<div className="option">
16+
<img src="https://qphs.fs.quoracdn.net/main-thumb-t-18797-100-B7cd2Zkrhke1Bd3yn2Vq0HIwXIVg0JaW.jpeg" alt="Events" />
17+
<p>Answer requests</p>
18+
</div>
19+
<div className="option">
20+
<img src="https://qphs.fs.quoracdn.net/main-thumb-t-3906-100-3WJwKe2alb83spIH7rfECXY49noETA9x.jpeg" alt="innovation" />
21+
<p>Answer Drafts</p>
22+
</div>
23+
</div>
24+
</div>
25+
)
26+
}
27+
28+
export default QuestionOptions;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.Following__content {
2+
display: flex;
3+
justify-content: center;
4+
margin-top: 50px;
5+
}
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from 'react';
2+
import Navbar from '../../components/navbar/Navbar';
3+
import Sidebar from '../../components/sidebar/Sidebar';
4+
import Feed from '../../components/post/Feed';
5+
import './FollowingPage.css';
6+
7+
function FollowingPage() {
8+
return (
9+
<div className="home">
10+
<Navbar />
11+
<div className="Following__content">
12+
<Sidebar />
13+
<Feed />
14+
</div>
15+
</div>
16+
)
17+
}
18+
19+
export default FollowingPage;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.Questions__content {
2+
display: flex;
3+
justify-content: center;
4+
margin-top: 50px;
5+
}
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from 'react';
2+
import Navbar from '../../components/navbar/Navbar';
3+
import Question from '../../components/sidebar/Question';
4+
import Feed from '../../components/post/Feed';
5+
import './QuestionsPage.css';
6+
7+
function QuestionsPage() {
8+
return (
9+
<div className="home">
10+
<Navbar />
11+
<div className="Questions__content">
12+
<Question />
13+
<Feed />
14+
</div>
15+
</div>
16+
)
17+
}
18+
19+
export default QuestionsPage;

0 commit comments

Comments
 (0)