diff --git a/api/routes/campaigns.js b/api/routes/campaigns.js index 3155a88..a9ae52f 100644 --- a/api/routes/campaigns.js +++ b/api/routes/campaigns.js @@ -24,6 +24,26 @@ const campaigns = new express.Router(); // routes ********************** campaigns.route('/') + .get((req, res, next) => { + CampaignModel.find({}, {}, { + sort: { + timestamp: 'desc', + }, + }, (err, items) => { + if (err) { + err.status = codes.servererror; + return next(err); + } + if (items && items.length > 0) { + res.locals.items = items; + } else { + res.locals.items = []; + } + res.locals.processed = true; + next(); + }); + }) + .post(apiAuthenticationMiddleware, checkMT, (req, res, next) => { const campaign = new CampaignModel(req.body); // timestamp and default are set automatically by Mongoose Schema Validation @@ -45,7 +65,7 @@ campaigns.route('/') campaigns.route('/:id') .get(idValidator, (req, res, next) => { - return genericGetById(req, res, next, CampaignModel); + return genericGetById(req, res, next, CampaignModel); }) .patch(apiAuthenticationMiddleware, checkMT, (req, res, next) => { diff --git a/static/src/app/services/logs/campaign.service.ts b/static/src/app/services/logs/campaign.service.ts index 2fbda1f..7e1d552 100644 --- a/static/src/app/services/logs/campaign.service.ts +++ b/static/src/app/services/logs/campaign.service.ts @@ -13,6 +13,11 @@ export class CampaignService { } getAllCampaigns() { + return this.http.get(this.config.apiCampaignPath) + .map(res => res.json()); + } + + getAllCampaignsWithWars() { return this.http.get(this.config.apiWarPath) .map(res => res.json()); } diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css index e72ddc8..5473e30 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css @@ -30,7 +30,6 @@ } .campaign-entry { - width: fit-content; border: 1px solid #dadada; min-width: 20%; padding: 15px; diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html index 30372f7..476b344 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html @@ -9,27 +9,15 @@