Merge branch 'feat/navbar' into 'master'
i liek navbars See merge request laudom/ocw!2
This commit is contained in:
commit
35e0e14eb7
|
@ -194,17 +194,17 @@ const request = (resource: string, data: any) =>
|
||||||
case -1:
|
case -1:
|
||||||
// not logged in
|
// not logged in
|
||||||
showElements([".login-box", ".register-box"]);
|
showElements([".login-box", ".register-box"]);
|
||||||
hideElements([".mail-box", ".sms-box", ".package-list"]);
|
hideElements([".mail-box", ".sms-box", ".package-list", ".logout-button"]);
|
||||||
break;
|
break;
|
||||||
case -2:
|
case -2:
|
||||||
// mail unverified
|
// mail unverified
|
||||||
showElements([".mail-box"]);
|
showElements([".mail-box"]);
|
||||||
hideElements([".login-box", ".register-box", ".sms-box", ".package-list"]);
|
hideElements([".login-box", ".register-box", ".sms-box", ".package-list", ".logout-button"]);
|
||||||
break;
|
break;
|
||||||
case -3:
|
case -3:
|
||||||
// phone unverified
|
// phone unverified
|
||||||
showElements([".sms-box"]);
|
showElements([".sms-box"]);
|
||||||
hideElements([".login-box", ".register-box", ".mail-box", ".package-list"]);
|
hideElements([".login-box", ".register-box", ".mail-box", ".package-list", ".logout-button"]);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
openError(res.description || res.msg || `Session error: ${res.status}`);
|
openError(res.description || res.msg || `Session error: ${res.status}`);
|
||||||
|
@ -394,7 +394,7 @@ window.addEventListener("load", () => {
|
||||||
if (res.status == 200) {
|
if (res.status == 200) {
|
||||||
refreshPackages().then(() => {
|
refreshPackages().then(() => {
|
||||||
hideElements([".login-box", ".register-box"]);
|
hideElements([".login-box", ".register-box"]);
|
||||||
showElements([".package-list"]);
|
showElements([".package-list", ".logout-button"]);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
openError(res.msg || "Error during login. Try again in a while?");
|
openError(res.msg || "Error during login. Try again in a while?");
|
||||||
|
@ -463,7 +463,7 @@ window.addEventListener("load", () => {
|
||||||
phone = null;
|
phone = null;
|
||||||
localStorage.removeItem("phone");
|
localStorage.removeItem("phone");
|
||||||
await refreshPackages();
|
await refreshPackages();
|
||||||
showElements([".package-list"]);
|
showElements([".package-list", ".logout-button"]);
|
||||||
} else {
|
} else {
|
||||||
openError(res.description || res.msg);
|
openError(res.description || res.msg);
|
||||||
}
|
}
|
||||||
|
@ -491,7 +491,7 @@ window.addEventListener("load", () => {
|
||||||
if (Array.isArray(res)) {
|
if (Array.isArray(res)) {
|
||||||
// logged in, verified e-mail and phone, res is the package list
|
// logged in, verified e-mail and phone, res is the package list
|
||||||
refreshPackages(res);
|
refreshPackages(res);
|
||||||
showElements([".package-list"]);
|
showElements([".package-list", ".logout-button"]);
|
||||||
// just to be sure
|
// just to be sure
|
||||||
localStorage.removeItem("phone");
|
localStorage.removeItem("phone");
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ $family-sans-serif: BlinkMacSystemFont, -apple-system, sans-serif;
|
||||||
@import "../node_modules/bulma/sass/form/input-textarea.sass";
|
@import "../node_modules/bulma/sass/form/input-textarea.sass";
|
||||||
@import "../node_modules/bulma/sass/form/tools.sass";
|
@import "../node_modules/bulma/sass/form/tools.sass";
|
||||||
@import "../node_modules/bulma/sass/components/modal.sass";
|
@import "../node_modules/bulma/sass/components/modal.sass";
|
||||||
|
@import "../node_modules/bulma/sass/components/navbar.sass";
|
||||||
|
|
||||||
.login-box,
|
.login-box,
|
||||||
.register-box,
|
.register-box,
|
||||||
|
|
|
@ -8,6 +8,24 @@
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
<nav class="navbar is-success">
|
||||||
|
<div class="navbar-menu">
|
||||||
|
<div class="navbar-brand">
|
||||||
|
<a href="/" class="navbar-item">
|
||||||
|
<b>OCW</b>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="navbar-end">
|
||||||
|
<div class="navbar-item">
|
||||||
|
<div class="buttons">
|
||||||
|
<a class="button is-light logout-button">
|
||||||
|
<span>Log out</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
<div class="login-box column">
|
<div class="login-box column">
|
||||||
<label class="label is-large">Login</label>
|
<label class="label is-large">Login</label>
|
||||||
|
@ -75,7 +93,6 @@
|
||||||
<input type="submit" class="button" value="Submit">
|
<input type="submit" class="button" value="Submit">
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="sms-box column">
|
<div class="sms-box column">
|
||||||
<label class="label is-large">SMS</label>
|
<label class="label is-large">SMS</label>
|
||||||
<form method="POST" class="sms-form">
|
<form method="POST" class="sms-form">
|
||||||
|
@ -128,7 +145,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="package-list container">
|
<div class="package-list container">
|
||||||
<div class="logout-button button">Log out</div>
|
|
||||||
<div class="table-container">
|
<div class="table-container">
|
||||||
<table class="table is-striped">
|
<table class="table is-striped">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
Loading…
Reference in a new issue