Skip to content

Commit fb8e6e8

Browse files
committed
refactor vue-router configuration and use of $router.options.routes instead of custom config object; bump node dependencies and .NET Core nuget packages
1 parent cc7ac71 commit fb8e6e8

File tree

27 files changed

+235
-167
lines changed

27 files changed

+235
-167
lines changed

.vscode/launch.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (web)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/GhostUI/bin/Debug/netcoreapp3.1/GhostUI.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/GhostUI",
16+
"stopAtEntry": false,
17+
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
18+
"serverReadyAction": {
19+
"action": "openExternally",
20+
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
21+
},
22+
"env": {
23+
"ASPNETCORE_ENVIRONMENT": "Development"
24+
},
25+
"sourceFileMap": {
26+
"/Views": "${workspaceFolder}/Views"
27+
}
28+
},
29+
{
30+
"name": ".NET Core Attach",
31+
"type": "coreclr",
32+
"request": "attach",
33+
"processId": "${command:pickProcess}"
34+
}
35+
]
36+
}

.vscode/tasks.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/GhostUI/GhostUI.csproj",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/GhostUI/GhostUI.csproj",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"${workspaceFolder}/GhostUI/GhostUI.csproj",
36+
"/property:GenerateFullPaths=true",
37+
"/consoleloggerparameters:NoSummary"
38+
],
39+
"problemMatcher": "$msCompile"
40+
}
41+
]
42+
}

GhostUI/ClientApp/.browserslistrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
> 0.2%
1+
> 1%
22
last 2 versions
33
not dead
4-
not op_mini all

GhostUI/ClientApp/package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GhostUI/ClientApp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"@fortawesome/vue-fontawesome": "^2.0.0",
2020
"@microsoft/signalr": "^3.1.8",
2121
"axios": "^0.20.0",
22-
"bulma": "^0.9.0",
22+
"bulma": "^0.9.1",
2323
"core-js": "^3.6.5",
2424
"register-service-worker": "^1.7.1",
2525
"vue": "^2.6.12",
2626
"vue-class-component": "^7.2.6",
2727
"vue-property-decorator": "^9.0.0",
28-
"vue-router": "^3.4.3",
28+
"vue-router": "^3.4.5",
2929
"vue-snotify": "^3.2.1",
3030
"vue-styled-components": "^1.5.1",
3131
"vuex": "^3.5.1"
@@ -42,7 +42,7 @@
4242
"@vue/test-utils": "1.1.0",
4343
"node-sass": "^4.14.1",
4444
"sass-loader": "^10.0.2",
45-
"ts-jest": "^26.4.0",
45+
"ts-jest": "^26.4.1",
4646
"typescript": "^4.0.3",
4747
"vue-svg-loader": "^0.16.0",
4848
"vue-template-compiler": "^2.6.12",

GhostUI/ClientApp/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<script lang="ts">
1414
import { Component, Vue } from "vue-property-decorator";
15-
import { AppFooter, Navbar, Settings } from "@/components";
15+
import { AppFooter, Navbar, Settings } from "./components";
1616
1717
@Component({
1818
components: {

GhostUI/ClientApp/src/assets/style/scss/base/transitions.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
opacity: 0;
99
}
1010

11-
.pageSlideRight-enter-active {
11+
.page-slide-right-enter-active {
1212
animation: page-enter-slideRight both cubic-bezier(0.4, 0, 0, 1.5);
1313
animation-duration: 0.35s;
1414
}
1515

16-
.pageSlideLeft-enter-active {
16+
.page-slide-left-enter-active {
1717
animation: page-enter-slideLeft both cubic-bezier(0.4, 0, 0, 1.5);
1818
animation-duration: 0.35s;
1919
}
2020

21-
.pageSlideRight-leave-active,
22-
.pageSlideLeft-leave-active {
21+
.page-slide-right-leave-active,
22+
.page-slide-left-leave-active {
2323
animation: page-leave-fadeOut ease;
2424
animation-duration: 0.25s;
2525
}

GhostUI/ClientApp/src/assets/style/scss/scoped/settings.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
margin-bottom: 0.5rem;
7777
margin-left: auto;
7878
margin-right: auto;
79-
border-bottom: 1px solid rgba(0,0,0,.125);
79+
border-bottom: 1px solid rgba(0,0,0,.1);
8080
}
8181

8282
.dropdown-item {
@@ -91,7 +91,7 @@
9191
> svg {
9292
opacity: 0.8;
9393
margin-left: 0.3rem;
94-
margin-right: 0.3rem;
94+
margin-right: 0.5rem;
9595
}
9696
}
9797

GhostUI/ClientApp/src/components/Authenticator.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<script lang="ts">
1616
import { Component, Prop, Watch, Vue } from "vue-property-decorator";
17-
import { AuthStatusEnum } from "@/store/modules/auth";
17+
import { AuthStatusEnum } from "../store/modules/auth";
1818
1919
@Component
2020
export default class Authenticator extends Vue {

GhostUI/ClientApp/src/components/Navbar.vue

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="navbar-routes">
1313
<div v-if="isAuthenticated" class="navbar-items-group">
1414
<router-link
15-
v-for="route in navRoutes"
15+
v-for="route in validNavRoutes"
1616
:key="route.path"
1717
:to="route.path"
1818
class="navbar-item"
@@ -27,8 +27,8 @@
2727

2828
<script lang="ts">
2929
import { Component, Vue } from "vue-property-decorator";
30-
import { RoutesConfig, Route } from "@/config/routes.config";
31-
import { AuthModule } from "@/store/modules/auth";
30+
import { RouteConfig } from 'vue-router';
31+
import { AuthModule } from "../store/modules/auth";
3232
import BulmaLogo from "@/assets/img/BulmaLogo.svg?inline";
3333
3434
@Component({
@@ -41,11 +41,9 @@ export default class Navbar extends Vue {
4141
return AuthModule.isAuthenticated;
4242
}
4343
44-
public navRoutes: Route[] = Object.keys(RoutesConfig).reduce((acc, key) => {
45-
const route = RoutesConfig[key];
46-
route.meta.showInNav && acc.push(route);
47-
return acc;
48-
}, [] as Route[]);
44+
get validNavRoutes(): RouteConfig[] {
45+
return this.$router.options.routes.filter(({ meta }) => !!meta.showInNav);
46+
}
4947
}
5048
</script>
5149

0 commit comments

Comments
 (0)