Skip to content

updated with peer #116

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

Open
raghavdhingra wants to merge 2 commits into
base: major_refactor
Choose a base branch
from
Open

updated with peer #116

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
27e6d6d
updated with peer
raghavdhingra Jul 11, 2021
1e75dfa
Update index.jsx
raghavdhingra Jul 11, 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
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"faker": "^4.1.0",
"framer-motion": "^4",
"nodemon": "^2.0.7",
"peerjs": "^1.3.2",
"react": "^16.13.1",
"react-bootstrap": "^1.0.0",
"react-css-grid": "^2.0.0-0",
Expand All @@ -32,6 +33,7 @@
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"reactstrap": "^8.4.1",
"request": "2.79.0",
"socket.io": "^2.3.0",
"socket.io-client": "^2.3.0",
"standard": "^14.3.3",
Expand Down
21 changes: 21 additions & 0 deletions src/components/Home/Home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
@import "../../global_styling/variables.scss";

.container {
padding-right: 15px;
padding-left: 15px;
margin-right: auto;
margin-left: auto;
}
@media (min-width: 768px) {
.container {
width: 750px;
}
}
@media (min-width: 992px) {
.container {
width: 970px;
}
}
@media (min-width: 1200px) {
.container {
width: 1170px;
}
}
.home_page {
&__container {
overflow: auto;
Expand Down
7 changes: 3 additions & 4 deletions src/components/Home/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, { useState } from "react";
import { useHistory } from "react-router-dom";
import { Input, Button } from "@chakra-ui/react";
import { Container } from "react-bootstrap";
import "./Home.scss";
import NavBar from "../NavBar";
import "./Home.scss";

const Home = () => {
const history = useHistory();
Expand All @@ -19,7 +18,7 @@ const Home = () => {
return (
<div className="home_page__container">
<NavBar />
<Container>
<div className="container">
Copy link
Copy Markdown
Member

@sansyrox sansyrox Jul 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make this bem compliant

<div className="home_page__heading_grid">
<div>
<span className="home_page__heading">Connect</span>
Expand Down Expand Up @@ -70,7 +69,7 @@ const Home = () => {
</div>
</div>
</div>
</Container>
</div>
</div>
);
};
Expand Down
Loading