diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e7c10ec..bc53348 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -41,13 +41,15 @@ "react-outside-click-handler": "^1.3.0", "react-router-bootstrap": "0.26.2", "react-router-dom": "^6.4.3", + "react-router-scroll-top": "^0.3.1", "react-scripts": "^5.0.1", "react-select": "^5.7.2", "react-svg-worldmap": "^2.0.0-alpha.16", "react-tag-box": "^1.6.0", "reaselct": "^2.1.0", "rsuite": "^5.33.1", - "web-vitals": "^2.1.0" + "web-vitals": "^2.1.0", + "with-router": "^1.0.1" }, "devDependencies": { "@types/jquery": "^3.5.16", @@ -16477,6 +16479,16 @@ "react-dom": ">=16.8" } }, + "node_modules/react-router-scroll-top": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/react-router-scroll-top/-/react-router-scroll-top-0.3.1.tgz", + "integrity": "sha512-sdIYw7SVAqWNcH/WhNHIPsOrIVUEUUHYuddGj7aMNjRCTwAfZo2B/CHqXElAnDdSd9MMCfVFfWxtroi1ozTb8Q==", + "peerDependencies": { + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-router-dom": "^5.3.0" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", @@ -20074,6 +20086,11 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, + "node_modules/with-router": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/with-router/-/with-router-1.0.1.tgz", + "integrity": "sha512-Jc/rG+uhJ9iqRWJjQAB9kKQiwk+L35p9OsXqDJU/n/BoFEsgEQLcXzYZ/MS4jsnXsjYs07C/hQhsSZSUir85NA==" + }, "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index b232348..820f467 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -36,13 +36,16 @@ "react-outside-click-handler": "^1.3.0", "react-router-bootstrap": "0.26.2", "react-router-dom": "^6.4.3", + "react-router-scroll-top": "^0.3.1", "react-scripts": "^5.0.1", + "react-scroll-to-top": "^3.0.0", "react-select": "^5.7.2", "react-svg-worldmap": "^2.0.0-alpha.16", "react-tag-box": "^1.6.0", "reaselct": "^2.1.0", "rsuite": "^5.33.1", - "web-vitals": "^2.1.0" + "web-vitals": "^2.1.0", + "with-router": "^1.0.1" }, "scripts": { "start": "react-scripts start", diff --git a/frontend/public/index.html b/frontend/public/index.html index 799bff3..60b8597 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,21 +1,19 @@ - - - - - - - - - - - ELIXIR Beacon network demo - - - -
- - - + + + + + \ No newline at end of file diff --git a/frontend/src/App.css b/frontend/src/App.css index e0b455d..1b8de9a 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -99,7 +99,7 @@ html { margin-bottom: 31px; color: rgba(12, 16, 64, 0.606); font-size: 16px; - font-feature-settings: 'pcap', 'c2pc', "pcap", "c2pc"; + font-feature-settings: 'pcap', 'c2pc', 'pcap', 'c2pc'; font-variant-caps: all-petite-caps; } @@ -285,7 +285,6 @@ html { sans-serif; } - .labelVariantsTittle { font-size: 16px; margin-bottom: 27px; @@ -654,6 +653,8 @@ select { /* justify-content: center; */ align-content: center; align-items: center; + padding-bottom: 10px; + min-height: 630px; } .resultSet2 { diff --git a/frontend/src/App.js b/frontend/src/App.js index ec73074..04b8da4 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -19,6 +19,7 @@ import Validator from './components/Validator/Validator' import SignInFormNoLS from './components/SignIn/SignInFormNoLS' import AboutSection from './components/AboutSection/AboutSection' import SignInOptions from './components/SignInOptions/SignInOptions' +import Footer from './components/Footer/Footer' function App () { return ( @@ -42,6 +43,7 @@ function App () { } /> } /> +