Skip to content

Commit 9d1d3e3

Browse files
fulls1z3fulls1z3
authored
design update (#742)
1 parent 25eaa3b commit 9d1d3e3

File tree

116 files changed

+1569
-1665
lines changed

Some content is hidden

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

116 files changed

+1569
-1665
lines changed

‎angular.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"path": "tools/webpack.config.js",
2020
"replaceDuplicatePlugins": true,
2121
"mergeStrategies": {
22-
"externals": "prepend"
22+
"externals": "append"
2323
}
2424
},
2525
"outputPath": "dist/apps/universal/browser",
@@ -38,8 +38,7 @@
3838
"apps/universal/src/favicon.ico"
3939
],
4040
"styles": [
41-
"apps/universal/src/assets/sass/lib.scss",
42-
"apps/universal/src/assets/sass/styles.scss",
41+
"apps/universal/src/styles.scss",
4342
"./node_modules/perfect-scrollbar/css/perfect-scrollbar.css"
4443
]
4544
},
@@ -86,6 +85,13 @@
8685
"server": {
8786
"builder": "@angular-builders/custom-webpack:server",
8887
"options": {
88+
"customWebpackConfig": {
89+
"path": "tools/webpack.config.js",
90+
"replaceDuplicatePlugins": true,
91+
"mergeStrategies": {
92+
"externals": "append"
93+
}
94+
},
8995
"outputPath": "dist/apps/universal/server",
9096
"main": "apps/universal/src/main-server.ts",
9197
"tsConfig": "apps/universal/tsconfig.server.json",

‎apps/universal/src/app/+about/about-apple-pear.component.html

-39
This file was deleted.

‎apps/universal/src/app/+about/about-apple-pear.component.scss

-13
This file was deleted.

‎apps/universal/src/app/+about/about-banana.component.html

-39
This file was deleted.

‎apps/universal/src/app/+about/about-banana.component.scss

-13
This file was deleted.

‎apps/universal/src/app/+about/about-us.component.html

-39
This file was deleted.

‎apps/universal/src/app/+about/about-us.component.scss

-13
This file was deleted.

‎apps/universal/src/app/+about/about.component.html

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
<div fxLayoutAlign="center" [@routeAnimation]>
2-
<mat-card>
3-
<mat-card-header>
4-
<div mat-card-avatar class="card_header__image"></div>
5-
<mat-card-title>{{ 'ABOUT.ABOUT.CARD_TITLE' | translate }}</mat-card-title>
6-
<mat-card-subtitle>{{ 'ABOUT.ABOUT.CARD_SUBTITLE' | translate }}</mat-card-subtitle>
7-
</mat-card-header>
8-
<img mat-card-image src="https://cdn-images-1.medium.com/max/800/0*g1TwOOdncfeTD2CC.png" alt="universal">
9-
<mat-card-content>
10-
<p>
11-
<strong>{{ 'LIPSUM.WHAT.TITLE' | translate }}</strong>
12-
</p>
13-
<p>
14-
{{ 'LIPSUM.WHAT.CONTENT' | translate }}
15-
</p>
16-
<p>
17-
<strong>{{ 'LIPSUM.WHERE_FROM.TITLE' | translate }}</strong>
18-
</p>
19-
<p>
20-
{{ 'LIPSUM.WHERE_FROM.CONTENT_1' | translate }}
21-
</p>
22-
<p>
23-
{{ 'LIPSUM.WHERE_FROM.CONTENT_2' | translate }}
24-
</p>
25-
<p>
26-
<strong>{{ 'LIPSUM.WHY.TITLE' | translate }}</strong>
27-
</p>
28-
<p>
29-
{{ 'LIPSUM.WHY.CONTENT' | translate }}
30-
</p>
31-
<p>
32-
<strong>{{ 'LIPSUM.WHERE_GET.TITLE' | translate }}</strong>
33-
</p>
34-
<p>
35-
{{ 'LIPSUM.WHERE_GET.CONTENT' | translate }}
36-
</p>
37-
</mat-card-content>
38-
</mat-card>
1+
<div [@routeAnimation]>
2+
<mat-card class="fs-content mat-elevation-z0">
3+
<mat-card-header>
4+
<div mat-card-avatar class="card_header__image"></div>
5+
<mat-card-title>{{ 'ABOUT.ABOUT.CARD_TITLE' | translate }}</mat-card-title>
6+
<mat-card-subtitle>{{ 'ABOUT.ABOUT.CARD_SUBTITLE' | translate }}</mat-card-subtitle>
7+
</mat-card-header>
8+
<img mat-card-image src="https://cdn-images-1.medium.com/max/800/0*g1TwOOdncfeTD2CC.png" alt="universal">
9+
<mat-card-content>
10+
<p>
11+
<strong>{{ 'LIPSUM.WHAT.TITLE' | translate }}</strong>
12+
</p>
13+
<p>
14+
{{ 'LIPSUM.WHAT.CONTENT' | translate }}
15+
</p>
16+
<p>
17+
<strong>{{ 'LIPSUM.WHERE_FROM.TITLE' | translate }}</strong>
18+
</p>
19+
<p>
20+
{{ 'LIPSUM.WHERE_FROM.CONTENT_1' | translate }}
21+
</p>
22+
<p>
23+
{{ 'LIPSUM.WHERE_FROM.CONTENT_2' | translate }}
24+
</p>
25+
<p>
26+
<strong>{{ 'LIPSUM.WHY.TITLE' | translate }}</strong>
27+
</p>
28+
<p>
29+
{{ 'LIPSUM.WHY.CONTENT' | translate }}
30+
</p>
31+
<p>
32+
<strong>{{ 'LIPSUM.WHERE_GET.TITLE' | translate }}</strong>
33+
</p>
34+
<p>
35+
{{ 'LIPSUM.WHERE_GET.CONTENT' | translate }}
36+
</p>
37+
</mat-card-content>
38+
</mat-card>
3939
</div>

‎apps/universal/src/app/+about/about.component.scss

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
@import '../../assets/sass/mixin/bem';
2-
@import '../../assets/sass/layout/card';
3-
@import '../../assets/sass/layout/page';
4-
5-
@include page_layout;
6-
@include card_layout;
1+
@import '~@fulls1z3/shared/ui-material/scss/util/bem';
72

83
.card_header {
94
@include el('image') {

‎apps/universal/src/app/+about/about.module.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { MaterialModule } from '@fulls1z3/shared/ui-material';
55

66
import { SharedModule } from '../shared';
77

8-
import { AboutApplePearComponent } from './about-apple-pear.component';
9-
import { AboutBananaComponent } from './about-banana.component';
10-
import { AboutUsComponent } from './about-us.component';
118
import { AboutComponent } from './about.component';
129
import { routes } from './about.routes';
10+
import { ApplePearComponent } from './apple-pear/apple-pear.component';
11+
import { BananaComponent } from './banana/banana.component';
12+
import { UsComponent } from './us/us.component';
1313

1414
@NgModule({
1515
imports: [CommonModule, RouterModule.forChild(routes), MaterialModule, SharedModule],
16-
declarations: [AboutComponent, AboutUsComponent, AboutBananaComponent, AboutApplePearComponent]
16+
declarations: [AboutComponent, UsComponent, BananaComponent, ApplePearComponent]
1717
})
1818
export class AboutModule {}

‎apps/universal/src/app/+about/about.routes.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { AboutApplePearComponent } from './about-apple-pear.component';
2-
import { AboutBananaComponent } from './about-banana.component';
3-
import { AboutUsComponent } from './about-us.component';
41
import { AboutComponent } from './about.component';
2+
import { ApplePearComponent } from './apple-pear/apple-pear.component';
3+
import { BananaComponent } from './banana/banana.component';
4+
import { UsComponent } from './us/us.component';
55

66
export const routes = [
77
{
@@ -16,7 +16,7 @@ export const routes = [
1616
},
1717
{
1818
path: 'us/:topicId',
19-
component: AboutUsComponent,
19+
component: UsComponent,
2020
data: {
2121
meta: {
2222
title: 'ABOUT.ABOUT_US.PAGE_TITLE',
@@ -26,7 +26,7 @@ export const routes = [
2626
},
2727
{
2828
path: 'banana',
29-
component: AboutBananaComponent,
29+
component: BananaComponent,
3030
data: {
3131
meta: {
3232
title: 'ABOUT.ABOUT_BANANA.PAGE_TITLE',
@@ -36,7 +36,7 @@ export const routes = [
3636
},
3737
{
3838
path: 'apple/:fruitId/pear',
39-
component: AboutApplePearComponent,
39+
component: ApplePearComponent,
4040
data: {
4141
meta: {
4242
title: 'ABOUT.ABOUT_APPLE_PEAR.PAGE_TITLE',

‎apps/universal/src/app/+about/apple-pear/apple-pear.component.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<div [@routeAnimation]>
2+
<mat-card class="fs-content mat-elevation-z0">
3+
<mat-card-header>
4+
<div mat-card-avatar class="card_header__image"></div>
5+
<mat-card-title>{{ 'ABOUT.ABOUT_APPLE_PEAR.CARD_TITLE' | translate }}</mat-card-title>
6+
<mat-card-subtitle>{{ 'ABOUT.ABOUT_APPLE_PEAR.CARD_SUBTITLE' | translate }}</mat-card-subtitle>
7+
</mat-card-header>
8+
<img mat-card-image src="https://cdn-images-1.medium.com/max/800/0*g1TwOOdncfeTD2CC.png" alt="universal">
9+
<mat-card-content>
10+
<p>
11+
<strong>{{ 'LIPSUM.WHAT.TITLE' | translate }}</strong>
12+
</p>
13+
<p>
14+
{{ 'LIPSUM.WHAT.CONTENT' | translate }}
15+
</p>
16+
<p>
17+
<strong>{{ 'LIPSUM.WHERE_FROM.TITLE' | translate }}</strong>
18+
</p>
19+
<p>
20+
{{ 'LIPSUM.WHERE_FROM.CONTENT_1' | translate }}
21+
</p>
22+
<p>
23+
{{ 'LIPSUM.WHERE_FROM.CONTENT_2' | translate }}
24+
</p>
25+
<p>
26+
<strong>{{ 'LIPSUM.WHY.TITLE' | translate }}</strong>
27+
</p>
28+
<p>
29+
{{ 'LIPSUM.WHY.CONTENT' | translate }}
30+
</p>
31+
<p>
32+
<strong>{{ 'LIPSUM.WHERE_GET.TITLE' | translate }}</strong>
33+
</p>
34+
<p>
35+
{{ 'LIPSUM.WHERE_GET.CONTENT' | translate }}
36+
</p>
37+
</mat-card-content>
38+
</mat-card>
39+
</div>

‎apps/universal/src/app/+about/apple-pear/apple-pear.component.scss

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@import '~@fulls1z3/shared/ui-material/scss/util/bem';
2+
3+
.card_header {
4+
@include el('image') {
5+
background-image: url('https://avatars3.githubusercontent.com/u/19705696');
6+
background-size: cover;
7+
}
8+
}

0 commit comments

Comments
 (0)