working with db, docker working, small error with personal data
This commit is contained in:
@@ -51,7 +51,7 @@ class Dashboard extends Shadow {
|
||||
VStack(() => {
|
||||
|
||||
if(window.location.pathname.startsWith("/my")) {
|
||||
h1(global.profile.name);
|
||||
h1(global.profile.first_name + " " + global.profile.last_name);
|
||||
return
|
||||
}
|
||||
else if(!window.location.pathname.includes("comalyr")) {
|
||||
@@ -150,7 +150,6 @@ class Dashboard extends Shadow {
|
||||
.gap(8);
|
||||
});
|
||||
})
|
||||
.gap(0.5, em)
|
||||
.paddingTop(4, pct)
|
||||
.paddingLeft(5, pct)
|
||||
.width(100, pct)
|
||||
|
||||
@@ -48,7 +48,7 @@ class Dashboard extends Shadow {
|
||||
VStack(() => {
|
||||
|
||||
if(window.location.pathname.startsWith("/my")) {
|
||||
h1(global.profile.name);
|
||||
h1(global.profile.first_name + " " + global.profile.last_name);
|
||||
return
|
||||
}
|
||||
else if(!window.location.pathname.includes("comalyr")) {
|
||||
|
||||
@@ -17,7 +17,7 @@ class People extends Shadow {
|
||||
new gridjs.Grid({
|
||||
columns: ["Name", "Email"],
|
||||
data: global.currentNetwork.data.members.map(m => [
|
||||
m.firstName + " " + m.lastName,
|
||||
m.first_name + " " + m.last_name,
|
||||
m.email
|
||||
]),
|
||||
sort: true,
|
||||
|
||||
@@ -20,7 +20,7 @@ let Global = class {
|
||||
window.dispatchEvent(event)
|
||||
}
|
||||
|
||||
async fetchAppData() {
|
||||
async fetchOrgData() {
|
||||
let personalSpace = this.currentNetwork === this.profile
|
||||
let appData = await fetch(`/api/${personalSpace ? "my" : "org"}data/` + this.currentNetwork.id, {method: "GET"})
|
||||
let json = await appData.json()
|
||||
@@ -84,7 +84,7 @@ let Global = class {
|
||||
}
|
||||
|
||||
if(!this.currentNetwork.data) {
|
||||
this.currentNetwork.data = await this.fetchAppData()
|
||||
this.currentNetwork.data = await this.fetchOrgData()
|
||||
}
|
||||
|
||||
if(appChanged && !networkChanged) {
|
||||
|
||||
Reference in New Issue
Block a user