From 2f8680a1bd0533bda3120e9b9504517799c88702 Mon Sep 17 00:00:00 2001 From: cavdy Date: Sun, 28 Apr 2019 23:28:42 +0100 Subject: [PATCH] feature(Hide pages based on who is logged in):Hide pages based on logged in user Hide pages based on who is logged in [Deliver #165664730] --- frontend-app/accounts.html | 18 ++++++------ frontend-app/activate.html | 30 +++++++------------- frontend-app/adduser.html | 18 ++++++------ frontend-app/dashboard.html | 18 ++++++------ frontend-app/js/activate.js | 7 ++--- frontend-app/js/app.js | 50 ++++++++++++++++++++++++++++++++++ frontend-app/staffs.html | 18 ++++++------ frontend-app/transactions.html | 18 ++++++------ frontend-app/users.html | 18 ++++++------ frontend-app/viewaccounts.html | 18 ++++++------ 10 files changed, 126 insertions(+), 87 deletions(-) diff --git a/frontend-app/accounts.html b/frontend-app/accounts.html index 2e5e2ae..2b832a7 100644 --- a/frontend-app/accounts.html +++ b/frontend-app/accounts.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/activate.html b/frontend-app/activate.html index 57ef907..acf2621 100644 --- a/frontend-app/activate.html +++ b/frontend-app/activate.html @@ -22,31 +22,31 @@

Banka

@@ -66,7 +66,7 @@

Banka

- +
- -
-
-
- -
- - -
-
diff --git a/frontend-app/adduser.html b/frontend-app/adduser.html index 7b205d5..a9c3bd2 100644 --- a/frontend-app/adduser.html +++ b/frontend-app/adduser.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/dashboard.html b/frontend-app/dashboard.html index 079761b..f17809d 100644 --- a/frontend-app/dashboard.html +++ b/frontend-app/dashboard.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/js/activate.js b/frontend-app/js/activate.js index c78eee8..9fa0536 100644 --- a/frontend-app/js/activate.js +++ b/frontend-app/js/activate.js @@ -329,15 +329,14 @@ go.addEventListener('click', (e) => { getAccountsApi(`${api}/v1/accounts?limit=${limitSelect.value}`); }); -const acBtn = document.querySelector('#ac-go'); +const search = document.querySelector('#search'); -acBtn.addEventListener('click', (e) => { +search.addEventListener('keyup', (e) => { e.preventDefault(); - const acInput = document.querySelector('.accounts-input'); const tableBodies = document.querySelectorAll('.table-body'); tableBodies.forEach((tableBody) => { tableBody.remove(); }); - getSpecficAccountApi(`${api}/v1/accounts/${acInput.value}`); + getSpecficAccountApi(`${api}/v1/accounts/${search.value}`); }); diff --git a/frontend-app/js/app.js b/frontend-app/js/app.js index cc09024..1e23f6e 100644 --- a/frontend-app/js/app.js +++ b/frontend-app/js/app.js @@ -77,3 +77,53 @@ logout.addEventListener('click', (e) => { sessionStorage.clear(); location.replace('./index.html'); }); + +const apiUrl = 'https://bankaapp-api.herokuapp.com/api/v1'; +const tokenId = sessionStorage.getItem('token'); +const idU = sessionStorage.getItem('id'); +const sidebarItems = document.querySelectorAll('.sidebar-item'); +const userItems = document.querySelectorAll('.user'); +const staffItems = document.querySelectorAll('.staff'); +const adminItems = document.querySelectorAll('.admin'); +const userFname = document.querySelector('.user-nav-username'); + +sidebarItems.forEach((sidebarItem) => { + sidebarItem.style.display = 'none'; +}); + +// GET FETCH API REQUEST TO GET A PARTICULAR ACCOUNT INFO +const getUApi = (url) => { + fetch(url, { + method: 'GET', + mode: 'cors', + cache: 'no-cache', + credentials: 'same-origin', + headers: { + Authorization: `Bearer ${tokenId}`, + 'Content-Type': 'application/json', + }, + redirect: 'follow', + referrer: 'no-referrer', + }) + .then(response => response.json()) + .then((data1) => { + const i = data1.data; + userFname.innerHTML = i.firstname; + userFname.style.textTransform = 'capitalize'; + if (i.type === 'staff') { + staffItems.forEach((staffItem) => { + staffItem.style.display = 'block'; + }); + } else if (i.isadmin === true) { + adminItems.forEach((adminItem) => { + adminItem.style.display = 'block'; + }); + } else { + userItems.forEach((userItem) => { + userItem.style.display = 'block'; + }); + } + }); +}; + +getUApi(`${apiUrl}/users/${idU}`); diff --git a/frontend-app/staffs.html b/frontend-app/staffs.html index 5c1ef26..b0d488c 100644 --- a/frontend-app/staffs.html +++ b/frontend-app/staffs.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/transactions.html b/frontend-app/transactions.html index 4ee951c..2871e29 100644 --- a/frontend-app/transactions.html +++ b/frontend-app/transactions.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/users.html b/frontend-app/users.html index 2aefd6a..8139e2a 100644 --- a/frontend-app/users.html +++ b/frontend-app/users.html @@ -22,31 +22,31 @@

Banka

diff --git a/frontend-app/viewaccounts.html b/frontend-app/viewaccounts.html index 81cb1f5..f9825ad 100644 --- a/frontend-app/viewaccounts.html +++ b/frontend-app/viewaccounts.html @@ -22,31 +22,31 @@

Banka