diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml
new file mode 100644
index 000000000..b28738e6a
--- /dev/null
+++ b/.github/workflows/buildtest.yml
@@ -0,0 +1,28 @@
+name: Build and Test
+
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ build-and-test:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Set up Node.js
+ uses: actions/setup-node@v2
+ with:
+ node-version: 14
+
+ - name: Install dependencies
+ run: npm install
+
+ - name: Build
+ run: npm run build
+
+ - name: Run tests
+ run: npm test
diff --git a/README.md b/README.md
index 8936da7e9..f41104c31 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,27 @@
Empowering Tomorrow: By Students For Students
Our mission is to educate through workshops, connect minds for innovation, and drive change. DIEMS IETE ISF nurtures a culture of curiosity, collaboration, and positive tech-driven transformation.
+<<<<<<< HEAD
+=======
+
What stack is IETE-Website built on?
+
+
![react logo](https://img.shields.io/static/v1?message=React&logo=react&label=&color=61DAFB&logoColor=white&labelColor=&style=for-the-badge)
+
![javascript logo](https://img.shields.io/static/v1?message=JavaScript&logo=javascript&label=&color=F7DF1E&logoColor=white&labelColor=&style=for-the-badge)
+
![html5 logo](https://img.shields.io/static/v1?message=HTML5&logo=html5&label=&color=E34F26&logoColor=white&labelColor=&style=for-the-badge)
+
![css3 logo](https://img.shields.io/static/v1?message=CSS3&logo=css3&label=&color=1572B6&logoColor=white&labelColor=&style=for-the-badge)
+
+
+ ## Contributions
+ Please refer to [contribution guide](https://github.com/jivan3003/IETE-Website/blob/main/contributing.md) and [Code of conduct](https://github.com/DIEMS-HUB/IETE-Website/blob/main/CODE_OF_CONDUCT.md) before contributing
+
+Social media handles :
+
+
+
+
+
+
+>>>>>>> f18f63b738efe6de79fa1f8eeaeef9199742eca9
### Contributions
diff --git a/package-lock.json b/package-lock.json
index 0559d55df..80efd0a9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,11 +16,13 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.3.1",
+ "framer-motion": "^10.16.1",
"gh-pages": "^6.0.0",
"react": "^18.2.0",
"react-bootstrap": "^2.8.0",
"react-dom": "^18.2.0",
"react-icons": "^4.10.1",
+ "react-parallax-tilt": "^1.7.162",
"react-router-dom": "^6.15.0",
"react-scripts": "5.0.1",
"react-tsparticles": "^2.12.2",
@@ -38,9 +40,9 @@
}
},
"node_modules/@adobe/css-tools": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.0.tgz",
- "integrity": "sha512-+RNNcQvw2V1bmnBTPAtOLfW/9mhH2vC67+rUSi5T8EtEWt6lEnGNY2GuhZ1/YwbgikT1TkhvidCDmN5Q5YCo/w=="
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+ "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="
},
"node_modules/@alloc/quick-lru": {
"version": "5.2.0",
@@ -8543,6 +8545,44 @@
"url": "https://www.patreon.com/infusion"
}
},
+ "node_modules/framer-motion": {
+ "version": "10.16.1",
+ "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.16.1.tgz",
+ "integrity": "sha512-K6TXr5mZtitC/dxQCBdg7xzdN0d5IAIrlaqCPKtIQVdzVPGC0qBuJKXggHX1vjnP5gPOFwB1KbCCTWcnFc3kWg==",
+ "dependencies": {
+ "tslib": "^2.4.0"
+ },
+ "optionalDependencies": {
+ "@emotion/is-prop-valid": "^0.8.2"
+ },
+ "peerDependencies": {
+ "react": "^18.0.0",
+ "react-dom": "^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "react": {
+ "optional": true
+ },
+ "react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/framer-motion/node_modules/@emotion/is-prop-valid": {
+ "version": "0.8.8",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+ "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+ "optional": true,
+ "dependencies": {
+ "@emotion/memoize": "0.7.4"
+ }
+ },
+ "node_modules/framer-motion/node_modules/@emotion/memoize": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+ "optional": true
+ },
"node_modules/fresh": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -14576,6 +14616,15 @@
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
+ "node_modules/react-parallax-tilt": {
+ "version": "1.7.163",
+ "resolved": "https://registry.npmjs.org/react-parallax-tilt/-/react-parallax-tilt-1.7.163.tgz",
+ "integrity": "sha512-2hqXmH4MPGxCABOOza44WDQH24cpId2xsvDhRi/bXEtqOdSWZHFLa03KatraW2sYxP8J7W3X85o7/X480msJRg==",
+ "peerDependencies": {
+ "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+ "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+ }
+ },
"node_modules/react-refresh": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -17792,9 +17841,9 @@
"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
},
"@adobe/css-tools": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.0.tgz",
- "integrity": "sha512-+RNNcQvw2V1bmnBTPAtOLfW/9mhH2vC67+rUSi5T8EtEWt6lEnGNY2GuhZ1/YwbgikT1TkhvidCDmN5Q5YCo/w=="
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+ "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="
},
"@alloc/quick-lru": {
"version": "5.2.0",
@@ -23910,6 +23959,32 @@
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
},
+ "framer-motion": {
+ "version": "10.16.1",
+ "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.16.1.tgz",
+ "integrity": "sha512-K6TXr5mZtitC/dxQCBdg7xzdN0d5IAIrlaqCPKtIQVdzVPGC0qBuJKXggHX1vjnP5gPOFwB1KbCCTWcnFc3kWg==",
+ "requires": {
+ "@emotion/is-prop-valid": "^0.8.2",
+ "tslib": "^2.4.0"
+ },
+ "dependencies": {
+ "@emotion/is-prop-valid": {
+ "version": "0.8.8",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+ "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+ "optional": true,
+ "requires": {
+ "@emotion/memoize": "0.7.4"
+ }
+ },
+ "@emotion/memoize": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+ "optional": true
+ }
+ }
+ },
"fresh": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -28234,6 +28309,12 @@
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
+ "react-parallax-tilt": {
+ "version": "1.7.163",
+ "resolved": "https://registry.npmjs.org/react-parallax-tilt/-/react-parallax-tilt-1.7.163.tgz",
+ "integrity": "sha512-2hqXmH4MPGxCABOOza44WDQH24cpId2xsvDhRi/bXEtqOdSWZHFLa03KatraW2sYxP8J7W3X85o7/X480msJRg==",
+ "requires": {}
+ },
"react-refresh": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
diff --git a/package.json b/package.json
index 7416c5ff4..ba604c0dc 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,8 @@
"react-icons": "^4.10.1",
"react-parallax-tilt": "^1.7.162",
"react-router-dom": "^6.15.0",
+ "react-scripts": "^5.0.1",
+ "styled-components": "^6.0.7",
"react-scripts": "5.0.1",
"react-tsparticles": "^2.12.2",
"styled-components": "^6.0.7",
diff --git a/src/Style.css b/src/Style.css
index f7f7579a8..67644c6a7 100644
--- a/src/Style.css
+++ b/src/Style.css
@@ -149,7 +149,7 @@ button:focus {
padding: 0.8rem 1rem !important;
}
-@media (max-width: 767px) {
+@media (max-width: 768px) {
.nav-link {
padding: 0.7rem 1rem !important;
}
@@ -411,8 +411,8 @@ button:focus {
.footer {
background-color: #FA1632;
bottom: 0 !important;
- padding-top: 2px !important;
- padding-bottom: 2px !important
+ padding-top: 10px !important;
+ padding-bottom: 8px !important;
}
.footer-copywright {