From ab52be799d0cc4b220c5ea46d71ada66ececdc69 Mon Sep 17 00:00:00 2001 From: Sucheta Mahata Date: Thu, 4 Nov 2021 12:11:05 +0530 Subject: [PATCH] #1 linked sites in the footer, #2 temporary join us button link, #3 changed page title, #4 button component css change --- package-lock.json | 24 ++++++++++++++++++++++++ package.json | 1 + public/index.html | 4 ++-- src/components/Body/body.css | 25 ++++++++++++++++++++++--- src/components/Body/body.tsx | 6 ++++-- src/components/Footer/footer.css | 8 ++++++-- src/components/Footer/footer.tsx | 18 +++++++++++++----- 7 files changed, 72 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d26519..13f142c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7034,6 +7034,14 @@ "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, + "history": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz", + "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -12130,6 +12138,22 @@ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==" }, + "react-router": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.0.0.tgz", + "integrity": "sha512-FcTRCihYZvERMNbG54D9+Wkv2cj/OtoxNlA/87D7vxKYlmSmbF9J9XChI9Is44j/behEiOhbovgVZBhKQn+wgA==", + "requires": { + "history": "^5.0.3" + } + }, + "react-router-dom": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0.tgz", + "integrity": "sha512-bPXyYipf0zu6K7mHSEmNO5YqLKq2q9N+Dsahw9Xh3oq1IirsI3vbnIYcVWin6A0zWyHmKhMGoV7Gr0j0kcuVFg==", + "requires": { + "react-router": "6.0.0" + } + }, "react-scripts": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz", diff --git a/package.json b/package.json index 8da5743..817da93 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "@types/react-dom": "^17.0.9", "react": "^17.0.2", "react-dom": "^17.0.2", + "react-router-dom": "^6.0.0", "react-scripts": "4.0.3", "typescript": "^4.4.4", "web-vitals": "^1.1.2" diff --git a/public/index.html b/public/index.html index aa069f2..7dbf27e 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - + - React App + GDSC SNU diff --git a/src/components/Body/body.css b/src/components/Body/body.css index d105d0d..cc1774d 100644 --- a/src/components/Body/body.css +++ b/src/components/Body/body.css @@ -20,8 +20,20 @@ border-color: #4285F4; margin-top: 1rem; margin-left: 2rem; + color: antiquewhite; + font-size: .9rem; +} +.bodyLink{ + background: #4285F4; + color: antiquewhite; + text-decoration: none; + margin-left: 2rem; + padding: .5rem; + border-radius: 1rem; + padding-left: 2.2rem; + padding-right: 2.2rem; + font-size: .9rem; } - .bodyText{ color:#6D6D6D; font-size: 1.5rem; @@ -84,8 +96,9 @@ display: none; } .App-logo2{ - height: 70vmin; - display:block; + height: 60vmin; + display:flex; + margin-left: 2rem;; } .topCircle { height: 22vmin; @@ -96,6 +109,12 @@ .bodyButton{ width: 5rem; margin-top: 1.5rem; + font-size: .8rem; + } + .bodyLink{ + font-size: .8rem; + padding-left: 1.5rem; + padding-right: 1.5rem; } } \ No newline at end of file diff --git a/src/components/Body/body.tsx b/src/components/Body/body.tsx index 897b850..4bcea4c 100644 --- a/src/components/Body/body.tsx +++ b/src/components/Body/body.tsx @@ -2,6 +2,8 @@ import logo from '../../svgimageFiles/logo.svg'; import topcircle from '../../svgimageFiles/top-circle.svg'; import orangecircle from '../../svgimageFiles/leftOrangeCircle.svg'; import dottedDesign from '../../svgimageFiles/dottedDesign.svg' +//import { Redirect } from "react-router-dom"; + import './body.css' const Body = () => { @@ -17,8 +19,8 @@ const Body = () => { web, mobile, and google technologies in a peer-to-peer learning environment.

- - + Join Us +
google developer student club diff --git a/src/components/Footer/footer.css b/src/components/Footer/footer.css index 1a8d58f..0f65bee 100644 --- a/src/components/Footer/footer.css +++ b/src/components/Footer/footer.css @@ -1,6 +1,6 @@ .footerDiv{ width: 100vw; - height: 5vh; + height: 4vh; display: flex; justify-content: space-between; } @@ -15,7 +15,8 @@ .logo{ height: 4vmin; - margin: 2rem + margin-left: 4rem; + margin-top: 1rem; } @media (max-width: 1024px){ @@ -34,6 +35,9 @@ .footerSubDiv{ margin-left: 0rem; } + .logo{ + margin:2rem; + } .greenCircle{ height: 7.5vmin; } diff --git a/src/components/Footer/footer.tsx b/src/components/Footer/footer.tsx index 4cb8a66..9155cb9 100644 --- a/src/components/Footer/footer.tsx +++ b/src/components/Footer/footer.tsx @@ -10,15 +10,23 @@ const Footer = () => { return (
- google developer student club - google developer student club - google developer student club - google developer student club + + google developer student club + + + google developer student club + + + google developer student club + + + google developer student club +
google developer student club
) -} +} export default Footer \ No newline at end of file