Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mihajlo Srebrenoski
Brainster-Second-Project
Commits
9b1ad82a
Commit
9b1ad82a
authored
1 year ago
by
Mihajlo Srebrenoski
Browse files
Options
Download
Plain Diff
Merge branch 'front-end-routes' into 'dev'
some small changes with routes See merge request
!3
parents
693c00ec
686483ba
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
library/js/admin_panel.js
+2
-2
library/js/admin_panel.js
library/js/form.js
+2
-2
library/js/form.js
library/js/library.js
+1
-1
library/js/library.js
library/public/adminPanel.html
+1
-1
library/public/adminPanel.html
with
6 additions
and
6 deletions
+6
-6
library/js/admin_panel.js
+
2
-
2
View file @
9b1ad82a
...
...
@@ -19,13 +19,13 @@ if(localStorage.getItem('user') !== null && localStorage.getItem('user_role') ==
}
else
{
location
.
assign
(
"
http://127.0.0.1:5500//public/index.html
"
);
location
.
assign
(
"
http://127.0.0.1:5500/
brainster-second-project/library
/public/index.html
"
);
}
$
(
"
#log_out
"
).
click
(
function
(
e
){
localStorage
.
clear
();
location
.
assign
(
"
http://127.0.0.1:5500//public/index.html
"
);
location
.
assign
(
"
http://127.0.0.1:5500/
brainster-second-project/library
/public/index.html
"
);
})
...
...
This diff is collapsed.
Click to expand it.
library/js/form.js
+
2
-
2
View file @
9b1ad82a
...
...
@@ -33,12 +33,12 @@ if (user.role == 0){
localStorage
.
clear
()
localStorage
.
setItem
(
'
user
'
,
user
.
id
)
localStorage
.
setItem
(
'
user_role
'
,
user
.
role
)
location
.
assign
(
"
http://127.0.0.1:5500//public/adminPanel.html
"
);
location
.
assign
(
"
http://127.0.0.1:5500/
brainster-second-project/library
/public/adminPanel.html
"
);
}
else
{
localStorage
.
clear
()
localStorage
.
setItem
(
'
user
'
,
user
.
id
)
localStorage
.
setItem
(
'
user_role
'
,
user
.
role
)
location
.
assign
(
"
http://127.0.0.1:5500//public/index.html
"
);
location
.
assign
(
"
http://127.0.0.1:5500/
brainster-second-project/library
/public/index.html
"
);
}
...
...
This diff is collapsed.
Click to expand it.
library/js/library.js
+
1
-
1
View file @
9b1ad82a
...
...
@@ -19,7 +19,7 @@ $('#profile_panel').click(function(e){
$
(
"
#log_out
"
).
click
(
function
(
e
){
localStorage
.
clear
();
location
.
assign
(
"
http://127.0.0.1:5500//public/index.html
"
);
location
.
assign
(
"
http://127.0.0.1:5500/
brainster-second-project/library
/public/index.html
"
);
})
...
...
This diff is collapsed.
Click to expand it.
library/public/adminPanel.html
+
1
-
1
View file @
9b1ad82a
...
...
@@ -14,7 +14,7 @@
<script>
if
(
localStorage
.
getItem
(
'
user
'
)
===
null
){
location
.
assign
(
"
http://127.0.0.1:5500//public/library
.html
"
);
location
.
assign
(
"
index
.html
"
);
}
</script>
<div
class=
"grid grid-cols-12 "
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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