Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Design a 404 page for default redirects #57

Merged
merged 6 commits into from
Feb 6, 2021
Merged

UI: Design a 404 page for default redirects #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83e6648
chore: bump elliptic from 6.5.2 to 6.5.3 (#46)
dependabot[bot] Aug 15, 2020
36ff545
chore: bump elliptic from 6.5.2 to 6.5.3 (#46)
dependabot[bot] Aug 15, 2020
81f7d81
Fork update
Aaishpra Feb 1, 2021
baa1bca
semantic ui used
Aaishpra Feb 5, 2021
dce8022
formatted document
Aaishpra Feb 5, 2021
1680cef
Container removed
Aaishpra Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -23,7 +24,7 @@ export default class Routes extends Component {
<AuthRoute path={login()} component={Login} />
<AuthRoute path={register()} component={Register} />
<Route path={upload()} component={Upload} />
<Route render={() => <Redirect to='/' />} />
<AuthRoute component={ErrorPage} />
</Switch>
</>
)
Expand Down
20 changes: 20 additions & 0 deletions src/components/ErrorPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React, { Component } from 'react'
import './../styles/ErrorPage.css'
import './../styles/App.css'


class ErrorPage extends Component {
render() {
return (
<div className="errorPage">
<div className="errorPage_content">
<h1>404</h1>
<h4>Oops! Page Not Found</h4>
<p>Sorry, the page you were looking for doesn't exist. If you think something is wrong, try again.</p>
</div>
</div>
)
}
}

export default ErrorPage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Throughout the application class method has been used.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Aaishpra Make these changes

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already done @bismitaguha

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bismitaguha is this correct now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

41 changes: 41 additions & 0 deletions src/styles/ErrorPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
* {
margin: 0;
padding: 0;
}

.errorPage {
position: absolute;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Aaishpra Can I ask why are you using absolute positioning when this can be achieved with relative positioning as well. This way the overlapping issue on small screens mentioned by @codesankalp will also resolve.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

relative is not gonna work on larger screen

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;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use className (err-num and err-text) instead of style={{}} for Header in ErrorPage.js and add the styles in ErrorPage.css as mentioned below?

Suggested change
}
}
.ui.header.err-num {
color: #2185D0;
font-size: 10vw;
font-weight: bolder;
line-height: 1em;
text-transform: uppercase;
}
.ui.header.err-text {
font-size: 2em;
margin-bottom: 20px;
text-transform: uppercase;
max-width: 600px;
color: #0d0d0d;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any specific reason @codesankalp ? Is this a common convention?

29 changes: 22 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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==

[email protected]:
version "1.19.0"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down