Skip to content

Commit 76b0688

Browse files
sammychinedu2kysammychinedu2ky
committed
Merge branch 'development' of https://github.com/codeuino/website-www.codeuino.org into development
2 parents 235766f + 5f39e11 commit 76b0688

Some content is hidden

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

86 files changed

+2931
-18475
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ node_modules/
22
.DS_Store
33
ngrok
44
build/
5-
lambda/
5+
lambda/

‎package-lock.json

+715-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"homepage": "/",
55
"private": true,
66
"dependencies": {
7-
"@fortawesome/fontawesome-free": "^5.13.1",
87
"@material-ui/core": "^4.11.0",
98
"@material-ui/icons": "^4.9.1",
109
"@testing-library/jest-dom": "^4.2.4",
1110
"@testing-library/react": "^9.4.0",
1211
"@testing-library/user-event": "^7.2.1",
1312
"axios": "^0.19.2",
13+
"bootstrap": "^4.5.2",
1414
"enzyme": "^3.11.0",
1515
"highlight.js": "^9.17.1",
1616
"history": "^4.10.1",
@@ -29,8 +29,9 @@
2929
"markdown-it-task-lists": "^2.1.1",
3030
"marked": "^0.8.0",
3131
"netlify-lambda": "^2.0.1",
32+
"node-sass": "^4.14.1",
3233
"react": "^16.12.0",
33-
"react-bootstrap": "^1.0.0-beta.16",
34+
"react-bootstrap": "^1.3.0",
3435
"react-dom": "^16.12.0",
3536
"react-html-parser": "^2.0.2",
3637
"react-markdown": "^4.3.1",
@@ -56,7 +57,7 @@
5657
"heroku-postbuild": "npm run build",
5758
"start": "netlify-lambda serve netlify-functions & serve -s build -l 3000",
5859
"prebuild": "netlify-lambda build netlify-functions",
59-
"build": "CI=false && set \"CI=false\" && react-scripts build",
60+
"build": "CI=false || set \"CI=false\" && react-scripts build",
6061
"test": "react-scripts test",
6162
"eject": "react-scripts eject",
6263
"start-dev": "npm run lambda-serve & react-scripts start && fg"

‎public/favicon.ico

-3.67 KB
Binary file not shown.

‎public/index.html

+15-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,18 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="%PUBLIC_URL%/logo.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#22247a" />
8+
<meta name="description" content="Codeuino | Open Source Organisation" />
9+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
10+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
11+
<title>Codeuino</title>
12+
</head>
313

4-
<head>
5-
<meta charset="utf-8" />
6-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1" />
8-
<meta name="theme-color" content="#000000" />
9-
<meta name="description" content="Codeuino | Open Source Organisation" />
10-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
11-
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
12-
13-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
14-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
15-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
16-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
17-
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
18-
<title>Codeuino</title>
19-
</head>
20-
21-
<body>
22-
<noscript>You need to enable JavaScript to run this app.</noscript>
23-
<div id="root"></div>
24-
<!-- Optional JavaScript -->
25-
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
26-
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
27-
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
28-
crossorigin="anonymous"></script>
29-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
30-
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
31-
crossorigin="anonymous"></script>
32-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
33-
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
34-
crossorigin="anonymous"></script>
35-
</body>
36-
37-
</html>
14+
<body>
15+
<noscript>You need to enable JavaScript to run this app.</noscript>
16+
<div id="root"></div>
17+
</body>
18+
</html>

‎public/logo.ico

111 KB
Binary file not shown.

‎public/logo.png

4.2 KB
Loading

‎public/logo192.png

-5.22 KB
Binary file not shown.

‎public/logo512.png

-9.44 KB
Binary file not shown.

‎src/App.css

-129
This file was deleted.

‎src/App.js

+35-38
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
1-
import { Switch, Route, HashRouter as Router } from "react-router-dom";
2-
import { CSSTransition, TransitionGroup } from "react-transition-group";
31
import React from "react";
4-
import "./App.css";
5-
import NewHome from "./pages/Home/NewHome";
2+
import { Switch, Route } from "react-router-dom";
3+
import { CSSTransition, TransitionGroup } from "react-transition-group";
64
import NavBar from "./components/NavBar";
5+
import Home from "./pages/Home/Home";
76
import Footer from "./components/Footer";
8-
import Team from "./pages/Team/Team";
97
import COC from "./pages/COC/COC";
8+
import Team from "./pages/Team/Team";
109

11-
function App() {
10+
const App = () => {
1211
return (
13-
<div className="App" style={{ width: "100%" }}>
14-
<Router>
15-
<NavBar />
16-
<Route
17-
render={({ location }) => {
18-
return (
19-
<TransitionGroup>
20-
<CSSTransition
21-
timeout={450}
22-
classNames="fade"
23-
key={location.pathname}
24-
>
25-
<Switch location={location}>
26-
<Route path="/team">
27-
<Team />
28-
</Route>
29-
<Route path="/codeofconduct">
30-
<COC />
31-
</Route>
32-
<Route exact path="/">
33-
<NewHome />
34-
</Route>
35-
</Switch>
36-
</CSSTransition>
37-
</TransitionGroup>
38-
);
39-
}}
40-
/>
41-
<Footer />
42-
</Router>
43-
</div>
12+
<React.Fragment>
13+
<NavBar />
14+
<Route
15+
render={({ location }) => {
16+
return (
17+
<TransitionGroup>
18+
<CSSTransition
19+
timeout={450}
20+
classNames="fade"
21+
key={location.pathname}
22+
>
23+
<Switch location={location}>
24+
<Route path="/team">
25+
<Team />
26+
</Route>
27+
<Route path="/codeofconduct">
28+
<COC />
29+
</Route>
30+
<Route exact path="/">
31+
<Home />
32+
</Route>
33+
</Switch>
34+
</CSSTransition>
35+
</TransitionGroup>
36+
);
37+
}}
38+
/>
39+
<Footer />
40+
</React.Fragment>
4441
);
45-
}
42+
};
4643

4744
export default App;

‎src/App.scss

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
.main-content {
2+
margin-top: 170px;
3+
}
4+
5+
.main-heading {
6+
margin-bottom: 40px;
7+
margin-left: auto;
8+
margin-right: auto;
9+
text-align: center;
10+
}
11+
12+
.main-heading-text {
13+
color: $primary-blue;
14+
font-size: 45px;
15+
font-weight: 600;
16+
margin-bottom: 10px;
17+
margin-top: 50px;
18+
}
19+
20+
.main-heading-subtext {
21+
font-size: 18px;
22+
}
23+
24+
.main-heading-line {
25+
background-color: $primary-blue;
26+
color: $primary-blue;
27+
height: 3px;
28+
max-width: 20%;
29+
}
30+
31+
.highlight-text {
32+
color: $primary-blue;
33+
font-weight: 600;
34+
}
35+
36+
.anchor-text {
37+
color: $primary-blue;
38+
font-weight: 600;
39+
text-decoration: underline;
40+
41+
&:hover {
42+
color: $link-blue;
43+
text-decoration: underline;
44+
}
45+
}
46+
47+
.scroll-button {
48+
background-color: $primary-blue;
49+
border: 0;
50+
border-radius: 50%;
51+
box-shadow: 0 8px 15px $shadow-black;
52+
color: $white;
53+
padding: 10px;
54+
}
55+
56+
.scroll-icon {
57+
cursor: pointer;
58+
position: fixed;
59+
bottom: 30px;
60+
right: 20px;
61+
z-index: 999;
62+
}
63+
64+
@media (max-width: 500px) {
65+
.main-content {
66+
margin-top: 120px;
67+
}
68+
}

‎src/_variables.scss

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$black: #000000;
2+
$white: #ffffff;
3+
$primary-blue: #22247a;
4+
$secondary-blue: #f1f4f8;
5+
$github-button-black: #24292e;
6+
$shadow-black: #00000029;
7+
$link-blue: #5257fa;

‎src/codeuino.png

-2.77 KB
Binary file not shown.

0 commit comments

Comments
 (0)