Skip to content

Commit 906a864

Browse files
authored
Merge pull request #19 from fullstack-devops/feature/theming-and-styles
Feature/theming and styles
2 parents 7d1550f + 97c4b7d commit 906a864

File tree

68 files changed

+692
-857
lines changed

Some content is hidden

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

68 files changed

+692
-857
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Custom
44
/gh-pages-demo
5-
projects/ng-ui-frame/README.md
5+
projects/ng-nav-frame/README.md
66

77
# Compiled output
88
/dist
@@ -46,3 +46,5 @@ testem.log
4646
# System files
4747
.DS_Store
4848
Thumbs.db
49+
.yarnrc
50+
package-lock.json

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
},
99
"scripts": {
1010
"ng": "ng",
11-
"start": "ng serve",
11+
"start": "ng serve --disable-host-check",
12+
"watch:scss": "sass --watch projects/ng-mat-components/test.scss:dist/css/css",
1213
"prebuild": "cp README.md projects/ng-mat-components/",
1314
"build": "ng build --project ng-mat-components",
15+
"build:sass": "sass projects/ng-mat-components/_index.scss:dist/css/css",
1416
"build:workspace": "ng build --project lib-workspace",
1517
"watch": "ng build --watch --configuration development",
1618
"test": "ng test"
@@ -48,6 +50,7 @@
4850
"karma-jasmine": "~4.0.0",
4951
"karma-jasmine-html-reporter": "~1.7.0",
5052
"ng-packagr": "^13.0.0",
53+
"sass": "^1.57.1",
5154
"typescript": "~4.5.2"
5255
}
5356
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FrameRoutes } from 'projects/ng-mat-components/src/public-api';
44
import { HomeComponent } from './content/home/home.component';
55
import { ShowcaseCalendarPanelsComponent } from './content/showcase-calendar-panels/showcase-calendar-panels.component';
66
import { ShowcaseCalendarTableComponent } from './content/showcase-calendar-table/showcase-calendar-table.component';
7-
import { ShowcaseUiFrameComponent } from './content/showcase-ui-frame/showcase-ui-frame.component';
7+
import { ShowcaseNavFrameComponent } from './content/showcase-nav-frame/showcase-nav-frame.component';
88

