Skip to content

Commit c468901

Browse files
authored
UI Changes and Accounts (#31)
* Updated navbar, improved code readability * updated navbar
1 parent 72c7619 commit c468901

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1211
-268
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
# misc
1515
.DS_Store
16+
.env
1617
.env.local
1718
.env.development.local
1819
.env.test.local

package-lock.json

Lines changed: 54 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"@testing-library/react": "^13.4.0",
88
"@testing-library/user-event": "^13.5.0",
99
"bootstrap": "^5.2.3",
10+
"dotenv-webpack": "^8.0.1",
1011
"firebase": "^9.17.1",
1112
"mdbreact": "^5.2.0",
1213
"react": "^18.2.0",

requirements.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@testing-library/[email protected]
2+
@testing-library/[email protected]
3+
@testing-library/[email protected]
4+
bootstrap@5.2.3
5+
dotenv-webpack@8.0.1
6+
firebase@9.17.1
7+
mdbreact@5.2.0
8+
react-bootstrap@2.7.2
9+
react-countup@6.4.1
10+
react-dom@18.2.0
11+
react-icons@4.7.1
12+
react-router-dom@6.8.1
13+
react-scripts@5.0.1
14+
react@18.2.0
15+
styled-components@5.3.6
16+
└── web[email protected]

src/App.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
pointer-events: none;
88
}
99

10+
.break {
11+
margin-bottom: 204px;;
12+
}
13+
1014
@media (prefers-reduced-motion: no-preference) {
1115
.App-logo {
1216
animation: App-logo-spin infinite 20s linear;

src/App.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import './App.css';
22
import "bootstrap/dist/css/bootstrap.min.css";
3-
import NavBar from './components/NavBar';
3+
import NavBar from './components/Navbar/NavBar';
4+
import Footer from './pages/Footer';
45

56

67
function App() {
78
return (
89
<div className="App">
910
<NavBar />
11+
<Footer />
1012
</div>
1113
);
1214
}

src/components/Banner.css

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.banner {
2+
margin-top: -3.5rem;
3+
position: relative;
4+
text-align: center;
5+
z-index: -1;
6+
width: 100%;
7+
}
8+
9+
.banner-picture {
10+
margin-top: 0;
11+
width: 100%;
12+
}
13+
14+
.banner-text-position {
15+
font-weight: bolder;
16+
position: absolute;
17+
top: calc(50% + 1rem);
18+
left: 50%;
19+
transform: translate(-50%, -50%);
20+
color: white;
21+
}
22+
23+
.banner-text {
24+
font-weight: bold;
25+
}

src/components/Banner.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import React from 'react'
2+
import './Banner.css'
3+
4+
export default function Banner(props) {
5+
return (
6+
<div className='banner'>
7+
<img
8+
src={props.imagePath}
9+
className="banner-picture"
10+
alt="CATCH Team"
11+
/>
12+
<div className='banner-text-position'>
13+
<h1 className='banner-text'>{props.title}</h1>
14+
</div>
15+
</div>
16+
)
17+
}

src/components/NavBar.js

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/components/Navbar.css

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)