From 83e6648f2716d66314ef13f25aa1925217d3cc26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Aug 2020 00:31:59 +0530 Subject: [PATCH 1/5] chore: bump elliptic from 6.5.2 to 6.5.3 (#46) Created File ErrorPage.js for Error page Create ErrorPage.css Update Routes.js Changed Route to AuthRoute Removed Navbar and Extra Classes from ErrorPage.js Updated ErrorPage.css Changed Defualt function to Class component Update ErrorPage.css --- src/Routes.js | 3 ++- src/components/ErrorPage.js | 20 ++++++++++++++++++ src/styles/ErrorPage.css | 41 +++++++++++++++++++++++++++++++++++++ yarn.lock | 29 +++++++++++++++++++------- 4 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 src/components/ErrorPage.js create mode 100644 src/styles/ErrorPage.css diff --git a/src/Routes.js b/src/Routes.js index 10a5342..5f5b474 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -4,6 +4,7 @@ import Login from './components/Login' import Register from './components/Register' import Dashboard from './components/Dashboard' import Forms from './components/Forms' +import ErrorPage from './components/ErrorPage' import Submission from './components/Submission' import Questions from './components/Questions' import { login, register, dashboard, forms, upload, submission, urlBaseFrontend } from './urls' @@ -23,7 +24,7 @@ export default class Routes extends Component { - } /> + ) diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js new file mode 100644 index 0000000..3d96faa --- /dev/null +++ b/src/components/ErrorPage.js @@ -0,0 +1,20 @@ +import React, { Component } from 'react' +import './../styles/ErrorPage.css' +import './../styles/App.css' + + +class ErrorPage extends Component { + render() { + return ( +
+
+

404

+

Oops! Page Not Found

+

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

+
+
+ ) + } +} + +export default ErrorPage diff --git a/src/styles/ErrorPage.css b/src/styles/ErrorPage.css new file mode 100644 index 0000000..4e1164e --- /dev/null +++ b/src/styles/ErrorPage.css @@ -0,0 +1,41 @@ +* { + margin: 0; + padding: 0; +} + +.errorPage { + position: absolute; + top: 15%; + left: 17%; + right: 17%; + color: whitesmoke; + bottom: 20%; + display: flex; + align-items: center; + justify-content: center; +} + +.errorPage_content { + max-width: 600px; + text-align: center; +} + +.errorPage_content h1 { + color: #2185D0;; + font-size: 10vw; + font-weight: bolder; + line-height: 1em; +} + +.errorPage_content h4 { + font-size: 2em; + margin-bottom: 20px; + text-transform: uppercase; + max-width: 600px; + color: #0d0d0d; +} + +.errorPage_content p { + font-size: 1.4em; + color: gray; +} diff --git a/yarn.lock b/yarn.lock index ee64497..de4e2bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2397,9 +2397,9 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== + version "4.11.9" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" + integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== body-parser@1.19.0: version "1.19.0" @@ -3833,9 +3833,9 @@ electron-to-chromium@^1.3.378: integrity sha512-NK9DBBYEBb5f9D7zXI0hiE941gq3wkBeQmXs1ingigA/jnTg5mhwY2Z5egwA+ZI8OLGKCx0h1Cl8/xeuIBuLlg== elliptic@^6.0.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" - integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -6338,7 +6338,7 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: array-includes "^3.0.3" object.assign "^4.1.0" -keyboard-key@^1.0.4: +keyboard-key@^1.0.2, keyboard-key@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.1.0.tgz#6f2e8e37fa11475bb1f1d65d5174f1b35653f5b7" integrity sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ== @@ -6916,6 +6916,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" +moment@^2.22.2, moment@^2.27.0: + version "2.27.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" + integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -9384,6 +9389,16 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" +semantic-ui-calendar-react@^0.15.3: + version "0.15.3" + resolved "https://registry.yarnpkg.com/semantic-ui-calendar-react/-/semantic-ui-calendar-react-0.15.3.tgz#eb25826076a2967d9bb04e0567824366f5eb6fe4" + integrity sha512-cXlg/dJf0z/dydnol1GCy9ssccXBAGYhmka9W2KNXqqW+B0mgPhu6ugWOjGD4i99e3dnNl1QVqYvQpQcpkcEIg== + dependencies: + keyboard-key "^1.0.2" + lodash "^4.17.15" + moment "^2.22.2" + prop-types "^15.6.2" + semantic-ui-css@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/semantic-ui-css/-/semantic-ui-css-2.4.1.tgz#f5aea39fafb787cbd905ec724272a3f9cba9004a" From 36ff54559781089519bbfac0774b787d1e8a8c1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Aug 2020 00:31:59 +0530 Subject: [PATCH 2/5] chore: bump elliptic from 6.5.2 to 6.5.3 (#46) Created File ErrorPage.js for Error page Create ErrorPage.css Update Routes.js Changed Route to AuthRoute Removed Navbar and Extra Classes from ErrorPage.js Updated ErrorPage.css Changed Defualt function to Class component Update ErrorPage.css --- src/Routes.js | 3 ++- src/components/ErrorPage.js | 20 ++++++++++++++++++ src/styles/ErrorPage.css | 41 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/components/ErrorPage.js create mode 100644 src/styles/ErrorPage.css diff --git a/src/Routes.js b/src/Routes.js index 10a5342..5f5b474 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -4,6 +4,7 @@ import Login from './components/Login' import Register from './components/Register' import Dashboard from './components/Dashboard' import Forms from './components/Forms' +import ErrorPage from './components/ErrorPage' import Submission from './components/Submission' import Questions from './components/Questions' import { login, register, dashboard, forms, upload, submission, urlBaseFrontend } from './urls' @@ -23,7 +24,7 @@ export default class Routes extends Component { - } /> + ) diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js new file mode 100644 index 0000000..3d96faa --- /dev/null +++ b/src/components/ErrorPage.js @@ -0,0 +1,20 @@ +import React, { Component } from 'react' +import './../styles/ErrorPage.css' +import './../styles/App.css' + + +class ErrorPage extends Component { + render() { + return ( +
+
+

404

+

Oops! Page Not Found

+

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

+
+
+ ) + } +} + +export default ErrorPage diff --git a/src/styles/ErrorPage.css b/src/styles/ErrorPage.css new file mode 100644 index 0000000..4e1164e --- /dev/null +++ b/src/styles/ErrorPage.css @@ -0,0 +1,41 @@ +* { + margin: 0; + padding: 0; +} + +.errorPage { + position: absolute; + top: 15%; + left: 17%; + right: 17%; + color: whitesmoke; + bottom: 20%; + display: flex; + align-items: center; + justify-content: center; +} + +.errorPage_content { + max-width: 600px; + text-align: center; +} + +.errorPage_content h1 { + color: #2185D0;; + font-size: 10vw; + font-weight: bolder; + line-height: 1em; +} + +.errorPage_content h4 { + font-size: 2em; + margin-bottom: 20px; + text-transform: uppercase; + max-width: 600px; + color: #0d0d0d; +} + +.errorPage_content p { + font-size: 1.4em; + color: gray; +} From baa1bca7c3e9f27c319d8cba8645757450fd032b Mon Sep 17 00:00:00 2001 From: Shipra Verma Date: Fri, 5 Feb 2021 08:08:17 +0530 Subject: [PATCH 3/5] semantic ui used --- src/components/ErrorPage.js | 46 +++++++++++++++++++++++++++---------- src/styles/ErrorPage.css | 15 ------------ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js index 3d96faa..5336b83 100644 --- a/src/components/ErrorPage.js +++ b/src/components/ErrorPage.js @@ -1,20 +1,42 @@ import React, { Component } from 'react' import './../styles/ErrorPage.css' import './../styles/App.css' - +import { Header, Container } from 'semantic-ui-react'; class ErrorPage extends Component { - render() { - return ( -
-
-

404

-

Oops! Page Not Found

-

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

-
-
- ) + render() { + return ( +
+
+ + +
+
+

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

+
+
+ ) } -} +} export default ErrorPage diff --git a/src/styles/ErrorPage.css b/src/styles/ErrorPage.css index 4e1164e..ed15c31 100644 --- a/src/styles/ErrorPage.css +++ b/src/styles/ErrorPage.css @@ -20,21 +20,6 @@ text-align: center; } -.errorPage_content h1 { - color: #2185D0;; - font-size: 10vw; - font-weight: bolder; - line-height: 1em; -} - -.errorPage_content h4 { - font-size: 2em; - margin-bottom: 20px; - text-transform: uppercase; - max-width: 600px; - color: #0d0d0d; -} - .errorPage_content p { font-size: 1.4em; color: gray; From dce80226e61f9024491c34c5d37319cc58abdd7a Mon Sep 17 00:00:00 2001 From: Shipra Verma Date: Fri, 5 Feb 2021 08:09:34 +0530 Subject: [PATCH 4/5] formatted document --- src/components/ErrorPage.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js index 5336b83..9204507 100644 --- a/src/components/ErrorPage.js +++ b/src/components/ErrorPage.js @@ -7,9 +7,7 @@ class ErrorPage extends Component { render() { return (
-
- - +
-

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

+

Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.

+
-
) } } From 1680cefcc88ee38fbef55a524d5caa16a605231a Mon Sep 17 00:00:00 2001 From: Shipra Verma Date: Fri, 5 Feb 2021 08:12:23 +0530 Subject: [PATCH 5/5] Container removed --- src/components/ErrorPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js index 9204507..a5a4c8f 100644 --- a/src/components/ErrorPage.js +++ b/src/components/ErrorPage.js @@ -1,7 +1,7 @@ import React, { Component } from 'react' import './../styles/ErrorPage.css' import './../styles/App.css' -import { Header, Container } from 'semantic-ui-react'; +import { Header } from 'semantic-ui-react'; class ErrorPage extends Component { render() {