99
export const routes: FrameRoutes = [
1010
{
@@ -17,8 +17,8 @@ export const routes: FrameRoutes = [
1717
},
1818
},
1919
{
20-
path: 'ui-frame',
21-
component: ShowcaseUiFrameComponent,
20+
path: 'nav-frame',
21+
component: ShowcaseNavFrameComponent,
2222
data: {
2323
displaySidemenu: true,
2424
sidenavIcon: 'pivot_table_chart',
@@ -56,4 +56,4 @@ export const routes: FrameRoutes = [
5656
],
5757
exports: [RouterModule],
5858
})
59-
export class AppRoutingModule {}
59+
export class AppRoutingModule { }
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<fs-ui-frame [frameConfig]="frameConfig" [navUser]="navUser" [appRoutes]="appRoutes" (event)="onEvent($event)">
2-
<fs-ui-frame-toolbar>
3-
<fs-ui-frame-toolbar-title>Current App Title</fs-ui-frame-toolbar-title>
1+
<fs-nav-frame [frameConfig]="frameConfig" [navUser]="navUser" [appRoutes]="appRoutes" (event)="onEvent($event)">
2+
<fs-nav-frame-toolbar>
3+
<fs-nav-frame-toolbar-title>Current App Title</fs-nav-frame-toolbar-title>
44

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

17-
<fs-ui-frame-toolbar-side>
17+
<fs-nav-frame-toolbar-side>
1818
<!-- <a>Test the side</a> -->
1919
<!-- <mat-form-field appearance="outline">
2020
<input matInput placeholder="Search" type="search" />
@@ -24,10 +24,10 @@
2424
class="block w-full p-2 pl-4 text-sm text-gray-900 border border-gray-300 rounded-lg"
2525
placeholder="Dummy Search">
2626
</div>
27-
</fs-ui-frame-toolbar-side>
28-
</fs-ui-frame-toolbar>
27+
</fs-nav-frame-toolbar-side>
28+
</fs-nav-frame-toolbar>
2929

30-
<fs-ui-frame-content>
30+
<fs-nav-frame-content>
3131
<router-outlet></router-outlet>
32-
</fs-ui-frame-content>
33-
</fs-ui-frame>
32+
</fs-nav-frame-content>
33+
</fs-nav-frame>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ import {
1313
FsCalendarModule,
1414
FsCalendarService,
1515
FsMaterialFullModule,
16-
FsUiFrameModule,
16+
FsNavFrameModule,
1717
} from 'projects/ng-mat-components/src/public-api';
1818
import { HomeComponent } from './content/home/home.component';
1919
import { ShowcaseCalendarPanelsComponent } from './content/showcase-calendar-panels/showcase-calendar-panels.component';
2020
import { ShowcaseCalendarTableComponent } from './content/showcase-calendar-table/showcase-calendar-table.component';
21-
import { ShowcaseUiFrameComponent } from './content/showcase-ui-frame/showcase-ui-frame.component';
21+
import { ShowcaseNavFrameComponent } from './content/showcase-nav-frame/showcase-nav-frame.component';
2222

2323
@NgModule({
2424
declarations: [
2525
AppComponent,
2626
HomeComponent,
2727
ShowcaseCalendarPanelsComponent,
2828
ShowcaseCalendarTableComponent,
29-
ShowcaseUiFrameComponent,
29+
ShowcaseNavFrameComponent,
3030
],
3131
imports: [
3232
FormsModule,
@@ -36,7 +36,7 @@ import { ShowcaseUiFrameComponent } from './content/showcase-ui-frame/showcase-u
3636
ReactiveFormsModule,
3737
/* Lib modules */
3838
FsMaterialFullModule,
39-
FsUiFrameModule,
39+
FsNavFrameModule,
4040
FsCalendarModule,
4141
],
4242
providers: [
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.docs-components {
22
display: flex;
33
flex-wrap: wrap;
4-
height: 100%;
54
padding: 20px;
65
justify-content: center;
76
}
@@ -12,7 +11,3 @@
1211
margin: 8px;
1312
cursor: pointer;
1413
}
15-
16-
.docs-components .mat-card img {
17-
height: 200px;
18-
}

projects/lib-workspace/src/app/content/home/home.component.html

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,25 @@
11
<div class="docs-components">
2-
<mat-card routerLink="/ui-frame">
3-
<img
4-
mat-card-image
5-
src="assets/ui-frame-shot.png"
6-
alt="Screenshot of Ui Frame"
7-
/>
8-
<mat-card-title>Ui Frame</mat-card-title>
2+
<mat-card routerLink="/nav-frame">
3+
<img mat-card-image src="assets/nav-frame-shot.png" alt="Screenshot of Nav Frame" />
4+
<mat-card-title>Nav Frame</mat-card-title>
95
<mat-card-content>
106
<p>
11-
Bootstrap your UI with this nice template and start right away with
7+
Bootstrap your Nav with this nice template and start right away with
128
valuable content.
139
</p>
1410
</mat-card-content>
1511
</mat-card>
1612

1713
<mat-card routerLink="/calendar-panels">
18-
<img
19-
mat-card-image
20-
src="assets/calendar-panels-shot.png"
21-
alt="Screenshot of Calendar Panels"
22-
/>
14+
<img mat-card-image src="assets/calendar-panels-shot.png" alt="Screenshot of Calendar Panels" />
2315
<mat-card-title>Calendar Panels</mat-card-title>
2416
<mat-card-content>
2517
<p>The missing piece to the angular material components.</p>
2618
</mat-card-content>
2719
</mat-card>
2820

2921
<mat-card routerLink="/calendar-table">
30-
<img
31-
mat-card-image
32-
src="assets/calendar-table-shot.png"
33-
alt="Screenshot of Calendar Table"
34-
/>
22+
<img mat-card-image src="assets/calendar-table-shot.png" alt="Screenshot of Calendar Table" />
3523
<mat-card-title>Calendar Table</mat-card-title>
3624
<mat-card-content>
3725
<p>
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<section class="mat-elevation-z4">
2-
<fs-calendar-table [dataSource]="calTableData">
3-
<fs-calendar-table-name> Persons </fs-calendar-table-name>
4-
</fs-calendar-table>
5-
</section>
1+
<fs-calendar-table class="mat-elevation-z4" [dataSource]="calTableData">
2+
<fs-calendar-table-name> Persons </fs-calendar-table-name>
3+
</fs-calendar-table>

0 commit comments

Comments
 (0)