Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2022-158
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2022-158
2022-158
Commits
2e179154
Commit
2e179154
authored
Oct 10, 2022
by
Thiwanka K.A.T
🎯
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'IT19076362' into 'master'
It19076362 See merge request
!110
parents
7bcede41
c5011a16
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
18 deletions
+7
-18
backend/database.db
backend/database.db
+0
-0
backend/routes/auth_routes.py
backend/routes/auth_routes.py
+0
-6
frontend/src/pages/Register.js
frontend/src/pages/Register.js
+7
-12
No files found.
backend/database.db
View file @
2e179154
No preview for this file type
backend/routes/auth_routes.py
View file @
2e179154
...
...
@@ -26,9 +26,6 @@ def register():
if
len
(
password
)
<
6
:
return
jsonify
({
'err'
:
"Password is too short"
}),
HTTP_400_BAD_REQUEST
if
not
username
.
isalnum
()
or
" "
in
username
:
return
jsonify
({
'err'
:
"Username should be alphanumeric, also no spaces"
}),
HTTP_400_BAD_REQUEST
if
not
validators
.
email
(
email
):
return
jsonify
({
'err'
:
"Email is not valid"
}),
HTTP_400_BAD_REQUEST
...
...
@@ -60,9 +57,6 @@ def login():
if
not
username
or
not
password
:
return
jsonify
({
'err'
:
'Missing email or password'
}),
HTTP_400_BAD_REQUEST
if
not
username
.
isalnum
()
or
" "
in
username
:
return
jsonify
({
'err'
:
"Username should be alphanumeric, also no spaces"
}),
HTTP_400_BAD_REQUEST
user
=
User
.
query
.
filter_by
(
username
=
username
)
.
first
()
if
user
is
None
:
...
...
frontend/src/pages/Register.js
View file @
2e179154
...
...
@@ -16,6 +16,7 @@ const Login = () => {
username
:
""
,
password
:
""
,
email
:
""
,
type
:
"
student
"
,
});
const
registerUser
=
async
e
=>
{
...
...
@@ -25,21 +26,15 @@ const Login = () => {
setSuccess
(
false
);
try
{
const
res
=
await
axios
.
post
(
"
register
"
,
user
);
const
res
=
await
axios
.
post
(
"
auth/
register
"
,
user
);
if
(
res
.
statusText
===
"
Created
"
)
{
setUser
({
username
:
""
,
password
:
""
,
email
:
""
,
});
setBtnState
(
false
);
return
setSuccess
(
"
You are registered. Thank you
"
);
}
setBtnState
(
false
);
window
.
alert
(
"
You are registered. Please login to continue
"
);
setSuccess
(
"
You are registered. Thank you
"
);
return
window
.
location
.
replace
(
"
/login
"
);
}
catch
(
err
)
{
console
.
log
(
err
.
response
);
setError
(
err
.
response
.
data
.
message
);
setError
(
err
.
response
.
data
.
err
);
setBtnState
(
false
);
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment