Skip to content

Commit

Permalink
Merge pull request #148 from bcgov/css
Browse files Browse the repository at this point in the history
CSS tidy
  • Loading branch information
jujaga authored Nov 23, 2023
2 parents 33b6b7a + 14de4b2 commit 40e1328
Show file tree
Hide file tree
Showing 32 changed files with 733 additions and 898 deletions.
9 changes: 5 additions & 4 deletions app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { join } from 'path';
import Problem from 'api-problem';
import querystring from 'querystring';

import { name as appName, version as appVersion } from './package.json';
import { getLogger, httpLogger } from './src/components/log';
import { getGitRevision, readIdpList } from './src/components/utils';

Expand Down Expand Up @@ -49,7 +50,7 @@ appRouter.get('/config', (_req: Request, res: Response, next: (err: unknown) =>
...config.get('frontend'),
gitRev: state.gitRev,
idpList: state.idpList,
version: process.env.npm_package_version
version: appVersion
});
} catch (err) {
next(err);
Expand All @@ -64,9 +65,9 @@ appRouter.get('/api', (_req: Request, res: Response): void => {
res.status(200).json({
app: {
gitRev: state.gitRev,
name: process.env.npm_package_name,
name: appName,
nodeVersion: process.version,
version: process.env.npm_package_version
version: appVersion
},
endpoints: ['/api/v1'],
versions: [1]
Expand All @@ -91,7 +92,7 @@ app.use((err: Problem, _req: Request, res: Response, _next: () => void): void =>
err.send(res, null);
} else {
new Problem(500, 'Server Error', {
detail: (err.message) ? err.message : err
detail: err.message ? err.message : err
}).send(res);
}
});
Expand Down
2 changes: 1 addition & 1 deletion app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "resolveJsonModule": true, /* Enable importing .json files. */
"resolveJsonModule": true, /* Enable importing .json files. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
Expand Down
14 changes: 7 additions & 7 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"pinia-plugin-persistedstate": "^3.2.0",
"primeflex": "^3.3.1",
"primeicons": "^6.0.1",
"primevue": "~3.34.1",
"primevue": "^3.40.1",
"qrcode.vue": "^3.4.1",
"vee-validate": "^4.11.8",
"vue": "^3.3.7",
Expand Down
35 changes: 24 additions & 11 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,28 @@ onErrorCaptured((e: Error) => {
</script>

<template>
<ConfirmDialog />
<ProgressLoader v-if="getIsLoading" />
<Toast />
<AppLayout>
<template #nav>
<Navbar />
</template>
<template #main>
<RouterView v-if="ready" />
</template>
</AppLayout>
<div class="container">
<ConfirmDialog />
<ProgressLoader v-if="getIsLoading" />
<Toast />

<AppLayout>
<template #nav>
<Navbar />
</template>
<template #main>
<RouterView v-if="ready" />
</template>
</AppLayout>
</div>
</template>

<style scoped>
.container {
display: flex;
align-items: center;
justify-content: center;
min-height: 100vh;
width: 100%;
}
</style>
86 changes: 0 additions & 86 deletions frontend/src/assets/base.css

This file was deleted.

Loading

0 comments on commit 40e1328

Please sign in to comment.