fixing mounted app routes, fixing sql for prod
This commit is contained in:
@@ -2,7 +2,6 @@
|
|||||||
import postgres from 'postgres';
|
import postgres from 'postgres';
|
||||||
import 'dotenv/config'
|
import 'dotenv/config'
|
||||||
|
|
||||||
console.log("url: ", process.env.LOCAL_DATABASE_URL)
|
const sql = postgres(process.env.DATABASE_URL);
|
||||||
const sql = postgres(process.env.LOCAL_DATABASE_URL);
|
|
||||||
|
|
||||||
export default sql;
|
export default sql;
|
||||||
@@ -158,6 +158,8 @@ class Server {
|
|||||||
filePath = path.join(this.UIPath, url);
|
filePath = path.join(this.UIPath, url);
|
||||||
} else if(url.includes("75820185")) {
|
} else if(url.includes("75820185")) {
|
||||||
filePath = path.join(this.UIPath, platformFolder, url.split("75820185")[1]);
|
filePath = path.join(this.UIPath, platformFolder, url.split("75820185")[1]);
|
||||||
|
} else if(url.startsWith("/db")) {
|
||||||
|
filePath = path.join(this.DBPath, url.replace('/db', ''));
|
||||||
} else {
|
} else {
|
||||||
filePath = path.join(this.UIPath, platformFolder, "index.html");
|
filePath = path.join(this.UIPath, platformFolder, "index.html");
|
||||||
}
|
}
|
||||||
@@ -225,7 +227,7 @@ class Server {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor() {
|
async init() {
|
||||||
this.db = new Database()
|
this.db = new Database()
|
||||||
this.auth = new AuthHandler()
|
this.auth = new AuthHandler()
|
||||||
global.db = this.db
|
global.db = this.db
|
||||||
@@ -265,7 +267,7 @@ class Server {
|
|||||||
app.use(this.logRequest);
|
app.use(this.logRequest);
|
||||||
app.use(this.logResponse);
|
app.use(this.logResponse);
|
||||||
|
|
||||||
this.mountApps(app)
|
await this.mountApps(app) // must be completed before router is registered
|
||||||
|
|
||||||
let router = express.Router();
|
let router = express.Router();
|
||||||
this.registerRoutes(router)
|
this.registerRoutes(router)
|
||||||
@@ -290,6 +292,10 @@ class Server {
|
|||||||
|
|
||||||
Object.preventExtensions(this);
|
Object.preventExtensions(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.init()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const server = new Server()
|
const server = new Server()
|
||||||
Reference in New Issue
Block a user