Skip to content

Commit 4521daa

Browse files
ashish11chawdaashish11chawda
authored
Merge branch 'development' into main
2 parents dd11774 + b995587 commit 4521daa

27 files changed

+15406
-72
lines changed

‎client/package-lock.json‎

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

‎client/package.json‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,22 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@fortawesome/fontawesome-svg-core": "^1.2.32",
7+
"@fortawesome/free-brands-svg-icons": "^5.15.1",
8+
"@fortawesome/free-regular-svg-icons": "^5.15.1",
9+
"@fortawesome/free-solid-svg-icons": "^5.15.1",
10+
"@fortawesome/react-fontawesome": "^0.1.11",
611
"@testing-library/jest-dom": "^4.2.4",
712
"@testing-library/react": "^9.3.2",
813
"@testing-library/user-event": "^7.1.2",
9-
"react": "^16.14.0",
10-
"react-dom": "^16.14.0",
11-
"react-scripts": "3.4.3"
14+
"aos": "^3.0.0-beta.6",
15+
"bootstrap": "^4.5.3",
16+
"cra-template": "1.0.3",
17+
"react": "^16.13.1",
18+
"react-dom": "^16.13.1",
19+
"react-scripts": "3.4.1",
20+
"redux": "^4.0.5",
21+
"styled-components": "^5.2.0"
1222
},
1323
"scripts": {
1424
"start": "react-scripts start",

‎client/public/index.html‎

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta
9-
name="description"
10-
content="Web site created using create-react-app"
11-
/>
12-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13-
<!--
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
7+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
8+
9+
<meta name="viewport" content="width=device-width, initial-scale=1" />
10+
<meta name="theme-color" content="#000000" />
11+
<meta name="description" content="Web site created using create-react-app" />
12+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13+
<!--
1414
manifest.json provides metadata used when your web app is installed on a
1515
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1616
-->
17-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18-
<!--
17+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18+
<!--
1919
Notice the use of %PUBLIC_URL% in the tags above.
2020
It will be replaced with the URL of the `public` folder during the build.
2121
Only files inside the `public` folder can be referenced from the HTML.
@@ -24,12 +24,35 @@
2424
work correctly both with client-side routing and a non-root public URL.
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
27-
<title>React App</title>
28-
</head>
29-
<body>
30-
<noscript>You need to enable JavaScript to run this app.</noscript>
31-
<div id="root"></div>
32-
<!--
27+
<title>React App</title>
28+
<style>
29+
.row{
30+
margin:0;
31+
}
32+
.col-12{
33+
padding: 0;
34+
}
35+
.row-1, .row-2{
36+
margin-left: 0 !important;
37+
}
38+
@media screen and (max-width: 768px){
39+
.row1, .row2 {
40+
margin-left: 0 !important;
41+
}
42+
}
43+
@media screen and (max-width: 575px){
44+
.row1, .row2 {
45+
margin-left: 0 !important;
46+
}
47+
}
48+
</style>
49+
50+
</head>
51+
52+
<body>
53+
<noscript>You need to enable JavaScript to run this app.</noscript>
54+
<div id="root"></div>
55+
<!--
3356
This HTML file is a template.
3457
If you open it directly in the browser, you will see an empty page.
3558
@@ -39,5 +62,6 @@
3962
To begin the development, run `npm start` or `yarn start`.
4063
To create a production bundle, use `npm run build` or `yarn build`.
4164
-->
42-
</body>
43-
</html>
65+
</body>
66+
67+
</html>

‎client/src/App.css‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +0,0 @@
1-
.App {
2-
text-align: center;
3-
}
4-
5-
.App-logo {
6-
height: 40vmin;
7-
pointer-events: none;
8-
}
9-
10-
@media (prefers-reduced-motion: no-preference) {
11-
.App-logo {
12-
animation: App-logo-spin infinite 20s linear;
13-
}
14-
}
15-
16-
.App-header {
17-
background-color: #282c34;
18-
min-height: 100vh;
19-
display: flex;
20-
flex-direction: column;
21-
align-items: center;
22-
justify-content: center;
23-
font-size: calc(10px + 2vmin);
24-
color: white;
25-
}
26-
27-
.App-link {
28-
color: #61dafb;
29-
}
30-
31-
@keyframes App-logo-spin {
32-
from {
33-
transform: rotate(0deg);
34-
}
35-
to {
36-
transform: rotate(360deg);
37-
}
38-
}

‎client/src/App.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import React from 'react';
2-
import logo from './logo.svg';
3-
import './App.css';
1+
import React from "react";
2+
import logo from "./logo.svg";
3+
import "./App.css";
4+
import AboutUs from "./components/AboutUs/AboutUs";
5+
import Commiittee from "./components/CommitteeMembers/committee";
6+
import Homepage from "./components/Homepage/Homepage";
7+
import Timeline from "./components/Timeline/timeline";
8+
import ContactUs from "./components/Contact-Us/ContactUs";
49

510
function App() {
611
return (
7-
<div className="App">
8-
<header className="App-header">
9-
<img src={logo} className="App-logo" alt="logo" />
10-
<h1>GameOfSource</h1>
11-
</header>
12-
</div>
12+
<>
13+
<Homepage />
14+
</>
1315
);
1416
}
15-
1617
export default App;

‎client/src/assets/21.png‎

987 KB
Loading

‎client/src/assets/anywhere.png‎

34.3 KB
Loading

‎client/src/assets/interaction.png‎

34.3 KB
Loading

‎client/src/assets/leader.png‎

48.6 KB
Loading

‎client/src/assets/network.png‎

33.4 KB
Loading

0 commit comments

Comments
 (0)