Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveLabrinos authored Feb 14, 2021
2 parents 58704f9 + 4a090d8 commit 376158f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .eslintcache

Large diffs are not rendered by default.

74 changes: 26 additions & 48 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "msc-ais-weather-frondend",
"version": "0.1.0",
"private": true,
"homepage": "htpps://msc-ais-weather.site",
"homepage": "https://www.msc-ais.weather.site",
"dependencies": {
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Auth/SignUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const SignUp = () => {
const errorMsg = error ?
<Typography variant="h5" color="error">
<ErrorOutlineIcon style={{ fontSize: 22, paddingRight: 12 }}/>
Δεν είναι η εγγραφή σας. Ελέγξτε τα στοιχεία εγγραφής
Τα στοιχεία που δόσατε δεν είναι σωστά
</Typography> : null;

const authRedirect = isAuth ?
Expand Down

0 comments on commit 376158f

Please sign in to comment.