Skip to content

Commit

Permalink
chore: improve split pane and 3d text examples
Browse files Browse the repository at this point in the history
  • Loading branch information
nzbin committed Jul 25, 2020
1 parent dddfaa5 commit 82aaf57
Show file tree
Hide file tree
Showing 21 changed files with 242 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2>Alert configuration</h2>

<section>
<label>Elevation:</label>
<mat-slider min="0" max="24" [(ngModel)]="elevation"></mat-slider>
<mat-slider min="0" max="24" thumbLabel [(ngModel)]="elevation"></mat-slider>
</section>

<h2>Result</h2>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.mat-radio-button {
margin: 1em;
}

.mat-checkbox {
display: inline-block;
margin: 1rem 1rem 1rem 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ <h2>Checkbox group configuration</h2>

<h2>Result</h2>

<mtx-checkbox-group [showSelectAll]="showSelectAll" [(ngModel)]="foods" (change)="changeOptions($event)">
<mtx-checkbox-group [showSelectAll]="showSelectAll" [(ngModel)]="foods" (change)="changeOptions($event)" [disabled]="true">
</mtx-checkbox-group>
23 changes: 10 additions & 13 deletions projects/demos/src/app/color-picker/color-picker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,16 @@ import { ColorPickerBasicComponent, colorPickerBasicExampleConfig } from './exam
@NgModule({
imports: [
SharedModule,
RouterModule.forChild([{
path: '',
component: ColorPickerComponent,
data: {
examples: [
colorPickerBasicExampleConfig
],
RouterModule.forChild([
{
path: '',
component: ColorPickerComponent,
data: {
examples: [colorPickerBasicExampleConfig],
},
},
}])
],
declarations: [
ColorPickerComponent,
ColorPickerBasicComponent
]),
],
declarations: [ColorPickerComponent, ColorPickerBasicComponent],
})
export class ColorPickerModule { }
export class ColorPickerModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>Progress configuration</h2>

<section>
<label>Progress:</label>
<mat-slider min="0" max="100" [(ngModel)]="value"></mat-slider>
<mat-slider min="0" max="100" thumbLabel [(ngModel)]="value"></mat-slider>
</section>

<section>
Expand All @@ -23,19 +23,27 @@ <h2>Progress configuration</h2>

<section>
<label>Height:</label>
<mat-slider min="1" max="16" [(ngModel)]="height"></mat-slider>
<mat-slider min="1" max="16" thumbLabel [(ngModel)]="height"></mat-slider>
</section>

<section>
<mat-form-field>
<mat-label>Foreground color</mat-label>
<mtx-color-picker [(ngModel)]="foreground">
</mtx-color-picker>
<button mat-button *ngIf="foreground" matSuffix mat-icon-button aria-label="Clear"
(click)="foreground=''">
<mat-icon>close</mat-icon>
</button>
</mat-form-field>
<mat-form-field>
<mat-label>Background color</mat-label>
<mtx-color-picker [(ngModel)]="background">
</mtx-color-picker>
<button mat-button *ngIf="background" matSuffix mat-icon-button aria-label="Clear"
(click)="background=''">
<mat-icon>close</mat-icon>
</button>
</mat-form-field>
</section>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
margin: 1em;
}

.mat-checkbox,
.mat-checkbox {
display: inline-block;
margin: 1rem 1rem 1rem 0;
}

.mat-form-field {
margin-right: 1rem;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<div class="split-demo">
<mtx-split direction="horizontal" restrictMove="true" [useTransition]="true">
<mtx-split-pane size="40">
<mtx-split direction="vertical" restrictMove="true">
<mtx-split-pane>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
<mtx-split-pane>
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam
voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
consequuntur magni dolores eodolor sit amet, consectetur, adipisci velit, sed
quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam
quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam
corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis
autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
</mtx-split-pane>
<mtx-split-pane>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
</mtx-split>
</mtx-split-pane>
<mtx-split-pane size="60">
<mtx-split direction="vertical" restrictMove="true">
<mtx-split-pane size="25">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
<mtx-split-pane size="75">
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam
voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
consequuntur magni dolores eodolor sit amet, consectetur, adipisci velit, sed
quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam
quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam
corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis
autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
</mtx-split-pane>
</mtx-split>
</mtx-split-pane>
</mtx-split>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.split-demo {
height: 500px;
border: 1px solid;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Component } from '@angular/core';

@Component({
selector: 'split-pane-example',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
})
export class AppComponent {}
25 changes: 25 additions & 0 deletions projects/demos/src/app/split-pane/examples/basic/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { AppComponent as SplitPaneBasicComponent } from './app.component';

const splitPaneBasicExampleConfig = {
title: 'Basic',
component: SplitPaneBasicComponent,
files: [
{
file: 'app.component.html',
content: require('!!highlight-loader?raw=true&lang=html!./app.component.html'),
filecontent: require('!!raw-loader!./app.component.html'),
},
{
file: 'app.component.ts',
content: require('!!highlight-loader?raw=true&lang=typescript!./app.component.ts'),
filecontent: require('!!raw-loader!./app.component.ts'),
},
{
file: 'app.component.scss',
content: require('!!highlight-loader?raw=true&lang=scss!./app.component.scss'),
filecontent: require('!!raw-loader!./app.component.scss'),
},
],
};

export { SplitPaneBasicComponent, splitPaneBasicExampleConfig };
60 changes: 6 additions & 54 deletions projects/demos/src/app/split-pane/split-pane.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,9 @@
<p>
I modify the component name and improve the styles and some classnames.
</p>
<div class="split-demo">
<mtx-split direction="horizontal" restrictMove="true" [useTransition]="true">
<mtx-split-pane size="40">
<mtx-split direction="vertical" restrictMove="true">
<mtx-split-pane>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
<mtx-split-pane>
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam
voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
consequuntur magni dolores eodolor sit amet, consectetur, adipisci velit, sed
quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam
quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam
corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis
autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
</mtx-split-pane>
<mtx-split-pane>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
</mtx-split>
</mtx-split-pane>
<mtx-split-pane size="60">
<mtx-split direction="vertical" restrictMove="true">
<mtx-split-pane size="25">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tiam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
dolore eu fugiat nulla pariatur.</p>
</mtx-split-pane>
<mtx-split-pane size="75">
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam
voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
consequuntur magni dolores eodolor sit amet, consectetur, adipisci velit, sed
quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam
quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam
corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis
autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
</mtx-split-pane>
</mtx-split>
</mtx-split-pane>
</mtx-split>
</div>

<ng-container *ngIf="route.data | async as data">
<ng-container *ngFor="let exampleData of data.examples">
<example-viewer [exampleData]="exampleData"></example-viewer>
</ng-container>
</ng-container>
4 changes: 0 additions & 4 deletions projects/demos/src/app/split-pane/split-pane.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
.split-demo {
height: 600px;
border: 1px solid;
}
14 changes: 5 additions & 9 deletions projects/demos/src/app/split-pane/split-pane.component.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';

@Component({
selector: 'app-split-pane',
templateUrl: './split-pane.component.html',
styleUrls: ['./split-pane.component.scss']
styleUrls: ['./split-pane.component.scss'],
})
export class SplitPaneComponent implements OnInit {

constructor() { }

ngOnInit(): void {
}

export class SplitPaneComponent {
constructor(public route: ActivatedRoute) {}
}
19 changes: 16 additions & 3 deletions projects/demos/src/app/split-pane/split-pane.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,21 @@ import { SharedModule } from '../shared';

import { SplitPaneComponent } from './split-pane.component';

import { SplitPaneBasicComponent, splitPaneBasicExampleConfig } from './examples/basic';

@NgModule({
declarations: [SplitPaneComponent],
imports: [SharedModule, RouterModule.forChild([{ path: '', component: SplitPaneComponent }])]
imports: [
SharedModule,
RouterModule.forChild([
{
path: '',
component: SplitPaneComponent,
data: {
examples: [splitPaneBasicExampleConfig],
},
},
]),
],
declarations: [SplitPaneComponent, SplitPaneBasicComponent],
})
export class SplitPaneModule { }
export class SplitPaneModule {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<h2>3D Text configuration</h2>

<section>
<mat-form-field>
<input matInput [(ngModel)]="text" placeholder="Text">
</mat-form-field>
</section>

<section>
<label>Depth:</label>
<mat-slider min="1" max="50" thumbLabel [(ngModel)]="depth"></mat-slider>
</section>

<section>
<label>RotateX:</label>
<mat-slider min="0" max="360" thumbLabel [(ngModel)]="rotateX"></mat-slider>

<label>RotateY:</label>
<mat-slider min="0" max="360" thumbLabel [(ngModel)]="rotateY"></mat-slider>

<label>RotateZ:</label>
<mat-slider min="0" max="360" thumbLabel [(ngModel)]="rotateZ"></mat-slider>
</section>

<h2>Result</h2>

<mtx-text3d [text]="text" [depth]="depth"
[rotateX]="rotateX" [rotateY]="rotateY" [rotateZ]="rotateZ"></mtx-text3d>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/** No CSS for this example */
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Component } from '@angular/core';

@Component({
selector: 'text-3d-example',
templateUrl: 'app.component.html',
styleUrls: ['app.component.scss'],
})
export class AppComponent {
text = '3D Text';
depth = 20;
rotateX = 60;
rotateY = 0;
rotateZ = 0;
}
25 changes: 25 additions & 0 deletions projects/demos/src/app/text3d/examples/configurable/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { AppComponent as Text3dConfigurableComponent } from './app.component';

const text3dConfigurableExampleConfig = {
title: 'Configurable 3D text',
component: Text3dConfigurableComponent,
files: [
{
file: 'app.component.html',
content: require('!!highlight-loader?raw=true&lang=html!./app.component.html'),
filecontent: require('!!raw-loader!./app.component.html'),
},
{
file: 'app.component.ts',
content: require('!!highlight-loader?raw=true&lang=typescript!./app.component.ts'),
filecontent: require('!!raw-loader!./app.component.ts'),
},
{
file: 'app.component.scss',
content: require('!!highlight-loader?raw=true&lang=scss!./app.component.scss'),
filecontent: require('!!raw-loader!./app.component.scss'),
},
],
};

export { Text3dConfigurableComponent, text3dConfigurableExampleConfig };
6 changes: 5 additions & 1 deletion projects/demos/src/app/text3d/text3d.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<mtx-text3d text="3D Text"></mtx-text3d>
<ng-container *ngIf="route.data | async as data">
<ng-container *ngFor="let exampleData of data.examples">
<example-viewer [exampleData]="exampleData"></example-viewer>
</ng-container>
</ng-container>
Loading

0 comments on commit 82aaf57

Please sign in to comment.