Skip to content

Commit 2528ca0

Browse files
FawzyMokhtarFawzyMokhtar
committed
Merge branch 'development' into 'master'
Version 1.0.0 See merge request Works.Al-Mokhtar/shared/dotnet-validator-docs!8
2 parents b94c4f6 + bbbb3e5 commit 2528ca0

19 files changed

Lines changed: 47 additions & 61 deletions

‎src/app/root/root-routing.module.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,18 @@ import * as fromShared from "../shared";
66
import * as fromContainers from "./containers";
77

88
const routes: Routes = [
9-
{
10-
path: "",
11-
redirectTo: "docs",
12-
pathMatch: "full"
13-
},
149
{
1510
path: "docs",
1611
component: fromContainers.LayoutComponent,
1712
children: [
18-
{
19-
path: "",
20-
pathMatch: "full",
21-
redirectTo: "v1.0.0"
22-
},
2313
{
2414
path: "v1.0.0",
2515
loadChildren: () => import("../version1.0.0").then(m => m.Version100Module)
16+
},
17+
{
18+
path: "**",
19+
pathMatch: "full",
20+
redirectTo: "v1.0.0"
2621
}
2722
]
2823
},
@@ -40,7 +35,12 @@ const routes: Routes = [
4035
redirectTo: ""
4136
},
4237
]
43-
}
38+
},
39+
{
40+
path: "**",
41+
pathMatch: "full",
42+
redirectTo: "docs"
43+
},
4444
];
4545

4646
@NgModule({
@@ -50,7 +50,8 @@ const routes: Routes = [
5050
// Automatic scrolling
5151
anchorScrolling: "enabled",
5252
// Use this value to scroll to the html element with a suitable view
53-
scrollOffset: [0, 60]
53+
scrollOffset: [0, 60],
54+
scrollPositionRestoration: "top"
5455
}
5556
)
5657
],

‎src/app/shared/data/versions.data.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,9 +1176,9 @@ export const Versions: IVersion[] = [
11761176
route: resolveRoute(VERSIONS["1.0.0"], "why-dotnet-validator"),
11771177
},
11781178
{
1179-
id: "collaborators",
1180-
title: "Collaborators",
1181-
route: resolveRoute(VERSIONS["1.0.0"], "collaborators"),
1179+
id: "contributors",
1180+
title: "Contributors",
1181+
route: resolveRoute(VERSIONS["1.0.0"], "contributors"),
11821182
}
11831183
]
11841184
}

src/app/version1.0.0/components/development/collaborators/collaborators.component.html renamed to src/app/version1.0.0/components/development/contributors/contributors.component.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<!-- Article -->
44
<ng-container class="article">
55
<p>
6-
We are the <a routerLink="/">DotNet Validator</a> collaborators,
6+
We are the <a routerLink="/">DotNet Validator</a> contributors,
77
</p>
8-
<div class="collaborators">
8+
<div class="contributors">
99
<div class="card">
10-
<img src="assets/imgs/collaborators/fawzy-mokhtar.jpg" class="card-img-top" alt="Fawzy Mokhtar">
10+
<img src="assets/imgs/contributors/fawzy-mokhtar.jpg" class="card-img-top" alt="Fawzy Mokhtar">
1111
<div class="card-body">
1212
<h5 class="card-title">Fawzy Mokhtar</h5>
1313
<p class="card-text">Backend Developer.</p>
@@ -22,15 +22,14 @@ <h5 class="card-title">Fawzy Mokhtar</h5>
2222

2323
<div class="card">
2424
<a href="{{settings.gitHubRepo}}" target="blank" class="card-link">
25-
<img src="assets/imgs/collaborators/new-collaborator.png" class="card-img-top"
26-
alt="New Collaborator">
25+
<img src="assets/imgs/contributors/new-contributor.png" class="card-img-top" alt="New Collaborator">
2726
</a>
2827
<div class="card-body">
2928
<h5 class="card-title">You!</h5>
3029
<p class="card-text">Join us!.</p>
3130
</div>
3231
<div class="card-body">
33-
<a href="{{settings.gitHubRepo}}" target="blank" class="card-link">Become a collaborator</a>
32+
<a href="{{settings.gitHubRepo}}" target="blank" class="card-link">Become a contributor</a>
3433
</div>
3534
</div>
3635
</div>

