Skip to content

Commit 0c0bc00

Browse files
eksrhaeksrha
committed
add ui-frame as well
1 parent dd83fb0 commit 0c0bc00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+255
-229
lines changed

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"@angular/platform-browser-dynamic": "~13.3.11",
2929
"@angular/router": "~13.3.11",
3030
"moment": "^2.29.4",
31-
"ngx-markdown": "13.1.0",
3231
"rxjs": "~7.5.6",
3332
"tslib": "^2.4.0",
3433
"zone.js": "~0.11.7"

‎projects/lib-workspace/src/app/app.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<fs-ui-frame [frameConfig]="frameConfig" [navUser]="navUser" [appRoutes]="appRoutes" (event)="onEvent($event)">
2-
<frame-toolbar>
3-
<frame-toolbar-title>Current App Title</frame-toolbar-title>
2+
<fs-ui-frame-toolbar>
3+
<fs-ui-frame-toolbar-title>Current App Title</fs-ui-frame-toolbar-title>
44

5-
<frame-toolbar-center>
5+
<fs-ui-frame-toolbar-center>
66
<button mat-icon-button>
77
<mat-icon>help</mat-icon>
88
</button>
@@ -12,20 +12,20 @@
1212
<button mat-icon-button>
1313
<mat-icon>call</mat-icon>
1414
</button>
15-
</frame-toolbar-center>
15+
</fs-ui-frame-toolbar-center>
1616

17-
<frame-toolbar-side>
17+
<fs-ui-frame-toolbar-side>
1818
<!-- <a>Test the side</a> -->
1919
<mat-form-field appearance="outline">
2020
<input matInput placeholder="Search" type="search">
2121
<!-- <mat-icon matSuffix>close</mat-icon> -->
2222
</mat-form-field>
23-
</frame-toolbar-side>
23+
</fs-ui-frame-toolbar-side>
2424

25-
</frame-toolbar>
25+
</fs-ui-frame-toolbar>
2626

27-
<frame-content>
27+
<fs-ui-frame-content>
2828
<router-outlet></router-outlet>
29-
</frame-content>
29+
</fs-ui-frame-content>
3030

3131
</fs-ui-frame>

‎projects/lib-workspace/src/app/app.module.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
99
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
1010
import { MaterialModule } from './material.module';
1111

12-
import { NgMatComponentsModule, FsCalendarModule } from 'projects/ng-mat-components/src/public-api';
12+
import {
13+
FsCalendarModule,
14+
FsUiFrameModule,
15+
FsUiFrameContentModule,
16+
FsUiFrameToolbarModule
17+
} from 'projects/ng-mat-components/src/public-api';
1318
import { HomeComponent } from './content/home/home.component';
1419
import { SubComponent } from './content/home/sub/sub.component';
1520
import { TestComponent } from './content/test/test.component';
16-
import { MatFormFieldModule } from '@angular/material/form-field';
17-
import { MarkdownModule } from 'ngx-markdown';
18-
import { HttpClientModule } from '@angular/common/http';
19-
2021

