Skip to content

Commit 4410a5d

Browse files
Yash-Chauhan09Yash-Chauhan09
authored
Merge pull request #95 from Yash-Chauhan09/master
Fixed the sticky navbar as it was covering the content of the different pages on the website
2 parents bb80463 + 41a8690 commit 4410a5d

File tree

12 files changed

+20370
-562
lines changed

12 files changed

+20370
-562
lines changed

Diff for: ‎package-lock.json

+19,915-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"@testing-library/jest-dom": "^5.11.9",
99
"@testing-library/react": "^11.2.5",
1010
"@testing-library/user-event": "^12.7.1",
11+
"axios": "^0.21.1",
1112
"bootstrap": "^4.6.0",
1213
"firebase": "^8.2.10",
1314
"gh-pages": "^3.1.0",

Diff for: ‎src/components/App.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ import Events from "./pages/event";
66
import Hackathon from "./pages/Hackathon";
77
import Collaboration from "./pages/collaboration";
88
import Addevent from "./pages/addevent";
9-
import OpenSource from "./pages/openSource"
9+
import OpenSource from "./pages/openSource";
1010
import Footer from "../components/layout/Footer";
1111

1212
import ScrollButton from "./utilities/ScrollButton";
13+
import Customnav from "./layout/customnavbar";
1314

1415
function App() {
1516
return (
1617
<HashRouter basename={process.env.PUBLIC_URL}>
1718
<div className="App">
19+
<Customnav color="" height="50px" padding="5vh" />
1820
<Route path="/" exact={true} component={Home} />
1921
<Route path="/events" exact={true} component={Events} />
2022
<Route path="/openSource" exact={true} component={OpenSource} />

Diff for: ‎src/components/layout/customnavbar.js

+68-62
Original file line numberDiff line numberDiff line change
@@ -36,69 +36,75 @@ const Customnav = (props) => {
3636
const size = useWindowSize();
3737

3838
return (
39-
<div className="fixed">
40-
<div>
41-
{console.error(size)}
42-
<Navbar
43-
className="justify-content-between navbar"
44-
style={
45-
showLinks && size.width <= "685"
46-
? { background: "#01bfd9" }
47-
: { background: props.color }
48-
}>
49-
<div className="headings-logos-buttons">
50-
<HiOutlineViewList
51-
style={{color:"white"}}
52-
className="nav-dynamic-button"
53-
size={40}
54-
onClick={() => setShowLinks(!showLinks)}
55-
/>
56-
<Link to="/">
57-
<img src={logo} alt="logo" height={props.height} />
58-
</Link>
59-
</div>
60-
<div
61-
className="navs"
62-
id={showLinks && size.width <= "685" ? "hidden" : ""}>
63-
<NavLink
64-
activeClassName="nav_active"
65-
className=" m-2 nav navbar-link-css"
66-
to="/"
67-
onClick={() => setShowLinks(!showLinks)}>
68-
HOME
69-
</NavLink>
70-
<NavLink
71-
activeClassName="nav_active"
72-
className=" m-2 nav navbar-link-css"
73-
to="/events"
74-
onClick={() => setShowLinks(!showLinks)}>
75-
EVENTS
76-
</NavLink>{" "}
77-
<NavLink
78-
activeClassName="nav_active"
79-
className=" m-2 nav navbar-link-css"
80-
to="/hackathon"
81-
onClick={() => setShowLinks(!showLinks)}>
82-
HACKATHONS
83-
</NavLink>{" "}
84-
<NavLink
85-
activeClassName="nav_active"
86-
className=" m-2 nav navbar-link-css"
87-
to="/openSource"
88-
onClick={() => setShowLinks(!showLinks)}>
89-
OPEN SOURCE
90-
</NavLink>{" "}
91-
<NavLink
92-
activeClassName="nav_active"
93-
className=" m-2 nav navbar-link-css"
94-
to="/collaboration"
95-
onClick={() => setShowLinks(!showLinks)}>
96-
COLLABORATION
97-
</NavLink>
98-
</div>
99-
</Navbar>
39+
<div className="fixed">
40+
<div>
41+
<Navbar
42+
className="justify-content-between navbar"
43+
style={
44+
showLinks && size.width <= "685"
45+
? { background: "#01bfd9" }
46+
: { background: props.color }
47+
}
48+
>
49+
<div className="headings-logos-buttons">
50+
<HiOutlineViewList
51+
style={{ color: "white" }}
52+
className="nav-dynamic-button"
53+
size={40}
54+
onClick={() => setShowLinks(!showLinks)}
55+
/>
56+
<Link to="/">
57+
<img src={logo} alt="logo" height={props.height} />
58+
</Link>
59+
</div>
60+
<div
61+
className="navs"
62+
id={showLinks && size.width <= "685" ? "hidden" : ""}
63+
>
64+
<NavLink
65+
activeClassName="nav_active"
66+
className=" m-2 nav navbar-link-css"
67+
to="/"
68+
onClick={() => setShowLinks(!showLinks)}
69+
>
70+
HOME
71+
</NavLink>
72+
<NavLink
73+
activeClassName="nav_active"
74+
className=" m-2 nav navbar-link-css"
75+
to="/events"
76+
onClick={() => setShowLinks(!showLinks)}
77+
>
78+
EVENTS
79+
</NavLink>{" "}
80+
<NavLink
81+
activeClassName="nav_active"
82+
className=" m-2 nav navbar-link-css"
83+
to="/hackathon"
84+
onClick={() => setShowLinks(!showLinks)}
85+
>
86+
HACKATHONS
87+
</NavLink>{" "}
88+
<NavLink
89+
activeClassName="nav_active"
90+
className=" m-2 nav navbar-link-css"
91+
to="/openSource"
92+
onClick={() => setShowLinks(!showLinks)}
93+
>
94+
OPEN SOURCE
95+
</NavLink>{" "}
96+
<NavLink
97+
activeClassName="nav_active"
98+
className=" m-2 nav navbar-link-css"
99+
to="/collaboration"
100+
onClick={() => setShowLinks(!showLinks)}
101+
>
102+
COLLABORATION
103+
</NavLink>
104+
</div>
105+
</Navbar>
106+
</div>
100107
</div>
101-
</div>
102108
);
103109
};
104110

Diff for: ‎src/components/pages/Hackathon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Hackathon() {
1414
return (
1515
<>
1616
<div className="hackathon">
17-
<Customnav color="" height="50px" padding="5vh" />
17+
{/* <Customnav color="" height="50px" padding="5vh" /> */}
1818
<div className="parent">
1919
<div class="col-7 daughter">
2020
<img src={img1} alt="loading" />

0 commit comments

Comments
 (0)