diff --git a/server/auth.js b/server/auth.js index df58abf..6c9bd5a 100644 --- a/server/auth.js +++ b/server/auth.js @@ -38,8 +38,8 @@ export default class AuthHandler { const user = db.members.getByEmail(email); let connections = db.MEMBER_IN_NETWORK.getByFrom(db.members.prefix + "-" + user.id) - let userOrgs = connections.map((v) => { - return db.networks.get(v.id) + let userOrgs = connections.map((c) => { + return db.networks.get(c.to) }) console.log(userOrgs) res.send({ email: user.email, name: user.firstName + " " + user.lastName, networks: userOrgs}); diff --git a/server/db/db.js b/server/db/db.js index 83be3ad..62cf853 100644 --- a/server/db/db.js +++ b/server/db/db.js @@ -25,6 +25,10 @@ export default class Database { this.loadData() } + getCurrentIndex(model) { + return model.indices[1] - model.indices[0] + } + getNextIndex(model) { return model.indices[1] - model.indices[0] + 1 } @@ -65,7 +69,6 @@ export default class Database { ...edge } if(!toAdd.created) toAdd.created = global.currentTime() - console.log(toAdd) let schema = model.schema let result = schema.safeParse(toAdd) if(result.success) { diff --git a/server/db/model/member.js b/server/db/model/member.js index 9ec1a50..fc0a5c2 100644 --- a/server/db/model/member.js +++ b/server/db/model/member.js @@ -29,7 +29,7 @@ export default class Member { if(network) { global.db.edge.add({ type: "IN", - from: `${this.prefix}-${global.db.getNextIndex(this)}`, + from: `${this.prefix}-${global.db.getCurrentIndex(this)}`, to: "NETWORK-1" }) } diff --git a/server/db/model/network.js b/server/db/model/network.js index a4895a8..54dd7fd 100644 --- a/server/db/model/network.js +++ b/server/db/model/network.js @@ -18,8 +18,10 @@ export default class Network { }) .strict() - get(id) { + get(stringID) { + let id = stringID.split("-")[1] let index = this.indices[0] + (id - 1) + console.log("networkget", index, id, global.db.nodes[index-1]) return global.db.nodes[index] } diff --git a/ui/desktop/index.js b/ui/desktop/index.js index 3694a01..451eceb 100644 --- a/ui/desktop/index.js +++ b/ui/desktop/index.js @@ -82,8 +82,8 @@ async function getProfile() { } } -getProfile().then(async () => { - let path = ""; +async function setCurrentNetwork() { + let path = "" let defaultNetwork = window.profile.networks[0] if(!selectedNetwork()) { @@ -99,6 +99,15 @@ getProfile().then(async () => { let json = await appData.json() window.comalData = json - window.navigateTo(path) + return path +} + +getProfile().then(async () => { + + if(window.profile.networks.length > 0) { + let path = await setCurrentNetwork() + window.navigateTo(path) + } + Home() }) \ No newline at end of file