2122
@NgModule({
2223
declarations: [
@@ -30,14 +31,14 @@ import { HttpClientModule } from '@angular/common/http';
3031
FormsModule,
3132
BrowserModule,
3233
MaterialModule,
33-
HttpClientModule,
3434
AppRoutingModule,
3535
BrowserAnimationsModule,
36-
MatFormFieldModule,
3736
ReactiveFormsModule,
38-
NgMatComponentsModule,
37+
/* Lib modules */
38+
FsUiFrameModule,
39+
FsUiFrameContentModule,
40+
FsUiFrameToolbarModule,
3941
FsCalendarModule,
40-
MarkdownModule.forRoot(),
4142
],
4243
providers: [
4344
{

‎projects/lib-workspace/src/app/content/calender-showcase/calender-showcase.component.html‎

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,30 @@
1-
<mat-tab-group>
2-
<mat-tab label="Overview">
1+
<div style="display: flex; justify-content: space-around;">
2+
<mat-slide-toggle [(ngModel)]="placeholder">
3+
Days placeholder
4+
</mat-slide-toggle>
5+
</div>
36

4-
</mat-tab>
5-
<mat-tab label="API">
6-
<div style="margin-top: 16px;" markdown [src]="docsApi"></div>
7-
</mat-tab>
8-
<mat-tab label="Examples">
9-
<div style="display: flex; justify-content: space-around;">
10-
<mat-slide-toggle [(ngModel)]="placeholder">
11-
Days placeholder
12-
</mat-slide-toggle>
13-
</div>
7+
<div class="selection">
8+
<mat-form-field>
9+
<mat-label>Months before</mat-label>
10+
<mat-select [(ngModel)]="monthsBefore">
11+
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{num}}</mat-option>
12+
</mat-select>
13+
</mat-form-field>
14+
<mat-form-field>
15+
<mat-label>Months after</mat-label>
16+
<mat-select [(ngModel)]="monthsAfter">
17+
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{num}}</mat-option>
18+
</mat-select>
19+
</mat-form-field>
20+
<div>
21+
<p>Selected range: {{range | json}}</p>
22+
</div>
23+
</div>
1424

15-
<div class="selection">
16-
<mat-form-field>
17-
<mat-label>Months before</mat-label>
18-
<mat-select [(ngModel)]="monthsBefore">
19-
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{num}}</mat-option>
20-
</mat-select>
21-
</mat-form-field>
22-
<mat-form-field>
23-
<mat-label>Months after</mat-label>
24-
<mat-select [(ngModel)]="monthsAfter">
25-
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{num}}</mat-option>
26-
</mat-select>
27-
</mat-form-field>
28-
<div>
29-
<p>Selected range: {{range | json}}</p>
30-
</div>
31-
</div>
32-
33-
<div style="height: 80%;">
34-
<fs-calendar [placeholderDay]="placeholder" [dataSource]="dataSource" [year]="2022" [month]="3"
35-
[monthsBefore]="monthsBefore" [monthsAfter]="monthsAfter" [config]="calendarConfig"
36-
(selectedDate)="testMethod($event)">
37-
</fs-calendar>
38-
</div>
39-
40-
</mat-tab>
41-
</mat-tab-group>
25+
<div style="height: 80%;">
26+
<fs-calendar [placeholderDay]="placeholder" [dataSource]="dataSource" [year]="2022" [month]="3"
27+
[monthsBefore]="monthsBefore" [monthsAfter]="monthsAfter" [config]="calendarConfig"
28+
(selectedDate)="testMethod($event)">
29+
</fs-calendar>
30+
</div>

‎projects/lib-workspace/src/styles.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body {
1616
}
1717

1818
@include mat.core();
19-
@import "../../ng-mat-components/fs-mat-components-theme.scss";
19+
@import "../../ng-mat-components/src/fs-mat-components-theme.scss";
2020

2121
// Define a light theme
2222
$light-primary: mat.define-palette(mat.$indigo-palette);

‎projects/ng-mat-components/ng-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"entryFile": "src/public-api.ts"
66
},
77
"assets": [
8-
"./fs-mat-components-theme.scss"
8+
"./src/fs-mat-components-theme.scss"
99
]
1010
}

‎projects/ng-mat-components/fs-mat-components-theme.scss‎ renamed to ‎projects/ng-mat-components/src/fs-mat-components-theme.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
fill: mat-color($foreground, text);
1616
}
1717

18-
.frame-toolbar-logo,
19-
.frame-toolbar-logo .logo-span {
18+
.fs-ui-frame-toolbar-logo,
19+
.fs-ui-frame-toolbar-logo .logo-span {
2020
background-color: mat-color($background, app-bar);
2121
color: mat-color($foreground, text);
2222
}
2323

24-
.frame-toolbar {
24+
.fs-ui-frame-toolbar {
2525
background-color: mat-color($background, background);
2626
color: mat-color($foreground, text);
2727
}
@@ -45,7 +45,7 @@
4545
// background-color: rgba($color: mat-color($primary, default), $alpha: 0.1);
4646
}
4747

48-
.frame-content {
48+
.fs-ui-frame-content {
4949
color: mat-color($foreground, text);
5050
background-color: lighten($color: mat-color($background, background), $amount: 3%);
5151
}

‎projects/ng-mat-components/src/lib/components/ui-frame-toolbar/directives/frame-toolbar-center.directive.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎projects/ng-mat-components/src/lib/components/ui-frame-toolbar/directives/frame-toolbar-side.directive.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎projects/ng-mat-components/src/lib/components/ui-frame-toolbar/directives/frame-toolbar-title.directive.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)