Commit 4a01b58a authored by Dirk Luijk's avatar Dirk Luijk

Fixed refresh error when running frontend from backend

parent 2c790e87
......@@ -33,17 +33,14 @@ processResources {
// configure gradle-node-plugin
node {
//version = '8.9.4'
//npmVersion = '5.6.0'
download = true
workDir = file("${project.projectDir}/frontend/node")
download = false
npmWorkDir = file("${project.projectDir}/frontend")
nodeModulesDir = file("${project.projectDir}/frontend")
}
// clean node/node_modules/dist
task npmClean(type: Delete) {
task frontendClean(type: Delete) {
final def webDir = "${rootDir}/frontend"
delete "${webDir}/node"
delete "${webDir}/node_modules"
delete "${webDir}/dist"
delete "${webDir}/coverage"
......@@ -51,7 +48,7 @@ task npmClean(type: Delete) {
}
clean.dependsOn(npmClean)
clean.dependsOn(frontendClean)
build.dependsOn(npm_install)
build.dependsOn(npm_run_build)
//processResources.dependsOn(npm_run_build)
......
......@@ -1033,6 +1033,23 @@
"hoek": "2.16.3"
}
},
"bootstrap": {
"version": "4.0.0-beta.3",
"resolved": "https://npmjs.build.edubase.malmberg.nl/repository/npm/bootstrap/-/bootstrap-4.0.0-beta.3.tgz",
"integrity": "sha512-/Qe1Q2d1muLEZRX2iCteMQHZBBAm6ZIjJ9FcBYK/xLr05+HvDtBOVBN+Cz7mCNZuy0zr+y5artZHM05W7mIz6g==",
"dev": true
},
"bootswatch": {
"version": "4.0.0-beta.3",
"resolved": "https://npmjs.build.edubase.malmberg.nl/repository/npm/bootswatch/-/bootswatch-4.0.0-beta.3.tgz",
"integrity": "sha1-Uznc4FXBAR8pFGc2SwoliBgOjDc=",
"dev": true,
"requires": {
"bootstrap": "4.0.0-beta.3",
"jquery": "3.2.1",
"popper.js": "1.12.9"
}
},
"brace-expansion": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
......@@ -5865,6 +5882,12 @@
"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
"dev": true
},
"jquery": {
"version": "3.2.1",
"resolved": "https://npmjs.build.edubase.malmberg.nl/repository/npm/jquery/-/jquery-3.2.1.tgz",
"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
"dev": true
},
"js-base64": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.0.tgz",
......@@ -7858,6 +7881,12 @@
"find-up": "2.1.0"
}
},
"popper.js": {
"version": "1.12.9",
"resolved": "https://npmjs.build.edubase.malmberg.nl/repository/npm/popper.js/-/popper.js-1.12.9.tgz",
"integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM=",
"dev": true
},
"portfinder": {
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
......
......@@ -11,8 +11,6 @@ import { TransactionService } from './api/transaction.service';
import { MessagesComponent } from './messages/messages.component';
import { MessageService } from './messages/message.service';
import { DashboardComponent } from './dashboard/dashboard.component';
// import {HttpClientInMemoryWebApiModule} from 'angular-in-memory-web-api';
// import { InMemoryDataService } from './api/in-memory-data.service';
const routes: Routes = [
{ path: '', redirectTo: '/dashboard', pathMatch: 'full' },
......@@ -32,11 +30,8 @@ const routes: Routes = [
imports: [
BrowserModule,
FormsModule,
RouterModule.forRoot(routes),
RouterModule.forRoot(routes, { useHash: true }),
HttpClientModule
// ,HttpClientInMemoryWebApiModule.forRoot(
// InMemoryDataService, { dataEncapsulation: false }
// )
],
providers: [TransactionService, MessageService],
bootstrap: [AppComponent]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment