diff --git a/http_views/events.pug b/http_views/events.pug index 172b4d4..81d9b3c 100644 --- a/http_views/events.pug +++ b/http_views/events.pug @@ -13,9 +13,9 @@ block content | Duration (in hours): input(type='text' name='duration_hours', placeholder='Duration (in hours)', value=`${event?event.duration_hours:''}`) | Start (Date): - input(type='date' name='date', value=`${event?event.date_time:''}`) + input(type='date' name='date', value=`${event?event.date_time.getFullYear()+'-'+event.date_time.getMonth()+1+'-'+event.date_time.getDate():''}`) | Start (Time): - input(type='time' name='time', value=`${event?event.date_time:''}`) + input(type='time' name='time', value=`${event?event.date_time.getHours()+":"+event.date_time.getMinutes():''}`) | Number of Players: input(type='text' name='number_player_slots', placeholder='Number of Players', value=`${event?event.number_player_slots:''}`) | Campaign: diff --git a/index.js b/index.js index 57d6d15..7659dbf 100644 --- a/index.js +++ b/index.js @@ -4,9 +4,11 @@ const path = require('path'); const fetch = require('node-fetch'); const url = require('url'); const users = require('./handlers/users.js'); -const GuildModel = require('./models/Guild'); const { connect, disconnect } = require('mongoose'); +const GuildModel = require('./models/Guild'); +const EventModel = require('./models/Event'); + const DEFAULT_CONFIGDIR = __dirname; global.Config = require(path.resolve(process.env.CONFIGDIR || DEFAULT_CONFIGDIR, './config.json')); @@ -172,7 +174,7 @@ let server = app response.end(error.message); } }) - .get(ROUTE_EVENTS, function (request, response) { + .get(ROUTE_EVENTS, async function (request, response) { try { console.log('serving ' + ROUTE_EVENTS); if (!request.session.discordMe) { @@ -184,8 +186,9 @@ let server = app } else { let requestUrl = new URL(request.url, `${request.protocol}://${request.headers.host}`); // console.log(request.session.discordMe); - // let responseData = events.handleEventsRequest(requestUrl); - response.render('events', { title: 'Events', Config: Config, guildConfig: request.session.guildConfig, discordMe: request.session.discordMe }) + let eventID = requestUrl.searchParams.get('eventID'); + let event = await EventModel.findOne({eventID: eventID}); + response.render('events', { title: 'Events', event: event, Config: Config, guildConfig: request.session.guildConfig, discordMe: request.session.discordMe }) } } catch (error) { console.error(error.message);