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.

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

navbar added #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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,354 changes: 332 additions & 16,022 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.1.1",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.2.0-beta1",
"jquery": "^3.6.0",
"popper.js": "^1.16.1",
"react": "^18.0.0",
"react-bootstrap": "^2.4.0",
"react-dom": "^18.0.0",
"react-router": "^6.3.0",
"react-router-dom": "^5.3.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
Binary file added public/CE_Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand All @@ -15,6 +16,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/>
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
28 changes: 24 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
import './App.css';
// import Navbar from './components/navbar/navbar'
import Hero from './components/hero/hero'
import 'bootstrap/dist/css/bootstrap.min.css';
import { BrowserRouter,Route, Switch} from 'react-router-dom';
import Navigation from './components/navbar/navbar';
import Hero from './components/hero/hero';
import Home from './components/hero/hero';
import About from './components/About/about';
import Teams from './components/Teams/teams';
import Contact from './components/Contact Us/contact_us';
import Events from './components/Events/events';
import Join from './components/Join Us/join_us';

function App() {
return (
<>
{/* <Navbar/> */}
<Hero/>
<BrowserRouter>
<div>
<Navigation />
</div>
<Switch>
<Route path="/" element={<Home />} />
<Route path="/About" element={<About/>} />
<Route path="/Teams" element={<Teams/>} />
<Route path="/Events" element={<Events/>} />
<Route path='/Join Us' element={<Join/>} />
<Route path="/contactus" element={<Contact />} />
</Switch>
</BrowserRouter>
<Hero/>
</>
);
}
Expand Down
12 changes: 12 additions & 0 deletions src/components/About/about.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

const About = () =>{
return(
<div>
About page
</div>
)
}

export default About

12 changes: 12 additions & 0 deletions src/components/Contact Us/contact_us.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

const Contact = () =>{
return(
<div>
Contact Us page
</div>
)
}

export default Contact

12 changes: 12 additions & 0 deletions src/components/Events/events.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

const Events = () =>{
return(
<div>
Events page
</div>
)
}

export default Events

12 changes: 12 additions & 0 deletions src/components/Join Us/join_us.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

const Join = () =>{
return(
<div>
Join Us page
</div>
)
}

export default Join

12 changes: 12 additions & 0 deletions src/components/Teams/teams.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

const Teams = () =>{
return(
<div>
Teams page
</div>
)
}

export default Teams

43 changes: 43 additions & 0 deletions src/components/navbar/navbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.container{
font-family: 'Poppins';
font-size: 23px;
border-radius: 20px;
box-shadow: 0 5px 20px 0 rgba(29, 21, 21, 0.19);
margin-top: 50px;
width: 60%;
height: 80px;
margin-left: 2%;
justify-content: space-between;
}

.nav-link{
margin-left: 20px;
color: black;
}

.navbar-brand{
padding-left: 10px;
}

.active {
background: /* gradient can be an image */
linear-gradient(
to right,
rgb(243, 8, 28) 0%,
rgb(238, 5, 79) 50%,
rgb(118, 6, 116) 100%
)
left
bottom
no-repeat;
background-size:100% 8px ;
border-radius: 8px;
}


@media only screen and (max-width:960px){
.nav-link{
background-color : white;
text-align: center;
}
}
36 changes: 29 additions & 7 deletions src/components/navbar/navbar.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
import React, { Component } from 'react'
import React, { Component } from "react";
import 'bootstrap/dist/css/bootstrap.min.css';
import './navbar.css';
import {Nav, Navbar} from 'react-bootstrap';

export default class navbar extends Component {
render() {
return (
<div>navbar</div>
)
}

class Navigation extends Component{
render(){
return (
<div className="container">
<Navbar collapseOnSelect expand="lg" sticky="top" variant="tabs" defaultActiveKey="/home">
<link href='https://fonts.googleapis.com/css?family=Poppins' rel='stylesheet'></link>
<Navbar.Brand href="#home" className="fa fa-globe"><img width="60" height="60" className="d-inline-block align-top" href="#home" src={process.env.PUBLIC_URL+"CE_Logo.png"} alt="logo"/></Navbar.Brand>
<Navbar.Toggle aria-controls="responsive-navbar-nav" />
<Navbar.Collapse id="responsive-navbar-nav">
<Nav>
<Nav.Link href="/">Home</Nav.Link>
<Nav.Link href="/About">About</Nav.Link>
<Nav.Link href="/teams">Team</Nav.Link>
<Nav.Link href="/Events">Events</Nav.Link>
<Nav.Link href="/Join Us">Join Us</Nav.Link>
<Nav.Link href="/Contact Us">Contact Us</Nav.Link>
</Nav>
</Navbar.Collapse>
</Navbar>
</div>
);
}
}

export default Navigation
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ code {
}

.hero {
background-color: #f1f1f1;
/* background-color: #f1f1f1; */
display: flex;
align-items: center;
justify-content: space-between;
Expand Down
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
// import 'bootstrap/dist/css/bootstrap.min.css';

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
Expand Down