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‎

Lines changed: 1 addition & 1 deletion
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‎

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

‎package.json‎

Lines changed: 4 additions & 3 deletions
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‎

Lines changed: 15 additions & 34 deletions
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‎

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

0 commit comments

Comments
 (0)