mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standalone app - auto migrate

Browse Source
This commit is contained in:
Michał Zieliński
2023-06-23 15:32:59 +02:00
parent 6fecc9bcd4
commit 314edeec40
15 changed files with 149 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Frontend/src/app/app.component.ts
View File

@@ -1,9 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterOutlet } from '@angular/router';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'] styleUrls: ['./app.component.scss'],
standalone: true,
imports: [RouterOutlet]
}) })
export class AppComponent { export class AppComponent {
title = 'DiunaBI'; title = 'DiunaBI';

58
Frontend/src/app/app.module.ts
View File

@@ -1,58 +0,0 @@
import { NgModule, isDevMode, LOCALE_ID } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MainViewComponent } from './main-view/main-view.component';
import { MaterialModule } from './material.module';
import { LoginPageComponent } from './components/login-page/login-page.component';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { ServiceWorkerModule } from '@angular/service-worker';
import { LoaderInterceptor } from './interceptors/loader.interceptor';
import { AuthInterceptor } from './interceptors/auth.interceptor';
import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';
import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MomentDateAdapter } from '@angular/material-moment-adapter';
import { registerLocaleData } from '@angular/common';
import localePl from '@angular/common/locales/pl';
import { NotificationsComponent } from './components/notifications/notifications.component';
registerLocaleData(localePl, 'pl-PL');
@NgModule({
declarations: [
AppComponent,
MainViewComponent,
LoginPageComponent,
NotificationsComponent
],
imports: [
BrowserModule,
AppRoutingModule,
BrowserAnimationsModule,
MaterialModule,
HttpClientModule,
ServiceWorkerModule.register('ngsw-worker.js', {
enabled: !isDevMode(),
// Register the ServiceWorker as soon as the application is stable
// or after 30 seconds (whichever comes first).
registrationStrategy: 'registerWhenStable:30000'
})
],
providers: [
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS] },
{ provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } },
{ provide: LOCALE_ID, useValue: 'pl-PL' },
{
provide: HTTP_INTERCEPTORS,
useClass: LoaderInterceptor,
multi: true
},
{
provide: HTTP_INTERCEPTORS,
useClass: AuthInterceptor,
multi: true
},
],
bootstrap: [AppComponent]
})
export class AppModule { }

14
Frontend/src/app/components/login-page/login-page.component.ts
View File

@@ -4,12 +4,16 @@ import jwt_decode from "jwt-decode";
import { AuthService } from 'src/app/auth/auth.service'; import { AuthService } from 'src/app/auth/auth.service';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { NotificationsService } from 'src/app/services/notifications.service'; import { NotificationsService } from 'src/app/services/notifications.service';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { MatCardModule } from '@angular/material/card';
import { NgIf } from '@angular/common';
@Component({ @Component({
selector: 'app-login-page', selector: 'app-login-page',
templateUrl: './login-page.component.html', templateUrl: './login-page.component.html',
styleUrls: ['./login-page.component.scss'] styleUrls: ['./login-page.component.scss'],
standalone: true,
imports: [NgIf, MatCardModule]
}) })
export class LoginPageComponent implements OnInit { export class LoginPageComponent implements OnInit {

4
Frontend/src/app/components/notifications/notifications.component.spec.ts
View File

@@ -8,8 +8,8 @@ describe('NotificationsComponent', () => {
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ NotificationsComponent ] imports: [NotificationsComponent]
}) })
.compileComponents(); .compileComponents();
fixture = TestBed.createComponent(NotificationsComponent); fixture = TestBed.createComponent(NotificationsComponent);

14
Frontend/src/app/components/notifications/notifications.component.ts
View File

