diff --git a/.gitignore b/.gitignore index 5c33d5d87..6e7614b65 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ hs_err_pid* # node.js / frontend node_modules/ dist/ +cache/ diff --git a/frontend/datasafe-ui/angular.json b/frontend/datasafe-ui/angular.json index bb53be0a1..8d763c103 100755 --- a/frontend/datasafe-ui/angular.json +++ b/frontend/datasafe-ui/angular.json @@ -69,21 +69,21 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "my-app:build" + "buildTarget": "my-app:build" }, "configurations": { "production": { - "browserTarget": "my-app:build:production" + "buildTarget": "my-app:build:production" }, "dev": { - "browserTarget": "my-app:build:dev" + "buildTarget": "my-app:build:dev" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "my-app:build" + "buildTarget": "my-app:build" } }, "test": { @@ -118,5 +118,7 @@ } } }, - "defaultProject": "datasafe-ui" + "cli": { + "analytics": false + } } \ No newline at end of file diff --git a/frontend/datasafe-ui/main.js.map b/frontend/datasafe-ui/main.js.map new file mode 100644 index 000000000..0723729af --- /dev/null +++ b/frontend/datasafe-ui/main.js.map @@ -0,0 +1 @@ +{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":";;AAAA,qCAAoD;AACpD,2BAA6B;AAC7B,yBAA2B;AAE3B,IAAI,GAAG,EAAE,KAAK,CAAC;AACf,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,KAAK,SAAS,EAAjB,CAAiB,CAAC,CAAC;AAE5C,SAAS,YAAY;IAEnB,IAAM,cAAc,GAAG,iBAAM,CAAC;IAC9B,IAAM,IAAI,GAAG,cAAc,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC;IAE7D,6BAA6B;IAC7B,GAAG,GAAG,IAAI,wBAAa,CAAC;QACtB,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,cAAc,EAAE;YACd,eAAe,EAAE,IAAI;SACtB;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE;YACpC,QAAQ,EAAE,OAAO,CAAC,UAAG,SAAS,2BAAwB,CAAC;SACxD,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;KACtC;SAAM;QACL,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;YACrB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC;YACjD,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,CAAC;KACL;IAED,IAAI,KAAK,EAAE;QACT,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;KAChC;IAED,qCAAqC;IACrC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE;QACf,gEAAgE;QAChE,mEAAmE;QACnE,oDAAoD;QACpD,GAAG,GAAG,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;AAEL,CAAC;AAED,IAAI;IAEF,wDAAwD;IACxD,yDAAyD;IACzD,sDAAsD;IACtD,cAAG,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE9B,oCAAoC;IACpC,cAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE;QAC1B,2DAA2D;QAC3D,8DAA8D;QAC9D,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YACjC,cAAG,CAAC,IAAI,EAAE,CAAC;SACZ;IACH,CAAC,CAAC,CAAC;IAEH,cAAG,CAAC,EAAE,CAAC,UAAU,EAAE;QACjB,gEAAgE;QAChE,4DAA4D;QAC5D,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,YAAY,EAAE,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;CAEJ;AAAC,OAAO,CAAC,EAAE;IACV,cAAc;IACd,WAAW;CACZ"} \ No newline at end of file diff --git a/frontend/datasafe-ui/package.json b/frontend/datasafe-ui/package.json index 7994278ae..128db41bd 100644 --- a/frontend/datasafe-ui/package.json +++ b/frontend/datasafe-ui/package.json @@ -32,28 +32,27 @@ "e2e": "npm run build:prod && ../datasafe-ui/node_modules/.bin/mocha --timeout 300000 --require ts-node/register e2e/**/*.spec.ts" }, "devDependencies": { - "@angular-devkit/build-angular": "15.2.9", - "@angular/animations": "15.2.9", - "@angular/cdk": "15.2.9", - "@angular/cli": "15.2.9", - "@angular/common": "15.2.9", - "@angular/compiler": "15.2.9", - "@angular/compiler-cli": "15.2.9", - "@angular/core": "15.2.9", - - "@angular/forms": "15.2.9", - "@angular/material": "15.2.9", - "@angular/material-moment-adapter": "15.2.9", - "@angular/platform-browser": "15.2.9", - "@angular/platform-browser-dynamic": "15.2.9", - "@angular/router": "15.2.9", + "@angular-devkit/build-angular": "17.1.3", + "@angular/animations": "17.1.3", + "@angular/cdk": "17.1.2", + "@angular/cli": "17.1.3", + "@angular/common": "17.1.3", + "@angular/compiler": "17.1.3", + "@angular/compiler-cli": "17.1.3", + "@angular/core": "17.1.3", + "@angular/forms": "17.1.3", + "@angular/material": "17.1.2", + "@angular/material-moment-adapter": "17.1.2", + "@angular/platform-browser": "17.1.3", + "@angular/platform-browser-dynamic": "17.1.3", + "@angular/router": "17.1.3", "@types/jasmine": "4.3.6", "@types/jasminewd2": "2.0.11", "@types/mocha": "10.0.2", "@types/node": "20.8.0", "codelyzer": "6.0.2", "core-js": "3.33.0", - "electron": "^26.2.4", + "electron": "^26.6.9", "electron-builder": "24.7.0", "electron-reload": "1.5.0", "hammerjs": "2.0.8", @@ -71,11 +70,11 @@ "spectron": "19.0.0", "ts-node": "10.9.1", "tslint": "5.17.0", - "typescript": "4.9.4", - "wait-on": "7.0.1", + "typescript": "5.2.2", + "wait-on": "^7.2.0", "web-animations-js": "2.3.2", "webdriver-manager": "13.0.2", - "zone.js": "0.13.0" + "zone.js": "^0.14.3" }, "engines": { "node": ">=18.10.0" diff --git a/frontend/datasafe-ui/src/app/app.module.ts b/frontend/datasafe-ui/src/app/app.module.ts index b582f3904..374db1559 100755 --- a/frontend/datasafe-ui/src/app/app.module.ts +++ b/frontend/datasafe-ui/src/app/app.module.ts @@ -34,7 +34,7 @@ const appRoutes: Routes = [ ReactiveFormsModule, RouterModule.forRoot(appRoutes) ], - entryComponents: [AppComponent, AddFolderDialog, ConfigureApiDialog], + declarations: [AppComponent, UserComponent, LoginComponent, RegisterComponent, FiletreeComponent, AddFolderDialog, ConfigureApiDialog], bootstrap: [AppComponent], providers: [] diff --git a/frontend/datasafe-ui/src/app/polyfills.ts b/frontend/datasafe-ui/src/app/polyfills.ts index 203549750..d9a70a1ca 100755 --- a/frontend/datasafe-ui/src/app/polyfills.ts +++ b/frontend/datasafe-ui/src/app/polyfills.ts @@ -1,4 +1,4 @@ import 'core-js/features/reflect'; -import 'zone.js/dist/zone'; +import 'zone.js'; import 'hammerjs'; import 'web-animations-js'; \ No newline at end of file