diff --git a/package-lock.json b/package-lock.json index e312040..4add6d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "acm-css-website", "version": "0.1.0", "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.3.0", + "@fortawesome/free-solid-svg-icons": "^6.3.0", + "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -2696,6 +2699,51 @@ "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz", "integrity": "sha512-BpiZLBWdLFw+qFel9p3Zs1jD6QmH7Ii4aTDu6+vx8ShdidChZUXqDhYJly4ZjSgQh54miXbBgBrk0S+jTIh/Qg==" }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz", + "integrity": "sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz", + "integrity": "sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz", + "integrity": "sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@grpc/grpc-js": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz", @@ -17141,19 +17189,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", diff --git a/package.json b/package.json index 177acc8..5f6b0f6 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,14 @@ "private": true, "homepage": "https://pec-css.github.io/acm-css-website", "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.3.0", + "@fortawesome/free-solid-svg-icons": "^6.3.0", + "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", - "firebase": "^9.17.1", "bootstrap": "^5.2.3", + "firebase": "^9.17.1", "localforage": "^1.10.0", "match-sorter": "^6.3.1", "react": "^18.2.0", diff --git a/public/images/Aditya_Rana.jpg b/public/images/Aditya_Rana.jpg new file mode 100644 index 0000000..4977e86 Binary files /dev/null and b/public/images/Aditya_Rana.jpg differ diff --git a/public/images/Aniket.jpeg b/public/images/Aniket.jpeg new file mode 100644 index 0000000..fd15800 Binary files /dev/null and b/public/images/Aniket.jpeg differ diff --git a/public/images/Arihant.jpg b/public/images/Arihant.jpg new file mode 100644 index 0000000..108e0a5 Binary files /dev/null and b/public/images/Arihant.jpg differ diff --git a/public/images/Arjun Kathail.jpg b/public/images/Arjun Kathail.jpg new file mode 100644 index 0000000..df25ef2 Binary files /dev/null and b/public/images/Arjun Kathail.jpg differ diff --git a/public/images/Aseem Mangla.jpg b/public/images/Aseem Mangla.jpg new file mode 100644 index 0000000..bc0ecd5 Binary files /dev/null and b/public/images/Aseem Mangla.jpg differ diff --git a/public/images/Aseem.png b/public/images/Aseem.png new file mode 100644 index 0000000..0535fa1 Binary files /dev/null and b/public/images/Aseem.png differ diff --git a/public/images/Bhavesh_Kumar_Picture.jpg b/public/images/Bhavesh_Kumar_Picture.jpg new file mode 100644 index 0000000..786d95a Binary files /dev/null and b/public/images/Bhavesh_Kumar_Picture.jpg differ diff --git a/public/images/D Ajay Kumar.jpg b/public/images/D Ajay Kumar.jpg new file mode 100644 index 0000000..262a8b4 Binary files /dev/null and b/public/images/D Ajay Kumar.jpg differ diff --git a/public/images/Deepanshu_Jindal.png b/public/images/Deepanshu_Jindal.png new file mode 100644 index 0000000..c6a34c9 Binary files /dev/null and b/public/images/Deepanshu_Jindal.png differ diff --git a/public/images/Dhruv Kauts_.jpg b/public/images/Dhruv Kauts_.jpg new file mode 100644 index 0000000..92c5278 Binary files /dev/null and b/public/images/Dhruv Kauts_.jpg differ diff --git a/public/images/Dhruv Purwar.jpg b/public/images/Dhruv Purwar.jpg new file mode 100644 index 0000000..643422e Binary files /dev/null and b/public/images/Dhruv Purwar.jpg differ diff --git a/public/images/GuneetKaur.HEIC b/public/images/GuneetKaur.HEIC new file mode 100644 index 0000000..dd43ff8 Binary files /dev/null and b/public/images/GuneetKaur.HEIC differ diff --git a/public/images/IMG_7940.PNG b/public/images/IMG_7940.PNG new file mode 100644 index 0000000..8a1573a Binary files /dev/null and b/public/images/IMG_7940.PNG differ diff --git a/public/images/Om Bindal.jpg b/public/images/Om Bindal.jpg new file mode 100644 index 0000000..359bb41 Binary files /dev/null and b/public/images/Om Bindal.jpg differ diff --git a/public/images/Photo Nibhrit.jpg b/public/images/Photo Nibhrit.jpg new file mode 100644 index 0000000..9549caf Binary files /dev/null and b/public/images/Photo Nibhrit.jpg differ diff --git a/public/images/Sehajbir Singh_.jpg b/public/images/Sehajbir Singh_.jpg new file mode 100644 index 0000000..388bf9c Binary files /dev/null and b/public/images/Sehajbir Singh_.jpg differ diff --git a/public/images/Tushar_Malik.jpg b/public/images/Tushar_Malik.jpg new file mode 100644 index 0000000..4f70d22 Binary files /dev/null and b/public/images/Tushar_Malik.jpg differ diff --git a/public/images/UtkarshGoel.png b/public/images/UtkarshGoel.png new file mode 100644 index 0000000..59722f2 Binary files /dev/null and b/public/images/UtkarshGoel.png differ diff --git a/public/images/Vernie Thorpe.jpg b/public/images/Vernie Thorpe.jpg new file mode 100644 index 0000000..37e0bf9 Binary files /dev/null and b/public/images/Vernie Thorpe.jpg differ diff --git a/public/images/Vibhu Bhanot.jpg b/public/images/Vibhu Bhanot.jpg new file mode 100644 index 0000000..d3dc83f Binary files /dev/null and b/public/images/Vibhu Bhanot.jpg differ diff --git a/public/images/daksh.jpg b/public/images/daksh.jpg new file mode 100644 index 0000000..af9a554 Binary files /dev/null and b/public/images/daksh.jpg differ diff --git a/src/App.js b/src/App.js index 14658fb..a6800d4 100644 --- a/src/App.js +++ b/src/App.js @@ -5,19 +5,25 @@ import Navbar from "./components/Navbar/Navbar"; import Footer from "./components/Footer/Footer"; import Home from "./components/Home/Home"; import GithubChart from "./components/GithubChart/GithubChart"; +import Team from "./components/Team/Team"; +import About from "./components/About/About"; const router = createBrowserRouter([ { path: "/", element: }, + { path: '/team', element: }, + { path: '/about', element: }, // Setting home page as default - { path: "*", element:}, -]); + { path: "*", element:} +], { + basename: '/acm-css-website', +}); function App() { return (
- +
); diff --git a/src/components/About/About.js b/src/components/About/About.js new file mode 100644 index 0000000..e8c247b --- /dev/null +++ b/src/components/About/About.js @@ -0,0 +1,81 @@ +import React, { Component } from 'react'; +import { Container, Card, Row, Col, Image, Button } from 'react-bootstrap'; +import './about.css'; +import img1 from './img/img1.jpg' + +class About extends Component { + render() { + return ( + +
+

Who are we?

+ + + The Association for Computing Machinery (ACM) is an international learned society for computing. It was founded in 1947 and is the world’s largest scientific and educational computing society. The ACM is an umbrella organization for academic and scholarly interests in computer science. PEC ACM CSS is a community of learners and leaders who teach each other to supplement the development of the members’ college education, specifically with regards to Computer Science. The vision of PEC ACM is to provide students exposure to the wide array of topics that fall under the umbrella of the field of computer science. + + + ACM Groups + + + +
+ +
+

Our mission

+ + + Lorem ipsum dolor sit amet, consectetur adipisci elit, + sed eiusmod tempor incidunt ut labore et dolore magna aliqua. + Ut enim ad minim veniam, quis nostrum exercitationem ullam + corporis suscipit laboriosam, nisi ut aliquid ex ea commodi + consequatur. Quis aute iure reprehenderit in voluptate velit + esse cillum dolore eu fugiat nulla pariatur. Excepteur sint + obcaecat cupiditat non proident, sunt in culpa qui officia + deserunt mollit anim id est laborum. + + + ACM Groups + + +
+ + + + ); + } +} +export default About; \ No newline at end of file diff --git a/src/components/About/about.css b/src/components/About/about.css new file mode 100644 index 0000000..f1a78b6 --- /dev/null +++ b/src/components/About/about.css @@ -0,0 +1,39 @@ +.about_section{ + padding-top:3rem; + padding-bottom:4rem; + +} +#left{ + text-align: left; +} +#right{ + text-align: right; +} +.about_section_heading { + margin-bottom: 3rem; + font-size: 2.5rem; + +} +.about_section_content{ + margin-top: 2rem; + +} +.about_section_content.text_content{ + color: #656565; + /* width: 55%; */ + /* margin-left: auto; + margin-right: auto; */ + font-size: 1.15rem; + max-width: 45%; +} + +.about_section_content_img{ + /* width:80%; */ + /* margin: 4rem auto; + padding: 2rem 0; */ + max-width: 45%; + border-radius: 50px; +} +img{ + border-radius: 15px; +} diff --git a/src/components/About/img/img1.jpg b/src/components/About/img/img1.jpg new file mode 100644 index 0000000..d4d91be Binary files /dev/null and b/src/components/About/img/img1.jpg differ diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index dc319b3..5770197 100644 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -51,13 +51,14 @@ const NavigationMenu = () => { return ( - pecacm + pecacm