Skip to content

Commit 636c224

Browse files
kaustuvkaran01kaustuvkaran01
committed
Routing fixed, home fixed
1 parent f05ef7f commit 636c224

File tree

7 files changed

+188
-33
lines changed

7 files changed

+188
-33
lines changed

‎.eslintcache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\index.js":"1","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\App.js":"2","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\reportWebVitals.js":"3","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Aboutus.js":"4","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Contactus.js":"5","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Events.js":"6","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\CurrentEvent.js":"7","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Footer.js":"8","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Team.js":"9","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Pillars.js":"10","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Testimonials.js":"11","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Home.js":"12","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\Navbar.js":"13","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\MenuItems.js":"14","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Button.js":"15","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\NavbarNew.js":"16"},{"size":563,"mtime":1611761667051,"results":"17","hashOfConfig":"18"},{"size":1265,"mtime":1611766472997,"results":"19","hashOfConfig":"18"},{"size":375,"mtime":1611758341752,"results":"20","hashOfConfig":"18"},{"size":204,"mtime":1611760029969,"results":"21","hashOfConfig":"18"},{"size":150,"mtime":1611760029970,"results":"22","hashOfConfig":"18"},{"size":205,"mtime":1611760029971,"results":"23","hashOfConfig":"18"},{"size":220,"mtime":1611760029971,"results":"24","hashOfConfig":"18"},{"size":190,"mtime":1611760029972,"results":"25","hashOfConfig":"18"},{"size":141,"mtime":1611760029973,"results":"26","hashOfConfig":"18"},{"size":147,"mtime":1611760029972,"results":"27","hashOfConfig":"18"},{"size":202,"mtime":1611760029973,"results":"28","hashOfConfig":"18"},{"size":1920,"mtime":1611766462446,"results":"29","hashOfConfig":"18"},{"size":3812,"mtime":1611761148895,"results":"30","hashOfConfig":"18"},{"size":480,"mtime":1611758341742,"results":"31","hashOfConfig":"18"},{"size":614,"mtime":1611758341737,"results":"32","hashOfConfig":"18"},{"size":1616,"mtime":1611762381954,"results":"33","hashOfConfig":"18"},{"filePath":"34","messages":"35","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1w0nqr3",{"filePath":"36","messages":"37","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"38","messages":"39","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\index.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\App.js",["67","68","69"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\reportWebVitals.js",[],["70","71"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Aboutus.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Contactus.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Events.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\CurrentEvent.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Footer.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Team.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Pillars.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Testimonials.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Home.js",["72"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\Navbar.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\MenuItems.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Button.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\NavbarNew.js",[],{"ruleId":"73","severity":1,"message":"74","line":10,"column":8,"nodeType":"75","messageId":"76","endLine":10,"endColumn":12},{"ruleId":"73","severity":1,"message":"77","line":13,"column":8,"nodeType":"75","messageId":"76","endLine":13,"endColumn":14},{"ruleId":"73","severity":1,"message":"78","line":14,"column":8,"nodeType":"75","messageId":"76","endLine":14,"endColumn":17},{"ruleId":"79","replacedBy":"80"},{"ruleId":"81","replacedBy":"82"},{"ruleId":"73","severity":1,"message":"78","line":4,"column":8,"nodeType":"75","messageId":"76","endLine":4,"endColumn":17},"no-unused-vars","'Team' is defined but never used.","Identifier","unusedVar","'Navbar' is defined but never used.","'NavbarNew' is defined but never used.","no-native-reassign",["83"],"no-negated-in-lhs",["84"],"no-global-assign","no-unsafe-negation"]
1+
[{"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\index.js":"1","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\App.js":"2","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\reportWebVitals.js":"3","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Aboutus.js":"4","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Contactus.js":"5","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Events.js":"6","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\CurrentEvent.js":"7","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Footer.js":"8","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Team.js":"9","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Pillars.js":"10","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Testimonials.js":"11","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Home.js":"12","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\Navbar.js":"13","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\MenuItems.js":"14","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Button.js":"15","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\serviceWorker.js":"16","F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\NavbarNew.js":"17"},{"size":628,"mtime":1611770550911,"results":"18","hashOfConfig":"19"},{"size":1231,"mtime":1611772444114,"results":"20","hashOfConfig":"19"},{"size":375,"mtime":1611758341752,"results":"21","hashOfConfig":"19"},{"size":204,"mtime":1611760029969,"results":"22","hashOfConfig":"19"},{"size":150,"mtime":1611760029970,"results":"23","hashOfConfig":"19"},{"size":205,"mtime":1611760029971,"results":"24","hashOfConfig":"19"},{"size":220,"mtime":1611760029971,"results":"25","hashOfConfig":"19"},{"size":190,"mtime":1611760029972,"results":"26","hashOfConfig":"19"},{"size":141,"mtime":1611760029973,"results":"27","hashOfConfig":"19"},{"size":147,"mtime":1611760029972,"results":"28","hashOfConfig":"19"},{"size":202,"mtime":1611760029973,"results":"29","hashOfConfig":"19"},{"size":1922,"mtime":1611772825417,"results":"30","hashOfConfig":"19"},{"size":3812,"mtime":1611761148895,"results":"31","hashOfConfig":"19"},{"size":480,"mtime":1611758341742,"results":"32","hashOfConfig":"19"},{"size":614,"mtime":1611758341737,"results":"33","hashOfConfig":"19"},{"size":5481,"mtime":1611768396642,"results":"34","hashOfConfig":"19"},{"size":1857,"mtime":1611771685271,"results":"35","hashOfConfig":"19"},{"filePath":"36","messages":"37","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},"1w0nqr3",{"filePath":"39","messages":"40","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"43"},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"60","messages":"61","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"38"},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\index.js",[],["72","73"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\App.js",["74","75","76","77"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\reportWebVitals.js",[],["78","79"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Aboutus.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Contactus.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Events.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\CurrentEvent.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Footer.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Team.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Pillars.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Testimonials.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Home.js",["80","81"],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\Navbar.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\navbar\\MenuItems.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\Button.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\serviceWorker.js",[],"F:\\Projects\\reactprojects\\Equicode\\Official-Website\\src\\components\\NavbarNew.js",[],{"ruleId":"82","replacedBy":"83"},{"ruleId":"84","replacedBy":"85"},{"ruleId":"86","severity":1,"message":"87","line":8,"column":8,"nodeType":"88","messageId":"89","endLine":8,"endColumn":14},{"ruleId":"86","severity":1,"message":"90","line":10,"column":8,"nodeType":"88","messageId":"89","endLine":10,"endColumn":12},{"ruleId":"86","severity":1,"message":"91","line":13,"column":8,"nodeType":"88","messageId":"89","endLine":13,"endColumn":14},{"ruleId":"86","severity":1,"message":"92","line":14,"column":8,"nodeType":"88","messageId":"89","endLine":14,"endColumn":17},{"ruleId":"82","replacedBy":"93"},{"ruleId":"84","replacedBy":"94"},{"ruleId":"86","severity":1,"message":"91","line":4,"column":8,"nodeType":"88","messageId":"89","endLine":4,"endColumn":14},{"ruleId":"95","severity":1,"message":"96","line":23,"column":13,"nodeType":"97","endLine":23,"endColumn":56},"no-native-reassign",["98"],"no-negated-in-lhs",["99"],"no-unused-vars","'Footer' is defined but never used.","Identifier","unusedVar","'Team' is defined but never used.","'Navbar' is defined but never used.","'NavbarNew' is defined but never used.",["98"],["99"],"jsx-a11y/alt-text","img elements must have an alt prop, either with meaningful text, or an empty string for decorative images.","JSXOpeningElement","no-global-assign","no-unsafe-negation"]

‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"codetogether.userName": "djkk"
3+
}

‎src/App.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Team from "./components/Team";
1111
import Testimonials from "./components/Testimonials";
1212

1313
import Navbar from "./components/navbar/Navbar";
14-
import NavbarNew from './components/navbar/NavbarNew';
14+
import NavbarNew from './components/NavbarNew';
1515
import "./App.css";
1616
function App() {
1717
return (
@@ -20,17 +20,16 @@ function App() {
2020
{/* <NavbarNew /> */}
2121
{/* <Navbar /> */}
2222
<Switch>
23-
<Home />
23+
<Route exact path="/" component={Home}/>
2424
<Route path="/about" component={AboutUs} />
2525
<Route path="/pillars" component={Pillars} />
2626
<Route path="/about" component={CurrentEvent} />
27-
{/* <Team path="/about" component={CurrentEvent} /> */}
2827
<Route path="/contactus" component={Contactus} />
2928
<Events />
3029
<Testimonials />
3130
<Contactus />
3231
</Switch>
33-
<Footer />
32+
{/* <Footer /> */}
3433
</div>
3534
</Router>
3635
);

‎src/components/Home.js

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import React, { Component } from "react";
2+
// import { Navbar } from "reactstrap";
23
import styled from "styled-components";
34
import Navbar from "../components/navbar/Navbar";
4-
import NavbarNew from '../components/navbar/NavbarNew';
5-
import { ReactComponent as ReactLogo } from "../vector/clip-942.svg";
5+
import NavbarNew from '../components/NavbarNew';
6+
import vector from "../vector/clip-942.svg";
67
class Home extends Component {
78
render() {
89
return (
910
<HomeStyled>
1011
<div className="border">
11-
<Navbar />
12+
<NavbarNew />
1213
<div className="container">
1314
<div className="content">
1415
<div className="header">Encouraging</div>
@@ -19,7 +20,7 @@ class Home extends Component {
1920
environment
2021
</div>
2122
</div>
22-
<ReactLogo className="homeVector" />
23+
<img src={vector} className="homeVector" />
2324
</div>
2425
</div>
2526
</HomeStyled>
@@ -30,13 +31,14 @@ class Home extends Component {
3031
export default Home;
3132

3233
const HomeStyled = styled.div`
33-
background-color: #394561;
34+
// background-color: #394561;
35+
background:#F6B230;
3436
height: 100vh;
35-
position: absolute;
36-
width: 100vw;
37+
overflow:hidden;
38+
// width: 100vw;
3739
3840
.border {
39-
margin: 5vh 2vw;
41+
margin: 2rem;
4042
background-color: #f4f7ff;
4143
box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.2);
4244
border-radius: 24px;
@@ -48,27 +50,26 @@ const HomeStyled = styled.div`
4850
justify-content: center;
4951
align-items: center;
5052
}
51-
.container .homeVector {
52-
height: 100%;
53-
width: 60%;
54-
}
55-
.container .content {
56-
margin-bottom: 20vh;
53+
.homeVector {
54+
height: 35rem;
5755
}
5856
.container .content .header {
5957
font-weight: 800;
6058
font-size: 5rem;
61-
color: #394561;
59+
color: #e1970a;
6260
}
6361
.container .content .second-header {
6462
font-weight: 100;
6563
font-size: 4rem;
66-
color: #394561;
64+
color: black;
6765
}
6866
.container .content .third-header {
6967
font-weight: 50;
7068
font-size: 1rem;
7169
margin-top: 2vh;
7270
line-height: 1.5;
7371
}
72+
.content{
73+
// margin-right:1rem;
74+
}
7475
`;

‎src/components/navbar/NavbarNew.js ‎src/components/NavbarNew.js

+18-9
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,53 @@ import {
1313
DropdownItem,
1414
NavbarText
1515
} from 'reactstrap';
16+
import styled from 'styled-components';
1617
export default function NavbarNew() {
1718
const [isOpen, setIsOpen] = useState(false);
1819

1920
const toggle = () => setIsOpen(!isOpen);
2021
return (
21-
<div>
22-
<Navbar color="light" light expand="md">
22+
<NavbarComponent>
23+
<Navbar color="light" light expand="md" className="rounded-nav">
2324
<NavbarBrand href="/">Equicode</NavbarBrand>
2425
<NavbarToggler onClick={toggle} />
2526
<Collapse isOpen={isOpen} navbar>
2627
<Nav className="mr-auto" navbar>
2728
<NavItem>
28-
<NavLink href="/components/">Components</NavLink>
29+
<NavLink href="/components/">Home</NavLink>
2930
</NavItem>
3031
<NavItem>
31-
<NavLink href="https://github.com/reactstrap/reactstrap">GitHub</NavLink>
32+
<NavLink href="https://github.com/reactstrap/reactstrap">About us</NavLink>
3233
</NavItem>
3334
<UncontrolledDropdown nav inNavbar>
3435
<DropdownToggle nav caret>
35-
Options
36+
Random
3637
</DropdownToggle>
3738
<DropdownMenu right>
3839
<DropdownItem>
39-
Option 1
40+
Team
4041
</DropdownItem>
4142
<DropdownItem>
42-
Option 2
43+
Events
4344
</DropdownItem>
4445
<DropdownItem divider />
4546
<DropdownItem>
46-
Reset
47+
Contact Us
4748
</DropdownItem>
4849
</DropdownMenu>
4950
</UncontrolledDropdown>
5051
</Nav>
5152
<NavbarText>Simple Text</NavbarText>
5253
</Collapse>
5354
</Navbar>
54-
</div>
55+
</NavbarComponent>
5556
);
5657
}
58+
59+
const NavbarComponent = styled.div`
60+
.rounded-nav {
61+
border-top-left-radius: 24px;
62+
border-top-right-radius: 24px;
63+
background:white;
64+
}
65+
`;

0 commit comments

Comments
 (0)