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.

Sign up for GitHub

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

I added the designed pages in app.js #128

Closed
wants to merge 2 commits into from
Closed

I added the designed pages in app.js #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f24445e
footer added
Mar 19, 2021
c841d92
exported and imported the made pages
Mar 23, 2021
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
16,569 changes: 16,553 additions & 16 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react-redux": "^7.2.2",
"react-responsive": "^8.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"react-scripts": "^3.4.3",
"react-toastify": "^7.0.3",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.9",
Expand All @@ -26,7 +26,7 @@
},
"eslintConfig": {
"extends": "react-app",
"eslint":"recommended"
"eslint": "recommended"
},
"browserslist": {
"production": [
Expand Down
34 changes: 21 additions & 13 deletions client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,30 @@ import store from './store/store';
import SignUp from './Component/SignUp/SignUp';
import { FeedPage } from './Component/feedpage/FeedPage';
import SignIn from "./Component/SignIn/SignIn";
import Footer from './Component/Footer/Footer';
import Navbar from './Component/navbar/Navbar';
import Feed from './Component/feedpage/FeedPage';

function App() {
return (
<BrowserRouter>
<Provider store={store}>
<div className="App">
<div>
<Switch>
<Route path="/signup" component={SignUp} />
<Route path="/feedpage" component={FeedPage} />
<Route path="/signin" component={SignIn} />
</Switch>
</div>
</div>
</Provider>
</BrowserRouter>
<>
<BrowserRouter>
<Provider store={store}>
<div className="App">
<div>
<Navbar />
<Feed />
<Footer />
<Switch>
<Route path="/signup" component={SignUp} />
<Route path="/feedpage" component={FeedPage} />
<Route path="/signin" component={SignIn} />
</Switch>
</div>
</div>
</Provider>
</BrowserRouter>
</>
);
}

Expand Down
16 changes: 16 additions & 0 deletions client/src/Component/Footer/Footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*Footer styles*/
.main-footer {
color: white;
background-color: #a480b9;
padding-top: 3em;
position: relative;
bottom: 0;
width: 100%;

}
.list-unstyled{
font-size: 16px;
}
.col{
margin-left: 5%;
}
49 changes: 49 additions & 0 deletions client/src/Component/Footer/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from "react";
import "./Footer.css";

function Footer() {
return (
<div className="main-footer">
<div className="container">
<div className="row">
{/* Column1 */}
<div className="col">
<h4>KURAKOO</h4>
<h1 className="list-unstyled">
<li>39897987393</li>
<li>India</li>
<li>some detailed address</li>
</h1>
</div>
{/* Column2 */}
<div className="col">
<h4>DETAILS</h4>
<ui className="list-unstyled">
<li>HOME</li>
<li>ABOUT US</li>
<li>SERVICES</li>
</ui>
</div>
{/* Column3 */}
<div className="col">
<h4>SOCIAL HANDLES</h4>
<ui className="list-unstyled">
<li>FACEBOOK</li>
<li>INSTAGRAM</li>
<li>TWITTER</li>
</ui>
</div>
</div>
<hr />
<div className="row">
<p className="col-sm">
&copy;{new Date().getFullYear()} Kurakoo | All rights reserved |
Terms Of Service | Privacy
</p>
</div>
</div>
</div>
);
}

export default Footer;
1 change: 1 addition & 0 deletions client/src/Component/feedpage/FeedPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ export class FeedPage extends Component {
);
}
}
export default FeedPage;
3 changes: 2 additions & 1 deletion client/src/Component/navbar/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ export class Navbar extends Component {
</div>
);
}
}
}
export default Navbar;