Skip to content

Commit

Permalink
fix path
Browse files Browse the repository at this point in the history
  • Loading branch information
dangowans committed Oct 13, 2023
1 parent 9330f70 commit b681f0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
7 changes: 3 additions & 4 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import session from 'express-session';
import createError from 'http-errors';
import FileStore from 'session-file-store';
import { useTestDatabases } from './data/databasePaths.js';
import { initNHTSADB } from './database/initializeDatabase.js';
import * as parkingDB_init from './database/parkingDB/initializeDatabase.js';
import { initNHTSADB } from './database/nhtsaDB/initializeDatabase.js';
import { initializeDatabase } from './database/parkingDB/initializeDatabase.js';
import * as configFunctions from './helpers/functions.config.js';
import * as vehicleFunctions from './helpers/functions.vehicle.js';
import routerAdmin from './routes/admin.js';
Expand All @@ -27,7 +27,7 @@ import routeTicketsOntario from './routes/tickets-ontario.js';
import routerTickets from './routes/tickets.js';
import { version } from './version.js';
const debugApp = debug('parking-ticket-system:app');
parkingDB_init.initializeDatabase();
initializeDatabase();
initNHTSADB();
export const app = express();
app.set('views', path.join('views'));
Expand All @@ -52,7 +52,6 @@ if (!useTestDatabases) {
}
app.use(express.static(path.join('public')));
app.use('/fa', express.static(path.join('node_modules', '@fortawesome', 'fontawesome-free')));
app.use('/stylesheets/files', express.static(path.join('node_modules', '@fontsource', 'inter', 'files')));
app.use('/fontsource-pt-mono', express.static(path.join('node_modules', '@fontsource', 'pt-mono', 'files')));
app.use('/cityssm-bulma-webapp-js', express.static(path.join('node_modules', '@cityssm', 'bulma-webapp-js')));
app.use('/bulma-js', express.static(path.join('node_modules', '@cityssm', 'bulma-js', 'dist')));
Expand Down
11 changes: 3 additions & 8 deletions app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import createError from 'http-errors'
import FileStore from 'session-file-store'

import { useTestDatabases } from './data/databasePaths.js'
import { initNHTSADB } from './database/initializeDatabase.js'
import * as parkingDB_init from './database/parkingDB/initializeDatabase.js'
import { initNHTSADB } from './database/nhtsaDB/initializeDatabase.js'
import { initializeDatabase } from './database/parkingDB/initializeDatabase.js'
import * as configFunctions from './helpers/functions.config.js'
import * as vehicleFunctions from './helpers/functions.vehicle.js'
import routerAdmin from './routes/admin.js'
Expand All @@ -35,7 +35,7 @@ const debugApp = debug('parking-ticket-system:app')
* INITALIZE THE DATABASES
*/

parkingDB_init.initializeDatabase()
initializeDatabase()
initNHTSADB()

/*
Expand Down Expand Up @@ -90,11 +90,6 @@ app.use(
express.static(path.join('node_modules', '@fortawesome', 'fontawesome-free'))
)

app.use(
'/stylesheets/files',
express.static(path.join('node_modules', '@fontsource', 'inter', 'files'))
)

app.use(
'/fontsource-pt-mono',
express.static(path.join('node_modules', '@fontsource', 'pt-mono', 'files'))
Expand Down

0 comments on commit b681f0b

Please sign in to comment.