src/app/version1.0.0/components/development/collaborators/collaborators.component.sass renamed to src/app/version1.0.0/components/development/contributors/contributors.component.sass

File renamed without changes.

src/app/version1.0.0/components/development/collaborators/collaborators.component.ts renamed to src/app/version1.0.0/components/development/contributors/contributors.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {IPost, DocService} from "../../../../shared";
33
import {environment} from "../../../../../environments/environment";
44

55
@Component({
6-
selector: "app-collaborators",
7-
templateUrl: "./collaborators.component.html",
8-
styleUrls: ["./collaborators.component.sass"]
6+
selector: "app-contributors",
7+
templateUrl: "./contributors.component.html",
8+
styleUrls: ["./contributors.component.sass"]
99
})
10-
export class CollaboratorsComponent implements OnInit {
10+
export class ContributorsComponent implements OnInit {
1111

1212
versionId = "1.0.0";
13-
postId = "collaborators";
13+
postId = "contributors";
1414

1515
post: IPost;
1616
previous: IPost;

‎src/app/version1.0.0/components/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import {ValidateVsResultComponent} from "./advanced/validate-vs-result/validate-
5858
/* Development */
5959
import {ReleaseNotesComponent} from "./development/release-notes/release-notes.component";
6060
import {WhyDotnetValidatorComponent} from "./development/why-dotnet-validator/why-dotnet-validator.component";
61-
import {CollaboratorsComponent} from "./development/collaborators/collaborators.component";
61+
import {ContributorsComponent} from "./development/contributors/contributors.component";
6262

6363

6464

@@ -125,7 +125,7 @@ export * from "./advanced/validate-vs-result/validate-vs-result.component";
125125
/* Development */
126126
export * from "./development/release-notes/release-notes.component";
127127
export * from "./development/why-dotnet-validator/why-dotnet-validator.component";
128-
export * from "./development/collaborators/collaborators.component";
128+
export * from "./development/contributors/contributors.component";
129129

130130
export const COMPONENTS: any[] = [
131131
GettingStartedComponent,
@@ -181,5 +181,5 @@ export const COMPONENTS: any[] = [
181181

182182
ReleaseNotesComponent,
183183
WhyDotnetValidatorComponent,
184-
CollaboratorsComponent
184+
ContributorsComponent
185185
];

‎src/app/version1.0.0/components/validation/is-port-func/is-port-func.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<ng-container class="article">
55
<p>
66
An <code>extension</code> validation <code>method</code> checks if the property's value is a valid port
7-
number, note: the maximum port number is 65535.
7+
number, note: the maximum port number is
8+
<a href="https://stackoverflow.com/a/113228/3858705" target="blank">65535</a>.
89
</p>
910
<div>
1011
<h2 class="section-heading">

‎src/app/version1.0.0/version1.0.0-routing.module.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ const routes: Routes = [
99
path: "",
1010
component: fromContainers.MainComponent,
1111
children: [
12-
13-
{
14-
path: "",
15-
pathMatch: "full",
16-
redirectTo: "getting-started"
17-
},
1812
{
1913
path: "getting-started",
2014
component: fromComponents.GettingStartedComponent
@@ -218,9 +212,15 @@ const routes: Routes = [
218212
component: fromComponents.WhyDotnetValidatorComponent
219213
},
220214
{
221-
path: "collaborators",
222-
component: fromComponents.CollaboratorsComponent
215+
path: "contributors",
216+
component: fromComponents.ContributorsComponent
223217
},
218+
219+
{
220+
path: "**",
221+
pathMatch: "full",
222+
redirectTo: "getting-started"
223+
}
224224
]
225225
}
226226
];

src/assets/imgs/collaborators/fawzy-mokhtar.jpg renamed to src/assets/imgs/contributors/fawzy-mokhtar.jpg

File renamed without changes.

src/assets/imgs/collaborators/new-collaborator.png renamed to src/assets/imgs/contributors/new-contributor.png

File renamed without changes.

0 commit comments

Comments
 (0)