Skip to content
Snippets Groups Projects
Commit 45b3e373 authored by Bilal Hassan's avatar Bilal Hassan
Browse files

pushing work of last week refactoring

-remove unused components
-remove dead code
-rename components
parent 6e478508
No related branches found
No related tags found
4 merge requests!25Draft: Resolve #78,!7fixUrlPath,!4merge dev into main,!1after meeting with zoe
Showing
with 61 additions and 183 deletions
......@@ -39,12 +39,12 @@
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumError": "20MB"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
"maximumError": "20MB"
}
],
"outputHashing": "all"
......
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {LoginComponent} from "./module/pages/login/login.component";
import {SignupComponent} from "./module/pages/signup/signup.component";
import {AdminDashboardComponent} from "./module/pages/admin-dashboard/admin-dashboard.component";
import {AuthGuard} from "./shared/auth/auth.guard";
import {RoleGuard} from "./shared/auth/role.guard";
import {StationComponent} from "./module/pages/station/station.component";
import {SensorComponent} from "./module/pages/station/sensor/sensor.component";
import {ClientComponent} from "./module/pages/station/client/client.component";
import {HostComponent} from "./module/pages/station/host/host.component";
import {DashboardComponent} from "./module/pages/dashboard/dashboard.component";
import {ZoomComponent} from "./module/components/zoom/zoom.component";
import {SummaryComponent} from "./module/components/summary/summary.component";
import {CompareComponent} from "./module/components/compare/compare.component";
import {DataHeaderComponent} from "./module/components/header/data-header/data-header.component";
import {ConfigHeaderComponent} from "./module/components/header/config-header/config-header.component";
import {HomeComponent} from "./module/pages/home/home.component";
import {CoomingSoonHeaderComponent} from "./module/components/cooming-soon-header/cooming-soon-header.component";
import {ComingSoonComponent} from "./module/components/coming-soon/coming-soon.component";
import {Lev0Ver2Component} from "./module/components/lev0Ver2/lev0.component";
import {UserManagementComponent} from "./module/pages/admin/userManagment/userManagement.component";
import {StationComponent} from "./module/pages/admin/stationManagement/station/station.component";
import {SensorComponent} from "./module/pages/admin/stationManagement/sensor/sensor.component";
import {ClientComponent} from "./module/pages/admin/stationManagement/client/client.component";
import {HostComponent} from "./module/pages/admin/stationManagement/host/host.component";
import {ZoomComponent} from "./module/components/charts/comparing/chartBar/zoom.component";
import {SummaryComponent} from "./module/components/charts/comparing/fourInOne/summary.component";
import {CompareComponent} from "./module/components/charts/comparing/barChart/compare.component";
import {DataHeaderComponent} from "./module/pages/admin/stationManagement/header/data-header/data-header.component";
import {ConfigHeaderComponent} from "./module/pages/admin/stationManagement/header/config-header/config-header.component";
import {SummaryIconsComponent} from "./module/components/summaryIcons/summaryIcons.component";
import {ProViewComponent} from "./module/components/pro-view/pro-view.component";
import {HomeTailwindcssComponent} from "./module/pages/home-tailwindcss/home-tailwindcss.component";
import {LoginTailwindcssComponent} from "./module/pages/login-tailwindcss/login-tailwindcss.component";
import {Lev0Ver3Component} from "./module/components/lev0-ver3/lev0-ver3.component";
import {HomeComponent} from "./module/pages/home/home.component";
import {LoginTailwindcssComponent} from "./module/pages/login/login.component";
import {SummaryList} from "./module/components/summaryList/summaryList";
const routes: Routes = [
{path: '', redirectTo: 'login', pathMatch: 'full'},
// {path: 'dashboard', component: Lev0Ver2Component, canActivate: [AuthGuard]},
{path: 'dashboard', component: Lev0Ver2Component},
{path: 'dashboard', component: SummaryIconsComponent},
{path: 'chart2', component: ProViewComponent},
{path: '', component: LoginTailwindcssComponent,outlet:'main'},
{path: 'login', component: LoginTailwindcssComponent,outlet:'main'},
{ path: 'homeDash', component: HomeTailwindcssComponent,outlet:'main',
{ path: 'homeDash', component: HomeComponent,outlet:'main',
children: [
{ path: '', component: Lev0Ver2Component, outlet: 'homeDash' },
{ path: '', component: SummaryIconsComponent, outlet: 'homeDash' },
{ path: 'chart', component: ProViewComponent, outlet: 'homeDash' },
{ path: 'dayData', component: Lev0Ver2Component, outlet: 'homeDash' },
{ path: 'dayDataList', component: Lev0Ver3Component, outlet: 'homeDash' }
{ path: 'dayData', component: SummaryIconsComponent, outlet: 'homeDash' },
{ path: 'dayDataList', component: SummaryList, outlet: 'homeDash' }
]
},
{path: 'signup', component: SignupComponent},
{path: 'admin', component: AdminDashboardComponent},
{path: 'station', component: StationComponent,outlet: 'home'},
{path: 'station/sensor', component: SensorComponent,outlet: 'home'},
{path: 'station/client', component: ClientComponent,outlet: 'home'},
{path: 'station/host', component: HostComponent,outlet: 'home'},
{ path: 'zoom', component: ZoomComponent, outlet: 'home' },
{ path: 'summary', component: SummaryComponent, outlet: 'home' },
{ path: 'compare', component: CompareComponent, outlet: 'home' },
{ path: 'host', component: HostComponent, outlet: 'home' },
{ path: 'client', component:ClientComponent, outlet: 'home' },
{ path: 'sensor', component: SensorComponent, outlet: 'home' },
{ path: '', component: SummaryComponent, outlet: 'home' },
// {path:'',component:Lev0Ver2Component,outlet:'home'},
{path:'data',component:Lev0Ver2Component,outlet:'home'},
{path: 'admin', component: UserManagementComponent},
{path: 'station', component: StationComponent,outlet: 'stationManagement'},
{path: 'station/sensor', component: SensorComponent,outlet: 'stationManagement'},
{path: 'station/client', component: ClientComponent,outlet: 'stationManagement'},
{path: 'station/host', component: HostComponent,outlet: 'stationManagement'},
{ path: 'chartBar', component: ZoomComponent, outlet: 'stationManagement' },
{ path: 'summary', component: SummaryComponent, outlet: 'stationManagement' },
{ path: 'compare', component: CompareComponent, outlet: 'stationManagement' },
{ path: 'host', component: HostComponent, outlet: 'stationManagement' },
{ path: 'client', component:ClientComponent, outlet: 'stationManagement' },
{ path: 'sensor', component: SensorComponent, outlet: 'stationManagement' },
{ path: '', component: SummaryComponent, outlet: 'stationManagement' },
// {path:'',component:Lev0Ver2Component,outlet:'stationManagement'},
{path:'data',component:SummaryIconsComponent,outlet:'stationManagement'},
{ path: 'summary', component: DataHeaderComponent, outlet: 'header' },
{ path: 'station', component: ConfigHeaderComponent, outlet: 'header' },
{ path: '', component: ConfigHeaderComponent, outlet: 'header' },
......@@ -64,20 +57,11 @@ const routes: Routes = [
{ path: 'homeConfigHost', children: [ { path: '', component: ConfigHeaderComponent, outlet: 'child1'}, { path: '', component: HostComponent, outlet: 'child2'}]},
{ path: 'homeConfigClient', children: [ { path: '', component: ConfigHeaderComponent, outlet: 'child1'}, { path: '', component: ClientComponent, outlet: 'child2'}]},
{ path: 'homeConfigSensor', children: [ { path: '', component: ConfigHeaderComponent, outlet: 'child1'}, { path: '', component: SensorComponent, outlet: 'child2'}]},
{ path: 'ComingSoon', children: [ { path: '', component: CoomingSoonHeaderComponent, outlet: 'child1'}, { path: '', component: ComingSoonComponent, outlet: 'child2'}]},
{ path: 'data', children: [ { path: '', component: DataHeaderComponent, outlet: 'child1'}, { path: '', component: Lev0Ver2Component, outlet: 'child2'}]},
{ path: 'data', children: [ { path: '', component: DataHeaderComponent, outlet: 'child1'}, { path: '', component: SummaryIconsComponent, outlet: 'child2'}]},
];
/* Adding it again later
{path: 'admin', component: AdminDashboardComponent, canActivate: [RoleGuard], data: {roles: ['ROLE_ADMIN']}},
{path: 'station', component: StationComponent, canActivate: [RoleGuard], data: {roles: ['ROLE_ADMIN']}},
{path: 'station/sensor', component: SensorComponent, canActivate: [RoleGuard], data: {roles: ['ROLE_ADMIN']}},
{path: 'station/client', component: ClientComponent, canActivate: [RoleGuard], data: {roles: ['ROLE_ADMIN']}},
{path: 'station/host', component: HostComponent, canActivate: [RoleGuard], data: {roles: ['ROLE_ADMIN']}},
*/
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
......
<!--
<nav class="navbar navbar-expand-lg navbar-light bg-success">
<div class="container">
<a class="navbar-brand">Forte</a>
<ng-container *ngIf="isLoggedIn">
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav">
<button type="button" class="btn btn-success" (click)="navigate(5)">Home</button>
<div *ngIf="isAdmin">
<button type="button" class="btn btn-success" (click)="navigate(0)">Stations</button>
<button type="button" class="btn btn-success" (click)="navigate(1)">Hosts</button>
<button type="button" class="btn btn-success" (click)="navigate(2)">Clients</button>
<button type="button" class="btn btn-success" (click)="navigate(3)">Sensors</button>
<button type="button" class="btn btn-success" (click)="navigate(4)">Users</button>
</div>
</div>
</div>
<div class="d-flex">
<button type="button" class="btn btn-danger" (click)="logout()">
Logout
</button>
</div>
</ng-container>
</div>
</nav>
-->
<router-outlet name="main"></router-outlet>
......@@ -2,36 +2,31 @@ import {NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component';
import {AdminDashboardComponent} from './module/pages/admin-dashboard/admin-dashboard.component';
import {UserManagementComponent} from './module/pages/admin/userManagment/userManagement.component';
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
import {MatFormFieldModule} from '@angular/material/form-field';
import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
import { LoginComponent } from './module/pages/login/login.component';
import { SignupComponent } from './module/pages/signup/signup.component';
import {StationComponent} from "./module/pages/station/station.component";
import {ClientComponent} from "./module/pages/station/client/client.component";
import {SensorComponent} from "./module/pages/station/sensor/sensor.component";
import {HostComponent} from "./module/pages/station/host/host.component";
import {StationComponent} from "./module/pages/admin/stationManagement/station/station.component";
import {ClientComponent} from "./module/pages/admin/stationManagement/client/client.component";
import {SensorComponent} from "./module/pages/admin/stationManagement/sensor/sensor.component";
import {HostComponent} from "./module/pages/admin/stationManagement/host/host.component";
import {EventEmitterService} from "./shared/event.emitter.service";
import { DashboardComponent } from './module/pages/dashboard/dashboard.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {MatIconModule} from "@angular/material/icon";
import {HomeComponent} from "./module/pages/home/home.component";
import {StationManagementComponent} from "./module/pages/admin/stationManagement/stationManagement.component";
import {MatSelectModule} from "@angular/material/select";
import {MatDatepickerModule} from '@angular/material/datepicker';
import {MatInputModule} from "@angular/material/input";
import { MatNativeDateModule} from "@angular/material/core";
import { SummaryComponent } from './module/components/summary/summary.component';
import { ZoomComponent } from './module/components/zoom/zoom.component';
import { CompareComponent } from './module/components/compare/compare.component';
import { DataHeaderComponent } from './module/components/header/data-header/data-header.component';
import { ConfigHeaderComponent } from './module/components/header/config-header/config-header.component';
import { ComingSoonComponent } from './module/components/coming-soon/coming-soon.component';
import { CoomingSoonHeaderComponent } from './module/components/cooming-soon-header/cooming-soon-header.component';
import { Lev0Component } from './module/components/lev0/lev0.component';
import { SummaryComponent } from './module/components/charts/comparing/fourInOne/summary.component';
import { ZoomComponent } from './module/components/charts/comparing/chartBar/zoom.component';
import { CompareComponent } from './module/components/charts/comparing/barChart/compare.component';
import { DataHeaderComponent } from './module/pages/admin/stationManagement/header/data-header/data-header.component';
import { ConfigHeaderComponent } from './module/pages/admin/stationManagement/header/config-header/config-header.component';
import { LightChartComponent } from './module/components/charts/light-chart/light-chart.component';
import {Lev0Ver2Component} from "./module/components/lev0Ver2/lev0.component";
import {SummaryIconsComponent} from "./module/components/summaryIcons/summaryIcons.component";
import {CjsTimline} from "./module/components/charts/Cjs-timeline/light-chart.component";
import { ProViewComponent } from './module/components/pro-view/pro-view.component';
import {MatAutocompleteModule} from "@angular/material/autocomplete";
......@@ -40,48 +35,40 @@ import {ApiModule} from "../../projects/swagger-client/src";
import { InterceptorService } from './shared/auth/interceptor.service';
import {CjsTimelineMultiple} from "./module/components/charts/Cjs-timeline-multiple/light-chart.component";
import {MatButtonModule} from "@angular/material/button";
import { ThermometerComponent } from './module/components/thermometer/thermometer.component';
import { HomeTailwindcssComponent } from './module/pages/home-tailwindcss/home-tailwindcss.component';
import {isNamespaceImportNode} from "@angular/cdk/schematics";
import { ThermometerComponent } from './module/components/customUX/thermometer/thermometer.component';
import { HomeComponent } from './module/pages/home/home.component';
import {ServerControllerService} from "../../projects/generated-api/src";
import { LoginTailwindcssComponent } from './module/pages/login-tailwindcss/login-tailwindcss.component';
import { Lev0Ver3Component } from './module/components/lev0-ver3/lev0-ver3.component';
import { MobileHomeComponent } from './module/pages/mobile-home/mobile-home.component';
import { LoginTailwindcssComponent } from './module/pages/login/login.component';
import { SummaryList } from './module/components/summaryList/summaryList';
import {FontAwesomeModule} from "@fortawesome/angular-fontawesome";
import { SliderComponent } from './module/components/slider/slider.component';
import { SliderComponent } from './module/components/customUX/slider/slider.component';
import {MatSliderModule} from "@angular/material/slider";
import {MatCardModule} from "@angular/material/card";
@NgModule({
declarations: [
AppComponent,
AdminDashboardComponent,
LoginComponent,
UserManagementComponent,
SignupComponent,
StationComponent,
HostComponent,
ClientComponent,
SensorComponent,
DashboardComponent,
HomeComponent,
StationManagementComponent,
SummaryComponent,
ZoomComponent,
CompareComponent,
DataHeaderComponent,
ConfigHeaderComponent,
ComingSoonComponent,
CoomingSoonHeaderComponent,
Lev0Component,
Lev0Ver2Component,
SummaryIconsComponent,
CjsTimline,
LightChartComponent,
ProViewComponent,
CjsTimelineMultiple,
ThermometerComponent,
HomeTailwindcssComponent,
HomeComponent,
LoginTailwindcssComponent,
Lev0Ver3Component,
MobileHomeComponent,
SummaryList,
SliderComponent
],
......
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import {Chart} from "chart.js/auto";
@Component({
selector: 'app-compare',
selector: 'app-barChart',
templateUrl: './compare.component.html',
styleUrls: ['./compare.component.css']
})
......
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import {Chart} from "chart.js/auto";
@Component({
selector: 'app-zoom',
selector: 'app-chartBar',
templateUrl: './zoom.component.html',
styleUrls: ['./zoom.component.css']
})
......
......@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import {Chart} from "chart.js/auto";
@Component({
selector: 'app-summary',
selector: 'app-fourInOne',
templateUrl: './summary.component.html',
styleUrls: ['./summary.component.css']
})
......
<div class="coming-soon">
<div class="coming-soon-text">
<h1>COMING &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;SOON :)</h1>
</div>
</div>
.coming-soon{
height: 120vh;
width: 100%;
background-image: url("../../../../assets/comingSoon.jpg");
background-repeat: no-repeat;
background-size: cover;
display: flex;
justify-content: center;
align-items: center;
}
h1{
color: white;
}
.coming-soon-text{
}
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ComingSoonComponent } from './coming-soon.component';
describe('ComingSoonComponent', () => {
let component: ComingSoonComponent;
let fixture: ComponentFixture<ComingSoonComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ComingSoonComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(ComingSoonComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component } from '@angular/core';
@Component({
selector: 'app-coming-soon',
templateUrl: './coming-soon.component.html',
styleUrls: ['./coming-soon.component.scss']
})
export class ComingSoonComponent {
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment