mirror of
https://github.com/GCMatters/hermes.git
synced 2026-02-04 13:40:13 +01:00
fix: fix acces for logged out visitors
This commit is contained in:
@@ -81,9 +81,11 @@ async function loadEvents(org_id: number, evs?: Promise<any>) {
|
|||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", async () => {
|
document.addEventListener("DOMContentLoaded", async () => {
|
||||||
|
|
||||||
var user = await getMyAccount();
|
|
||||||
var org_id: number = -1;
|
var org_id: number = -1;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var user = await getMyAccount();
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
unhideElementById(document, "mainContainer");
|
unhideElementById(document, "mainContainer");
|
||||||
@@ -91,7 +93,9 @@ document.addEventListener("DOMContentLoaded", async () => {
|
|||||||
org_id = user.organisationId;
|
org_id = user.organisationId;
|
||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
} else {
|
}
|
||||||
|
} catch {
|
||||||
|
// console.log("User not signed in. Failing gracefully.");
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
@@ -106,7 +110,7 @@ document.addEventListener("DOMContentLoaded", async () => {
|
|||||||
const searchBar = document.getElementById('searchbar') as HTMLInputElement;
|
const searchBar = document.getElementById('searchbar') as HTMLInputElement;
|
||||||
searchBar.addEventListener('keydown', (event) => {
|
searchBar.addEventListener('keydown', (event) => {
|
||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
console.log('Enter key pressed!');
|
// console.log('Enter key pressed!');
|
||||||
var searchResults = getEvents(searchBar.value);
|
var searchResults = getEvents(searchBar.value);
|
||||||
loadEvents(org_id, searchResults);
|
loadEvents(org_id, searchResults);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,13 +53,16 @@ async function modifyEvent()
|
|||||||
document.addEventListener("DOMContentLoaded", async () => {
|
document.addEventListener("DOMContentLoaded", async () => {
|
||||||
var container = document.getElementById("mainContainer");
|
var container = document.getElementById("mainContainer");
|
||||||
const saveBtn = document.getElementById("saveBtn");
|
const saveBtn = document.getElementById("saveBtn");
|
||||||
|
|
||||||
|
try {
|
||||||
var user = await getMyAccount();
|
var user = await getMyAccount();
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
unhideElementById(document, "mainContainer");
|
unhideElementById(document, "mainContainer");
|
||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
} else {
|
}
|
||||||
|
} catch {
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,17 +7,19 @@ const eventId = urlParams.get('event');
|
|||||||
document.addEventListener("DOMContentLoaded", async () => {
|
document.addEventListener("DOMContentLoaded", async () => {
|
||||||
|
|
||||||
var container = document.getElementById("mainContainer");
|
var container = document.getElementById("mainContainer");
|
||||||
var user = await getMyAccount();
|
const modifyBtn = document.getElementById("editBtn");
|
||||||
var org_id: number = -1;
|
|
||||||
const modifyBtn = document.getElementById( "editBtn");
|
|
||||||
const removeBtn = document.getElementById("removeBtn");
|
const removeBtn = document.getElementById("removeBtn");
|
||||||
|
var org_id: number = -1;
|
||||||
|
|
||||||
|
try {
|
||||||
|
var user = await getMyAccount();
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
org_id = user.organisationId;
|
org_id = user.organisationId;
|
||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
} else {
|
}
|
||||||
|
} catch {
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,8 +85,9 @@ function loadEvents(org_id, evs) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
var user = yield getMyAccount();
|
|
||||||
var org_id = -1;
|
var org_id = -1;
|
||||||
|
try {
|
||||||
|
var user = yield getMyAccount();
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
unhideElementById(document, "mainContainer");
|
unhideElementById(document, "mainContainer");
|
||||||
@@ -95,7 +96,9 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
|
|||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
}
|
}
|
||||||
else {
|
}
|
||||||
|
catch (_a) {
|
||||||
|
// console.log("User not signed in. Failing gracefully.");
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
@@ -109,7 +112,7 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
|
|||||||
const searchBar = document.getElementById('searchbar');
|
const searchBar = document.getElementById('searchbar');
|
||||||
searchBar.addEventListener('keydown', (event) => {
|
searchBar.addEventListener('keydown', (event) => {
|
||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
console.log('Enter key pressed!');
|
// console.log('Enter key pressed!');
|
||||||
var searchResults = getEvents(searchBar.value);
|
var searchResults = getEvents(searchBar.value);
|
||||||
loadEvents(org_id, searchResults);
|
loadEvents(org_id, searchResults);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ function modifyEvent() {
|
|||||||
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
var container = document.getElementById("mainContainer");
|
var container = document.getElementById("mainContainer");
|
||||||
const saveBtn = document.getElementById("saveBtn");
|
const saveBtn = document.getElementById("saveBtn");
|
||||||
|
try {
|
||||||
var user = yield getMyAccount();
|
var user = yield getMyAccount();
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
@@ -59,7 +60,8 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
|
|||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
}
|
}
|
||||||
else {
|
}
|
||||||
|
catch (_a) {
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,17 +13,19 @@ const urlParams = new URLSearchParams(queryString);
|
|||||||
const eventId = urlParams.get('event');
|
const eventId = urlParams.get('event');
|
||||||
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
var container = document.getElementById("mainContainer");
|
var container = document.getElementById("mainContainer");
|
||||||
var user = yield getMyAccount();
|
|
||||||
var org_id = -1;
|
|
||||||
const modifyBtn = document.getElementById("editBtn");
|
const modifyBtn = document.getElementById("editBtn");
|
||||||
const removeBtn = document.getElementById("removeBtn");
|
const removeBtn = document.getElementById("removeBtn");
|
||||||
|
var org_id = -1;
|
||||||
|
try {
|
||||||
|
var user = yield getMyAccount();
|
||||||
if (user) {
|
if (user) {
|
||||||
if (user.isOrganisation) {
|
if (user.isOrganisation) {
|
||||||
org_id = user.organisationId;
|
org_id = user.organisationId;
|
||||||
}
|
}
|
||||||
unhideElementById(document, "logout-btn");
|
unhideElementById(document, "logout-btn");
|
||||||
}
|
}
|
||||||
else {
|
}
|
||||||
|
catch (_a) {
|
||||||
unhideElementById(document, "joinnow-btn");
|
unhideElementById(document, "joinnow-btn");
|
||||||
unhideElementById(document, "signin-btn");
|
unhideElementById(document, "signin-btn");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user