@@ -1,10 +1,18 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { NotificationsService } from 'src/app/services/notifications.service'; import { NotificationsService } from 'src/app/services/notifications.service';
import { MatCardModule } from '@angular/material/card';
import { NgFor, NgIf } from '@angular/common';
@Component({ @Component({
selector: 'app-notifications', selector: 'app-notifications',
templateUrl: './notifications.component.html', templateUrl: './notifications.component.html',
styleUrls: ['./notifications.component.scss'], styleUrls: ['./notifications.component.scss'],
standalone: true,
imports: [
NgFor,
MatCardModule,
NgIf,
],
}) })
export class NotificationsComponent { export class NotificationsComponent {
constructor( constructor(

18
Frontend/src/app/main-view/main-view.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, NgZone, ViewChild } from '@angular/core'; import { Component, NgZone, ViewChild } from '@angular/core';
import { MatSidenav } from '@angular/material/sidenav'; import { MatSidenav, MatSidenavModule } from '@angular/material/sidenav';
import { NavigationStart, Router } from '@angular/router'; import { NavigationStart, Router, RouterLink, RouterOutlet } from '@angular/router';
import { SwUpdate } from '@angular/service-worker'; import { SwUpdate } from '@angular/service-worker';
import * as moment from 'moment'; import * as moment from 'moment';
import packageInfo from 'package.json'; import packageInfo from 'package.json';
@@ -10,11 +10,19 @@ import { AuthService } from '../auth/auth.service';
import { DataService } from '../services/data.service'; import { DataService } from '../services/data.service';
import { DeviceService } from '../services/device.service'; import { DeviceService } from '../services/device.service';
import { NotificationsService } from '../services/notifications.service'; import { NotificationsService } from '../services/notifications.service';
import { MatDividerModule } from '@angular/material/divider';
import { MatListModule } from '@angular/material/list';
import { MatButtonModule } from '@angular/material/button';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatIconModule } from '@angular/material/icon';
import { NgIf, DatePipe } from '@angular/common';
@Component({ @Component({
selector: 'app-main-view', selector: 'app-main-view',
templateUrl: './main-view.component.html', templateUrl: './main-view.component.html',
styleUrls: ['./main-view.component.scss'] styleUrls: ['./main-view.component.scss'],
standalone: true,
imports: [NgIf, MatIconModule, MatToolbarModule, MatButtonModule, MatSidenavModule, MatListModule, RouterLink, MatDividerModule, RouterOutlet, DatePipe]
}) })
export class MainViewComponent { export class MainViewComponent {
@ViewChild('snav') snav?: MatSidenav; @ViewChild('snav') snav?: MatSidenav;

73
Frontend/src/app/material.module.ts
View File

@@ -1,73 +0,0 @@
import {NgModule} from '@angular/core';
//import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatButtonModule } from '@angular/material/button';
//import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { MatCardModule } from '@angular/material/card';
//import { MatCheckboxModule } from '@angular/material/checkbox';
//import { MatChipsModule } from '@angular/material/chips';
//import { MatStepperModule } from '@angular/material/stepper';
//import { MatDatepickerModule } from '@angular/material/datepicker';
//import { MatDialogModule } from '@angular/material/dialog';
//import { MatExpansionModule } from '@angular/material/expansion';
import { MatGridListModule } from '@angular/material/grid-list';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatListModule } from '@angular/material/list';
import { MatMenuModule } from '@angular/material/menu';
import { MatPaginatorModule } from '@angular/material/paginator';
//import { MatProgressBarModule } from '@angular/material/progress-bar';
//import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
//import { MatRadioModule } from '@angular/material/radio';
//import { MatRippleModule } from '@angular/material/core';
import { MatSelectModule } from '@angular/material/select';
import { MatSidenavModule } from '@angular/material/sidenav';
//import { MatSliderModule } from '@angular/material/slider';
//import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
//import { MatTabsModule } from '@angular/material/tabs';
import { MatToolbarModule } from '@angular/material/toolbar';
//import { MatTooltipModule } from '@angular/material/tooltip';
//import {CdkTableModule} from '@angular/cdk/table';
//import {MatBadgeModule} from '@angular/material/badge';
import {MatBottomSheetModule} from '@angular/material/bottom-sheet';
@NgModule({
exports: [
// CdkTableModule,
// MatAutocompleteModule,
MatButtonModule,
// MatButtonToggleModule,
MatCardModule,
// MatCheckboxModule,
// MatChipsModule,
// MatStepperModule,
// MatDatepickerModule,
// MatDialogModule,
// MatExpansionModule,
MatGridListModule,
MatIconModule,
MatInputModule,
MatListModule,
MatMenuModule,
MatPaginatorModule,
// MatProgressBarModule,
// MatProgressSpinnerModule,
// MatRadioModule,
// MatRippleModule,
MatSelectModule,
// MatSidenavModule,
// MatSliderModule,
// MatSlideToggleModule,
MatSortModule,
MatTableModule,
// MatTabsModule,
MatToolbarModule,
// MatTooltipModule,
MatSidenavModule,
// MatBadgeModule,
MatBottomSheetModule
],
providers: []
})
export class MaterialModule {}

9
Frontend/src/app/modules/dashboard/board/board.component.ts
View File

@@ -2,10 +2,11 @@ import { Component } from '@angular/core';
import { DeviceService } from 'src/app/services/device.service'; import { DeviceService } from 'src/app/services/device.service';
@Component({ @Component({
selector: 'app-board', selector: 'app-board',
templateUrl: './board.component.html', templateUrl: './board.component.html',
styleUrls: ['./board.component.scss'] styleUrls: ['./board.component.scss'],
standalone: true
}) })
export class BoardComponent { export class BoardComponent {
constructor( constructor(

14
Frontend/src/app/modules/dashboard/dashboard.module.ts
View File

@@ -5,13 +5,11 @@ import { DashboardRoutingModule } from './dashboard-routing.module';
import { BoardComponent } from './board/board.component'; import { BoardComponent } from './board/board.component';
@NgModule({ @NgModule({
declarations: [ imports: [
BoardComponent CommonModule,
], DashboardRoutingModule,
imports: [ BoardComponent
CommonModule, ]
DashboardRoutingModule
]
}) })
export class DashboardModule { } export class DashboardModule { }

22
Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts
View File

@@ -1,20 +1,28 @@
import { DatePipe } from '@angular/common'; import { DatePipe, NgIf, DecimalPipe } from '@angular/common';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; import { UntypedFormGroup, UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatSort, MatSortable } from '@angular/material/sort'; import { MatSort, MatSortable, MatSortModule } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table'; import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { AuthService } from 'src/app/auth/auth.service'; import { AuthService } from 'src/app/auth/auth.service';
import { Layer } from 'src/app/models/layer.model'; import { Layer } from 'src/app/models/layer.model';
import { Record } from 'src/app/models/record.model'; import { Record } from 'src/app/models/record.model';
import { NotificationsService } from 'src/app/services/notifications.service'; import { NotificationsService } from 'src/app/services/notifications.service';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { MatInputModule } from '@angular/material/input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatGridListModule } from '@angular/material/grid-list';
import { MatButtonModule } from '@angular/material/button';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatCardModule } from '@angular/material/card';
@Component({ @Component({
selector: 'app-layer-detail', selector: 'app-layer-detail',
templateUrl: './layer-detail.component.html', templateUrl: './layer-detail.component.html',
styleUrls: ['./layer-detail.component.scss'] styleUrls: ['./layer-detail.component.scss'],
standalone: true,
imports: [FormsModule, ReactiveFormsModule, MatCardModule, MatToolbarModule, MatButtonModule, MatGridListModule, MatFormFieldModule, MatInputModule, NgIf, MatTableModule, MatSortModule, DecimalPipe]
}) })
export class LayerDetailComponent implements OnInit { export class LayerDetailComponent implements OnInit {

26
Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts
View File

@@ -1,20 +1,32 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatSort } from '@angular/material/sort'; import { MatSort, MatSortModule } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table'; import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute, RouterLink } from '@angular/router';
import moment from 'moment'; import moment from 'moment';
import { AuthService } from 'src/app/auth/auth.service'; import { AuthService } from 'src/app/auth/auth.service';
import { Layer } from 'src/app/models/layer.model'; import { Layer } from 'src/app/models/layer.model';
import { Record } from 'src/app/models/record.model'; import { Record } from 'src/app/models/record.model';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { MatIconModule } from '@angular/material/icon';
import { MatOptionModule } from '@angular/material/core';
import { MatSelectModule } from '@angular/material/select';
import { NgIf, DecimalPipe } from '@angular/common';
import { MatInputModule } from '@angular/material/input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatGridListModule } from '@angular/material/grid-list';
import { MatButtonModule } from '@angular/material/button';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatCardModule } from '@angular/material/card';
@Component({ @Component({
selector: 'app-layer-edit', selector: 'app-layer-edit',
templateUrl: './layer-edit.component.html', templateUrl: './layer-edit.component.html',
styleUrls: ['./layer-edit.component.scss'] styleUrls: ['./layer-edit.component.scss'],
standalone: true,
imports: [FormsModule, ReactiveFormsModule, MatCardModule, MatToolbarModule, MatButtonModule, RouterLink, MatGridListModule, MatFormFieldModule, MatInputModule, NgIf, MatSelectModule, MatOptionModule, MatIconModule, MatTableModule, MatSortModule, DecimalPipe]
}) })
export class LayerEditComponent implements OnInit { export class LayerEditComponent implements OnInit {

19
Frontend/src/app/modules/layers/layers-list/layers-list.component.ts
View File

@@ -1,14 +1,21 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator'; import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
import { MatSort, MatSortable } from '@angular/material/sort'; import { MatSort, MatSortable, MatSortModule } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table'; import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Layer } from 'src/app/models/layer.model'; import { Layer } from 'src/app/models/layer.model';
import { MatInputModule } from '@angular/material/input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { RouterLink } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
import { MatGridListModule } from '@angular/material/grid-list';
@Component({ @Component({
selector: 'app-layers-list', selector: 'app-layers-list',
templateUrl: './layers-list.component.html', templateUrl: './layers-list.component.html',
styleUrls: ['./layers-list.component.scss'] styleUrls: ['./layers-list.component.scss'],
standalone: true,
imports: [MatGridListModule, MatButtonModule, RouterLink, MatFormFieldModule, MatInputModule, MatTableModule, MatSortModule, MatPaginatorModule]
}) })
export class LayersListComponent implements OnInit { export class LayersListComponent implements OnInit {
displayedColumns = ['number', 'name', 'source']; displayedColumns = ['number', 'name', 'source'];

23
Frontend/src/app/modules/layers/layers.module.ts
View File

@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common'; import { CommonModule, DatePipe } from '@angular/common';
import { MaterialModule } from 'src/app/material.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { LayersListComponent } from './layers-list/layers-list.component'; import { LayersListComponent } from './layers-list/layers-list.component';
import { LayerEditComponent } from './layer-edit/layer-edit.component'; import { LayerEditComponent } from './layer-edit/layer-edit.component';
@@ -8,20 +8,17 @@ import { LayerDetailComponent } from './layer-detail/layer-detail.component';
import { LayersRoutingModule } from './layers-routing.module'; import { LayersRoutingModule } from './layers-routing.module';
@NgModule({ @NgModule({
declarations: [ imports: [
CommonModule,
LayersRoutingModule,
FormsModule,
ReactiveFormsModule,
LayersListComponent, LayersListComponent,
LayerEditComponent, LayerEditComponent,
LayerDetailComponent LayerDetailComponent
], ],
imports: [ providers: [
CommonModule, DatePipe
LayersRoutingModule, ]
MaterialModule,
FormsModule,
ReactiveFormsModule
],
providers: [
DatePipe
]
}) })
export class LayersModule { } export class LayersModule { }

40
Frontend/src/main.ts
View File

@@ -1,12 +1,46 @@
import { enableProdMode } from '@angular/core'; import { enableProdMode, LOCALE_ID, isDevMode, importProvidersFrom } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment'; import { environment } from './environments/environment';
import { AppComponent } from './app/app.component';
import { ServiceWorkerModule } from '@angular/service-worker';
import { provideAnimations } from '@angular/platform-browser/animations';
import { AppRoutingModule } from './app/app-routing.module';
import { BrowserModule, bootstrapApplication } from '@angular/platform-browser';
import { AuthInterceptor } from './app/interceptors/auth.interceptor';
import { LoaderInterceptor } from './app/interceptors/loader.interceptor';
import { HTTP_INTERCEPTORS, withInterceptorsFromDi, provideHttpClient } from '@angular/common/http';
import { MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter';
import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';
if (environment.production) { if (environment.production) {
enableProdMode(); enableProdMode();
} }
platformBrowserDynamic().bootstrapModule(AppModule) bootstrapApplication(AppComponent, {
providers: [
importProvidersFrom(BrowserModule, AppRoutingModule, ServiceWorkerModule.register('ngsw-worker.js', {
enabled: !isDevMode(),
// Register the ServiceWorker as soon as the application is stable
// or after 30 seconds (whichever comes first).
registrationStrategy: 'registerWhenStable:30000'
})),
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS] },
{ provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } },
{ provide: LOCALE_ID, useValue: 'pl-PL' },
{
provide: HTTP_INTERCEPTORS,
useClass: LoaderInterceptor,
multi: true
},
{
provide: HTTP_INTERCEPTORS,
useClass: AuthInterceptor,
multi: true
},
provideAnimations(),
provideHttpClient(withInterceptorsFromDi())
]
})
.catch(err => console.error(err)); .catch(err => console.error(err));

6
WebAPI/Models/Record.cs
View File

@@ -8,11 +8,11 @@ namespace WebAPI.Models
[Key] [Key]
public Guid Id { get; set; } public Guid Id { get; set; }
[Required] [Required]
public string? Code { get; set; } public string? Code { get; set; } // number
[Required] [Required]
public float Value { get; set; } public float Value { get; set; } // string
//Description fields //Description fields
public string? Desc1 { get; set; } public string? Desc1 { get; set; } // Desc1 => Value1
public string? Desc2 { get; set; } public string? Desc2 { get; set; }
public string? Desc3 { get; set; } public string? Desc3 { get; set; }
public string? Desc4 { get; set; } public string? Desc4 { get; set; }