Skip to content

Commit e01b7eb

Browse files
committed
Merge branch 'development' into 'master'
Version 1.0.0 See merge request Works.Al-Mokhtar/shared/dotnet-validator-docs!4
2 parents e98080c + 5f9b663 commit e01b7eb

270 files changed

Lines changed: 11337 additions & 73 deletions

File tree

Some content is hidden

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

angular.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@
5151
"aot": false,
5252
"assets": [
5353
"src/favicon.ico",
54+
"src/favicon.svg",
5455
"src/assets"
5556
],
5657
"styles": [
58+
"node_modules/font-awesome/scss/font-awesome.scss",
5759
"src/styles/styles.scss"
5860
],
5961
"scripts": []
@@ -116,9 +118,11 @@
116118
"karmaConfig": "karma.conf.js",
117119
"assets": [
118120
"src/favicon.ico",
121+
"src/favicon.svg",
119122
"src/assets"
120123
],
121124
"styles": [
125+
"node_modules/font-awesome/scss/font-awesome.scss",
122126
"src/styles/styles.scss"
123127
],
124128
"scripts": []
@@ -153,4 +157,4 @@
153157
}
154158
},
155159
"defaultProject": "documentation-website"
156-
}
160+
}

e2e/src/app.e2e-spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { AppPage } from './app.po';
2-
import { browser, logging } from 'protractor';
1+
import { AppPage } from "./app.po";
2+
import { browser, logging } from "protractor";
33

4-
describe('workspace-project App', () => {
4+
describe("workspace-project App", () => {
55
let page: AppPage;
66

77
beforeEach(() => {
88
page = new AppPage();
99
});
1010

11-
it('should display welcome message', () => {
11+
it("should display welcome message", () => {
1212
page.navigateTo();
13-
expect(page.getTitleText()).toEqual('Welcome to documentation-website!');
13+
expect(page.getTitleText()).toEqual("Welcome to documentation-website!");
1414
});
1515

1616
afterEach(async () => {

e2e/src/app.po.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { browser, by, element } from 'protractor';
1+
import { browser, by, element } from "protractor";
22

33
export class AppPage {
4-
navigateTo() {
4+
public navigateTo() {
55
return browser.get(browser.baseUrl) as Promise<any>;
66
}
77

8-
getTitleText() {
9-
return element(by.css('app-root h1')).getText() as Promise<string>;
8+
public getTitleText() {
9+
return element(by.css("app-root h1")).getText() as Promise<string>;
1010
}
1111
}

package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
"@angular/forms": "~8.2.0",
2121
"@angular/platform-browser": "~8.2.0",
2222
"@angular/platform-browser-dynamic": "~8.2.0",
23-
"@angular/router": "~8.2.0",
23+
"@angular/router": "^8.2.0",
24+
"@types/lodash": "^4.14.136",
25+
"bootstrap": "^4.3.1",
26+
"font-awesome": "^4.7.0",
27+
"highlight.js": "^9.15.9",
28+
"lodash": "^4.17.15",
2429
"rxjs": "~6.4.0",
2530
"tslib": "^1.10.0",
2631
"zone.js": "~0.9.1"
@@ -30,9 +35,9 @@
3035
"@angular/cli": "~8.2.0",
3136
"@angular/compiler-cli": "~8.2.0",
3237
"@angular/language-service": "~8.2.0",
33-
"@types/node": "~8.9.4",
3438
"@types/jasmine": "~3.3.8",
3539
"@types/jasminewd2": "~2.0.3",
40+
"@types/node": "~8.9.4",
3641
"codelyzer": "^5.0.0",
3742
"jasmine-core": "~3.4.0",
3843
"jasmine-spec-reporter": "~4.2.1",
@@ -46,4 +51,4 @@
4651
"tslint": "~5.15.0",
4752
"typescript": "~3.5.3"
4853
}
49-
}
54+
}

src/app/main/containers/main/main.component.html

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/app/main/containers/main/main.component.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/app/main/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/main/main.module.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<div class="row footer">
2+
<div class="col-12 footer-links">
3+
<nav class="navbar">
4+
<div class="nav-item">
5+
<span class="nav-link section-title">Docs</span>
6+
<a routerLink="/" class="nav-link">
7+
<i class="fa fa-play-circle-o"></i>
8+
Getting Started
9+
</a>
10+
</div>
11+
<div class="nav-item">
12+
<span class="nav-link section-title">Community</span>
13+
<a href="{{settings.stackOverflow}}" target="blank" class="nav-link">
14+
<i class="fa fa-stack-overflow"></i>
15+
StackOverflow
16+
</a>
17+
</div>
18+
<div class="nav-item">
19+
<span class="nav-link section-title">More</span>
20+
<a href="{{settings.gitHubRepo}}" target="blank" class="nav-link">
21+
<i class="fa fa-github"></i>
22+
GitHub
23+
<a href="{{settings.gitHubRepo + '/stargazers'}}" target="blank" class="badge badge-light">
24+
<i class="fa fa-star"></i>
25+
{{ (gitHubRepo$ | async)?.stargazers_count}}
26+
</a>
27+
</a>
28+
<a href="{{settings.nugetPackage}}" target="blank" class="nav-link">
29+
<i class="fa fa-download"></i>
30+
Nuget
31+
<span class="badge badge-light">
32+
{{ (nugetPackage$ | async)?.data[0].totalDownloads}}
33+
</span>
34+
</a>
35+
</div>
36+
</nav>
37+
</div>
38+
<div class="col-12 footer-copy-right">
39+
Copyright &copy; {{year}} DotNet Validator
40+
</div>
41+
</div>
File renamed without changes.

0 commit comments

Comments
 (0)