diff --git a/DiunaBI.code-workspace b/DiunaBI.code-workspace new file mode 100644 index 0000000..8aba6a2 --- /dev/null +++ b/DiunaBI.code-workspace @@ -0,0 +1,7 @@ +{ + "folders": [ + { + "path": "." + } + ] +} \ No newline at end of file diff --git a/Diuna.sln b/DiunaBI.sln similarity index 87% rename from Diuna.sln rename to DiunaBI.sln index 1aa9a20..a43d2d9 100644 --- a/Diuna.sln +++ b/DiunaBI.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33110.190 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{799D68C2-A4C1-43F8-8C35-1126C0AC32D6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiunaBI-WebAPI", "WebAPI\DiunaBI-WebAPI.csproj", "{799D68C2-A4C1-43F8-8C35-1126C0AC32D6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Frontend/DiunaBI.code-workspace b/Frontend/DiunaBI.code-workspace new file mode 100644 index 0000000..9e68e72 --- /dev/null +++ b/Frontend/DiunaBI.code-workspace @@ -0,0 +1,7 @@ +{ + "folders": [ + { + "path": ".." + } + ] +} \ No newline at end of file diff --git a/Frontend/README.md b/Frontend/README.md index 82738c2..e69de29 100644 --- a/Frontend/README.md +++ b/Frontend/README.md @@ -1,27 +0,0 @@ -# Diuna - -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.3. - -## Development server - -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files. - -## Code scaffolding - -Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. - -## Build - -Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. - -## Running unit tests - -Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Running end-to-end tests - -Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities. - -## Further help - -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page. diff --git a/Frontend/angular.json b/Frontend/angular.json index 9655ab0..b74ea7d 100644 --- a/Frontend/angular.json +++ b/Frontend/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "Diuna": { + "DiunaBI": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -17,7 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/diuna", + "outputPath": "dist/diunaBI", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", @@ -76,10 +76,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "Diuna:build:production" + "browserTarget": "DiunaBI:build:production" }, "development": { - "browserTarget": "Diuna:build:development" + "browserTarget": "DiunaBI:build:development" } }, "defaultConfiguration": "development" @@ -87,7 +87,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "Diuna:build" + "browserTarget": "DiunaBI:build" } }, "test": { diff --git a/Frontend/karma.conf.js b/Frontend/karma.conf.js index 9848f99..33b60ce 100644 --- a/Frontend/karma.conf.js +++ b/Frontend/karma.conf.js @@ -25,7 +25,7 @@ module.exports = function (config) { suppressAll: true // removes the duplicated traces }, coverageReporter: { - dir: require('path').join(__dirname, './coverage/diuna'), + dir: require('path').join(__dirname, './coverage/diunaBI'), subdir: '.', reporters: [ { type: 'html' }, diff --git a/Frontend/package.json b/Frontend/package.json index 8efb561..47eab84 100644 --- a/Frontend/package.json +++ b/Frontend/package.json @@ -1,5 +1,5 @@ { - "name": "diuna", + "name": "diuna-bi", "version": "0.0.5", "scripts": { "ng": "ng", diff --git a/Frontend/src/app/app.component.ts b/Frontend/src/app/app.component.ts index 936b2b5..35d3e1b 100644 --- a/Frontend/src/app/app.component.ts +++ b/Frontend/src/app/app.component.ts @@ -6,5 +6,5 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - title = 'Diuna'; + title = 'DiunaBI'; } diff --git a/Frontend/src/app/components/login-page/login-page.component.ts b/Frontend/src/app/components/login-page/login-page.component.ts index ca00928..9dece1b 100644 --- a/Frontend/src/app/components/login-page/login-page.component.ts +++ b/Frontend/src/app/components/login-page/login-page.component.ts @@ -63,7 +63,7 @@ export class LoginPageComponent implements OnInit { } catch (e: any) { this.loading = false; if (e.status === 401) { - this.snackBar$.open("Użytkownik nie istnieje w bazie danych aplikacji Diuna.", "", { duration: 3000 }); + this.snackBar$.open("Użytkownik nie istnieje w bazie danych aplikacji DiunaBI.", "", { duration: 3000 }); } else { this.snackBar$.open("Błąd połączenia z serwerem. Skontaktuj się z administratorem.", "", { duration: 3000 }); } diff --git a/Frontend/src/app/main-view/main-view.component.html b/Frontend/src/app/main-view/main-view.component.html index d748fb1..0c92caf 100644 --- a/Frontend/src/app/main-view/main-view.component.html +++ b/Frontend/src/app/main-view/main-view.component.html @@ -12,7 +12,7 @@ -