From a41a22f64f2625a362d8af6d071f96676daf9d69 Mon Sep 17 00:00:00 2001 From: mansi066 Date: Mon, 28 Oct 2024 13:05:05 +0530 Subject: [PATCH 1/4] Changes in footer --- paras/package-lock.json | 58 +++++++++++++++++++++++++++++++++++++++++ paras/package.json | 1 + paras/public/first.css | 49 ++++++++++++++++++++++++++++++++-- paras/public/index.html | 46 +++++++++++++++++++++++++++++--- 4 files changed, 148 insertions(+), 6 deletions(-) diff --git a/paras/package-lock.json b/paras/package-lock.json index 7906c1b..968702d 100644 --- a/paras/package-lock.json +++ b/paras/package-lock.json @@ -11,6 +11,7 @@ "@testing-library/jest-dom": "^6.5.0", "@testing-library/react": "^16.0.1", "@testing-library/user-event": "^14.5.2", + "paras": "file:", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.27.0", @@ -3541,6 +3542,25 @@ "url": "https://github.com/sponsors/gregberge" } }, + "node_modules/@testing-library/dom": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz", + "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@testing-library/jest-dom": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.5.0.tgz", @@ -3638,6 +3658,12 @@ "node": ">=10.13.0" } }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "peer": true + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -6721,6 +6747,12 @@ "node": ">=6.0.0" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "peer": true + }, "node_modules/dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -11221,6 +11253,15 @@ "yallist": "^3.0.2" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "peer": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -11928,6 +11969,10 @@ "tslib": "^2.0.3" } }, + "node_modules/paras": { + "resolved": "", + "link": true + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -16254,6 +16299,19 @@ "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/paras/package.json b/paras/package.json index 26c3a95..e708dae 100644 --- a/paras/package.json +++ b/paras/package.json @@ -6,6 +6,7 @@ "@testing-library/jest-dom": "^6.5.0", "@testing-library/react": "^16.0.1", "@testing-library/user-event": "^14.5.2", + "paras": "file:", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.27.0", diff --git a/paras/public/first.css b/paras/public/first.css index f8a670f..1e54934 100644 --- a/paras/public/first.css +++ b/paras/public/first.css @@ -38,9 +38,54 @@ footer { } .social-links a:hover { - color: #ccc; + color: #f39c12; } .fa { font-size: 24px; - } \ No newline at end of file + } + +.footer-content { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + align-items: flex-start; + margin-bottom: 20px; +} + +.footer-section { + flex: 1; + min-width: 200px; + margin: 10px; +} + +.footer-section h3 { + margin-bottom: 15px; +} + +.footer-section ul { + list-style-type: none; + padding: 0; +} + +.footer-section ul li { + margin: 5px 0; +} + +.footer-section ul li a { + color: white; + text-decoration: none; +} + +.footer-section ul li a:hover { + text-decoration: underline; + color:blue; +} + +.footer-bottom { + border-top: 1px solid #444; + padding-top: 10px; + margin-top: 20px; +} + + diff --git a/paras/public/index.html b/paras/public/index.html index 661185a..86133f7 100644 --- a/paras/public/index.html +++ b/paras/public/index.html @@ -179,14 +179,52 @@
Voting System
-

© 2024 Tic-Tac-Toe Game

+ +
+
+

About Tic-Tac-Toe 2024

+

Welcome to the best online Tic-Tac-Toe experience! Play against friends, challenge the AI, and enjoy the fun!

+
+ + +
+

Quick Links

+ +
+
+

Legal

+ +
+
+

Contact Us

+ +
+
+
+

© 2024 Tic-Tac-Toe Game. All rights reserved.

+
+ + + From 3c02bdd169d7e4450d65341de22aafff8ad21821 Mon Sep 17 00:00:00 2001 From: mansi066 Date: Mon, 28 Oct 2024 14:27:26 +0530 Subject: [PATCH 2/4] change vercel --- paras/vercel.json | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/paras/vercel.json b/paras/vercel.json index 6fd5f30..1cdcfc6 100644 --- a/paras/vercel.json +++ b/paras/vercel.json @@ -6,13 +6,29 @@ } -"rewrites":[ -{"source" : "./(.*)", "destination" : "/"} -], -"git": { -"deploymentEnabled": { -"main": false -} +{ + "version": 2, + "rewrites": [ + { + "source": "/(.*)", + "destination": "/" + } + ], + "git": { + "deploymentEnabled": { + "main": false + } + } } + +{ + "version": 2, + "builds": [ + { + "src": "index.html", + "use": "@vercel/static" + } + ] } + From 5fe67d8f53ed91eab750438e2890818cac1f6535 Mon Sep 17 00:00:00 2001 From: mansi066 Date: Mon, 28 Oct 2024 14:32:34 +0530 Subject: [PATCH 3/4] fix the error in vercel --- paras/vercel.json | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/paras/vercel.json b/paras/vercel.json index 1cdcfc6..fc70554 100644 --- a/paras/vercel.json +++ b/paras/vercel.json @@ -1,13 +1,11 @@ -{ - - "rewrites":[ - {"source" : "./(.*)", "destination" : "/"} - ] - -} - { "version": 2, + "builds": [ + { + "src": "index.html", + "use": "@vercel/static" + } + ], "rewrites": [ { "source": "/(.*)", @@ -20,15 +18,3 @@ } } } - -{ - "version": 2, - "builds": [ - { - "src": "index.html", - "use": "@vercel/static" - } - ] -} - - From be2ac902f252e3b6548eff04ddf3e9a505d590ae Mon Sep 17 00:00:00 2001 From: mansi066 Date: Mon, 28 Oct 2024 15:34:24 +0530 Subject: [PATCH 4/4] Enhance footer --- paras/public/first.css | 39 ++++++++++++++++++++++----------------- paras/public/index.html | 11 ++++------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/paras/public/first.css b/paras/public/first.css index 1e54934..4ba7116 100644 --- a/paras/public/first.css +++ b/paras/public/first.css @@ -1,14 +1,17 @@ footer { - position: fixed; - bottom: 0; - width: 100%; - background-color: #333; - color: #fff; - text-align: center; - padding: 20px; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); + position: relative; + bottom: -320px; + width: 100%; + background-color: #333; + color: #fff; + text-align: center; + padding: 20px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); +} + + + - } .footer-container { max-width: 800px; @@ -46,17 +49,19 @@ footer { } .footer-content { - display: flex; - flex-wrap: wrap; - justify-content: space-around; - align-items: flex-start; - margin-bottom: 20px; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + align-items: center; + flex-direction: row; + margin-left: 0px; + margin: 33px; } .footer-section { - flex: 1; - min-width: 200px; - margin: 10px; + flex: 1; + min-width: 200px; + margin: 5px; } .footer-section h3 { diff --git a/paras/public/index.html b/paras/public/index.html index 86133f7..a9fc43d 100644 --- a/paras/public/index.html +++ b/paras/public/index.html @@ -134,10 +134,7 @@ - To begin the development, run `npm start` or `yarn start`. - To create a production bundle, use `npm run build` or `yarn build`. - --> - +