Skip to content

Commit

Permalink
Merge pull request #2688 from justinlevi/feature/LAGOON-23-remove-bil…
Browse files Browse the repository at this point in the history
…ling-code

Removing Billing from UI
  • Loading branch information
Toby Bellwood authored Jun 7, 2021
2 parents 7ddb1a9 + fa09508 commit ae8614c
Show file tree
Hide file tree
Showing 37 changed files with 21 additions and 4,596 deletions.
67 changes: 21 additions & 46 deletions services/ui/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ app
const server = express();

// Handle favicon requests that ignore our HTML meta tags.
server.get('/favicon.ico', (req, res) => (
res.status(200).sendFile('favicon.ico', {root: __dirname + '/src/static/images/favicons/'})
));
server.get('/favicon.ico', (req, res) =>
res
.status(200)
.sendFile('favicon.ico', {
root: __dirname + '/src/static/images/favicons/'
})
);

server.get('/projects', (req, res) => {
app.render(req, res, '/projects');
Expand All @@ -27,22 +31,6 @@ app
app.render(req, res, '/project', { projectName: req.params.projectSlug });
});

server.get('/admin/billing/:billingGroupSlug', (req, res) => {
app.render(req, res, '/admin/billing', { billingGroupName: req.params.billingGroupSlug });
});

server.get('/admin/billing/:billingGroupSlug/:lang', (req, res) => {
app.render(req, res, '/admin/billing', { billingGroupName: req.params.billingGroupSlug, lang: req.params.lang });
});

server.get('/admin/billing/:billingGroupSlug/:yearSlug/:monthSlug', (req, res) => {
app.render(req, res, '/admin/billing', { billingGroupName: req.params.billingGroupSlug, year: req.params.yearSlug, month: req.params.monthSlug });
});

server.get('/admin/billing/:billingGroupSlug/:yearSlug/:monthSlug/:lang', (req, res) => {
app.render(req, res, '/admin/billing', { billingGroupName: req.params.billingGroupSlug, year: req.params.yearSlug, month: req.params.monthSlug, lang: req.params.lang });
});

server.get('/projects/:projectSlug/:environmentSlug', (req, res) => {
app.render(req, res, '/environment', {
openshiftProjectName: req.params.environmentSlug
Expand Down Expand Up @@ -102,36 +90,23 @@ app
}
);

server.get(
'/problems/project',
(req, res) => {
app.render(req, res, '/problems-dashboard-by-project');
}
);

server.get(
'/problems',
(req, res) => {
app.render(req, res, '/problems-dashboard-by-project-hex');
}
);
server.get('/problems/project', (req, res) => {
app.render(req, res, '/problems-dashboard-by-project');
});

server.get(
'/problems/identifier',
(req, res) => {
app.render(req, res, '/problems-dashboard');
}
);
server.get('/problems', (req, res) => {
app.render(req, res, '/problems-dashboard-by-project-hex');
});

server.get(
'/projects/:projectSlug/:environmentSlug/facts',
(req, res) => {
app.render(req, res, '/facts', {
openshiftProjectName: req.params.environmentSlug
});
}
);
server.get('/problems/identifier', (req, res) => {
app.render(req, res, '/problems-dashboard');
});

server.get('/projects/:projectSlug/:environmentSlug/facts', (req, res) => {
app.render(req, res, '/facts', {
openshiftProjectName: req.params.environmentSlug
});
});

server.get('*', (req, res) => {
return handle(req, res);
Expand Down
Loading

0 comments on commit ae8614c

Please sign in to comment.