Skip to content

Commit 48ba1d7

Browse files
authored
Merge pull request IPdotSetAF#33 from IPdotSetAF/31-animation-cleanup
31 animation cleanup
2 parents b41736e + b6ac79b commit 48ba1d7

File tree

7 files changed

+24
-53
lines changed

7 files changed

+24
-53
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { animate, style, transition, trigger } from "@angular/animations";
2+
3+
export const valueChangeAnim = trigger('valueChangeAnim', [
4+
transition('* <=> *', [
5+
animate('0.07s ease-out', style({ "border-color": "limegreen" })),
6+
animate('0.07s ease-in', style({ "border-color": "var(--bs-border-color)" }))
7+
]),
8+
]);

Frontend/src/app/cs2ts/cs2ts.component.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,15 @@ import { AfterContentInit, Component } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
33
import { debounceTime, Subject, takeLast, tap } from 'rxjs';
44
import { CodeAreaComponent } from '../code-area/code-area.component';
5-
import { animate, style, transition, trigger } from '@angular/animations';
65
import { Meta } from '@angular/platform-browser';
6+
import { valueChangeAnim } from '../../animations/common-animations';
77

88
@Component({
99
selector: 'app-cs2ts',
1010
standalone: true,
1111
imports: [FormsModule, CodeAreaComponent],
1212
templateUrl: './cs2ts.component.html',
13-
animations: [
14-
trigger('valueChangeAnim', [
15-
transition('* <=> *', [
16-
animate('0.07s ease-out', style({ "border-color": "limegreen" })),
17-
animate('0.07s ease-in', style({ "border-color": "var(--bs-border-color)" }))
18-
]),
19-
])
20-
],
21-
styles: `
22-
.code-border{
23-
border: 3px solid var(--bs-border-color);
24-
}
25-
`
13+
animations: [valueChangeAnim]
2614
})
2715
export class Cs2tsComponent implements AfterContentInit {
2816
protected csCode: string = `public class a : b {

Frontend/src/app/md2html/md2html.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2>Markdown to HTML Converter</h2>
3636
<code-area innerStyle="min-height:500px;" [(code)]="htmlCode" language="markup" readonly="true" />
3737
}
3838
@else{
39-
<div style="min-height:500px;" [innerHTML]="htmlCode"></div>
39+
<div style="min-height:500px;" class="p-3" [innerHTML]="htmlCode"></div>
4040
}
4141
</div>
4242
<br />

Frontend/src/app/md2html/md2html.component.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,16 @@ import { AfterContentInit, Component } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
33
import { debounceTime, Subject, takeLast, tap } from 'rxjs';
44
import { CodeAreaComponent } from '../code-area/code-area.component';
5-
import { animate, style, transition, trigger } from '@angular/animations';
65
import { Meta } from '@angular/platform-browser';
76
import { parse } from 'marked';
7+
import { valueChangeAnim } from '../../animations/common-animations';
88

99
@Component({
1010
selector: 'app-md2html',
1111
standalone: true,
1212
imports: [FormsModule, CodeAreaComponent],
1313
templateUrl: './md2html.component.html',
14-
animations: [
15-
trigger('valueChangeAnim', [
16-
transition('* <=> *', [
17-
animate('0.07s ease-out', style({ "border-color": "limegreen" })),
18-
animate('0.07s ease-in', style({ "border-color": "var(--bs-border-color)" }))
19-
]),
20-
])
21-
],
22-
styles: `
23-
.code-border{
24-
border: 3px solid var(--bs-border-color);
25-
}
26-
`
14+
animations: [valueChangeAnim]
2715
})
2816
export class Md2htmlComponent implements AfterContentInit {
2917
protected mdCode: string = `# Hello world

Frontend/src/app/mssql-scaffolder/mssql-scaffolder.component.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { MssqlScaffolderService } from './mssql-scaffolder.service';
99
import { Meta } from '@angular/platform-browser';
1010
import { GetColumnsResponse, GetSPReturnColumnsResponse, SPDefinition, SPParam } from './mssql-scaffolder.model';
1111
import { RouterLink } from '@angular/router';
12+
import { valueChangeAnim } from '../../animations/common-animations';
1213
import { forkJoin } from 'rxjs';
1314

1415
@Component({
@@ -17,26 +18,16 @@ import { forkJoin } from 'rxjs';
1718
imports: [FormsModule, ReactiveFormsModule, CodeAreaComponent, RouterLink],
1819
templateUrl: './mssql-scaffolder.component.html',
1920
animations: [
21+
valueChangeAnim,
2022
trigger('connection', [
2123
state("0", style({ "border-width": "3px", "border-color": "var(--bs-border-color)" })),
2224
state("1", style({ "border-width": "3px", "border-color": "var(--bs-warning)" })),
2325
state("2", style({ "border-width": "3px", "border-color": "limegreen" })),
2426
transition('* <=> *', [
2527
animate('0.1s ease-in-out'),
2628
]),
27-
]),
28-
trigger('valueChangeAnim', [
29-
transition('* <=> *', [
30-
animate('0.07s ease-out', style({ "border-color": "limegreen" })),
31-
animate('0.07s ease-in', style({ "border-color": "var(--bs-border-color)" }))
32-
]),
3329
])
34-
],
35-
styles: `
36-
.code-border{
37-
border: 3px solid var(--bs-border-color);
38-
}
39-
`
30+
]
4031
})
4132
export class MssqlScaffolderComponent {
4233
protected dbSettings: FormGroup = new FormGroup<DbSetting>(
@@ -248,6 +239,7 @@ ${psc.length > 0 ? '}' : ''}
248239
${rsc.length > 0 ? `public class ${sc.sp}Result {` : ''}
249240
${rsc.join("\n")}
250241
${rsc.length > 0 ? '}' : ''}`;
242+
251243
this.codeFlip = !this.codeFlip;
252244
});
253245
}

Frontend/src/app/serialized-tool/serialized-tool.component.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,23 @@ import { Meta } from '@angular/platform-browser';
77
import { parse as tomlParse, stringify as tomlStringify } from 'smol-toml';
88
import { XMLParser as xmlParse, XMLBuilder as xmlStringify } from 'fast-xml-parser';
99
import YAML from 'yamljs';
10+
import { valueChangeAnim } from '../../animations/common-animations';
1011

1112
@Component({
1213
selector: 'app-serialized-tool',
1314
standalone: true,
1415
imports: [FormsModule, CodeAreaComponent],
1516
templateUrl: './serialized-tool.component.html',
1617
animations: [
17-
trigger('valueChangeAnim', [
18-
transition('* <=> *', [
19-
animate('0.07s ease-out', style({ "border-color": "limegreen" })),
20-
animate('0.07s ease-in', style({ "border-color": "var(--bs-border-color)" }))
21-
]),
22-
]),
18+
valueChangeAnim,
2319
trigger('hasError', [
2420
state('true', style({ "border-color": "red" })),
2521
state('false', style({ "border-color": "var(--bs-border-color)" })),
2622
transition('* <=> *', [
2723
animate('0.2s ease-in-out')
2824
]),
2925
]),
30-
],
31-
styles: `
32-
.code-border{
33-
border: 3px solid var(--bs-border-color);
34-
}
35-
`
26+
]
3627
})
3728
export class SerializedToolComponent implements AfterContentInit {
3829
protected fromCode: string = `{

Frontend/src/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
min-height: 100vh;
4242
}
4343

44+
.code-border{
45+
border: 3px solid var(--bs-border-color);
46+
}
47+
4448
@keyframes gradient-move {
4549
0%{background-position:0% 50%}
4650
50%{background-position:100% 50%}

0 commit comments

Comments
 (0)