-
+
-
+
diff --git a/quartz-manager-frontend/src/app/app.component.scss b/quartz-manager-frontend/src/app/app.component.scss
index 5293b8d..6e1eb96 100644
--- a/quartz-manager-frontend/src/app/app.component.scss
+++ b/quartz-manager-frontend/src/app/app.component.scss
@@ -2,20 +2,9 @@
display: block;
color: rgba(0,0,0,.54);
font-family: Roboto,"Helvetica Neue";
+ height: 100%;
}
.content {
- margin: 50px 70px;
-}
-
-@media screen and (min-width: 600px) and (max-width: 1279px) {
- .content {
- margin: 20px 30px;
- }
-}
-
-@media screen and (max-width: 599px) {
- .content {
- margin: 8px 12px;
- }
+ padding: 20px;
}
diff --git a/quartz-manager-frontend/src/app/app.module.ts b/quartz-manager-frontend/src/app/app.module.ts
index 5274d28..f521893 100644
--- a/quartz-manager-frontend/src/app/app.module.ts
+++ b/quartz-manager-frontend/src/app/app.module.ts
@@ -3,7 +3,7 @@ import { NgModule, APP_INITIALIZER} from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
-import {JWT_OPTIONS, JwtModule} from "@auth0/angular-jwt";
+import {JWT_OPTIONS, JwtModule} from '@auth0/angular-jwt';
// material
import {MatIconRegistry} from '@angular/material/icon';
@@ -17,6 +17,14 @@ import {MatToolbarModule} from '@angular/material/toolbar';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {MatCardModule} from '@angular/material/card';
+import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatSelectModule} from '@angular/material/select';
+import {MatListModule} from '@angular/material/list';
+import {MatSidenavModule} from '@angular/material/sidenav';
+
+import {MatNativeDateModule} from '@angular/material/core';
+import { NgxMatTimepickerModule, NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FlexLayoutModule } from '@angular/flex-layout';
@@ -32,10 +40,10 @@ import {
HeaderComponent,
FooterComponent,
GithubComponent,
- SchedulerConfigComponent,
SchedulerControlComponent,
LogsPanelComponent,
- ProgressPanelComponent
+ ProgressPanelComponent,
+ TriggerListComponent
} from './components';
import {
@@ -46,15 +54,17 @@ import {
ConfigService,
ProgressWebsocketService,
LogsWebsocketService,
- getHtmlBaseUrl
+ getHtmlBaseUrl,
+ TriggerService
} from './services';
-import { ChangePasswordComponent } from './views/change-password/change-password.component';
import { ForbiddenComponent } from './views/forbidden/forbidden.component';
import { APP_BASE_HREF } from '@angular/common';
-import { environment } from '../environments/environment';
+import {SimpleTriggerConfigComponent} from './components/simple-trigger-config';
+import JobService from './services/job.service';
+import {GenericErrorComponent} from './views/error/genericError.component';
export function initUserFactory(userService: UserService) {
- return () => userService.jsessionInitUser();
+ return () => userService.fetchLoggedUser();
}
@@ -101,12 +111,13 @@ export function jwtOptionsFactory(apiService: ApiService) {
LoginComponent,
NotFoundComponent,
AccountMenuComponent,
- SchedulerConfigComponent,
+ SimpleTriggerConfigComponent,
SchedulerControlComponent,
LogsPanelComponent,
ProgressPanelComponent,
- ChangePasswordComponent,
- ForbiddenComponent
+ ForbiddenComponent,
+ GenericErrorComponent,
+ TriggerListComponent
],
imports: [
BrowserAnimationsModule,
@@ -128,10 +139,16 @@ export function jwtOptionsFactory(apiService: ApiService) {
MatChipsModule,
MatIconModule,
MatInputModule,
+ MatSelectModule,
MatToolbarModule,
MatCardModule,
+ MatListModule,
MatProgressSpinnerModule,
MatProgressBarModule,
+ MatDatepickerModule, MatNativeDateModule,
+ NgxMatMomentModule,
+ NgxMatDatetimePickerModule,
+ MatSidenavModule,
FlexLayoutModule
],
providers: [
@@ -149,6 +166,8 @@ export function jwtOptionsFactory(apiService: ApiService) {
GuestGuard,
AdminGuard,
SchedulerService,
+ JobService,
+ TriggerService,
ProgressWebsocketService,
LogsWebsocketService,
AuthService,
diff --git a/quartz-manager-frontend/src/app/components/footer/footer.component.html b/quartz-manager-frontend/src/app/components/footer/footer.component.html
index 43d36df..ddc9c70 100644
--- a/quartz-manager-frontend/src/app/components/footer/footer.component.html
+++ b/quartz-manager-frontend/src/app/components/footer/footer.component.html
@@ -1,7 +1,8 @@
-
- Hand crafted with love by
- Fabio Formosa
-
-
-
-
+
diff --git a/quartz-manager-frontend/src/app/components/footer/footer.component.scss b/quartz-manager-frontend/src/app/components/footer/footer.component.scss
index a5f4583..786b1b1 100644
--- a/quartz-manager-frontend/src/app/components/footer/footer.component.scss
+++ b/quartz-manager-frontend/src/app/components/footer/footer.component.scss
@@ -1,18 +1,20 @@
-:host {
- display: block;
- font-weight: 300;
- font-size: 15px;
- display: block;
+:host{
+ //position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 64px;
+}
+
+#footer{
background-color: rgb(33, 33, 33);
- height: 236px;
- padding: 72px 24px;
+ font-size: 15px;
box-sizing: border-box;
text-align: center;
a {
text-decoration: none;
- cursor: auto;
+ cursor: pointer;
color: #FFFFFF;
- margin-top: 32px;
}
h3 {
@@ -21,7 +23,5 @@
font-weight: 300;
font-size: 22px;
}
-
}
-
diff --git a/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html
index 8334975..1b235e1 100644
--- a/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html
+++ b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html
@@ -1,2 +1 @@
-
-
+
diff --git a/quartz-manager-frontend/src/app/components/header/header.component.html b/quartz-manager-frontend/src/app/components/header/header.component.html
index 7d8b4b4..312b5bb 100644
--- a/quartz-manager-frontend/src/app/components/header/header.component.html
+++ b/quartz-manager-frontend/src/app/components/header/header.component.html
@@ -1,12 +1,12 @@
-