Skip to content

Commit 94af9da

Browse files
committed
Merge branch 'layout' into 'development'
Layout See merge request Works.Al-Mokhtar/shared/dotnet-validator-docs!1
2 parents e98080c + e7e7c12 commit 94af9da

58 files changed

Lines changed: 929 additions & 41 deletions

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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
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+
"bootstrap": "^4.3.1",
25+
"font-awesome": "^4.7.0",
2426
"rxjs": "~6.4.0",
2527
"tslib": "^1.10.0",
2628
"zone.js": "~0.9.1"
@@ -30,9 +32,9 @@
3032
"@angular/cli": "~8.2.0",
3133
"@angular/compiler-cli": "~8.2.0",
3234
"@angular/language-service": "~8.2.0",
33-
"@types/node": "~8.9.4",
3435
"@types/jasmine": "~3.3.8",
3536
"@types/jasminewd2": "~2.0.3",
37+
"@types/node": "~8.9.4",
3638
"codelyzer": "^5.0.0",
3739
"jasmine-core": "~3.4.0",
3840
"jasmine-spec-reporter": "~4.2.1",
@@ -46,4 +48,4 @@
4648
"tslint": "~5.15.0",
4749
"typescript": "~3.5.3"
4850
}
49-
}
51+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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 routerLink="/" class="nav-link">
14+
<i class="fa fa-stack-overflow"></i>
15+
Stack Overflow
16+
</a>
17+
</div>
18+
<div class="nav-item">
19+
<span class="nav-link section-title">More</span>
20+
<a routerLink="/" class="nav-link">
21+
<i class="fa fa-github"></i>
22+
GitHub
23+
</a>
24+
<a routerLink="/" class="nav-link">
25+
<i class="fa fa-download"></i>
26+
Nuget
27+
</a>
28+
</div>
29+
</nav>
30+
</div>
31+
<div class="col-12 footer-copy-right">
32+
Copyright &copy; {{year}} DotNet Validator
33+
</div>
34+
</div>

src/app/main/components/footer/footer.component.sass

Whitespace-only changes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component, OnInit } from "@angular/core";
2+
3+
@Component({
4+
selector: "app-footer",
5+
templateUrl: "./footer.component.html",
6+
styleUrls: ["./footer.component.sass"]
7+
})
8+
export class FooterComponent {
9+
10+
year: number = new Date().getFullYear();
11+
}

src/app/main/components/index.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { TopNavComponent } from "../components/top-nav/top-nav.component";
2+
import { SideNavComponent } from "../components/side-nav/side-nav.component";
3+
import { PostComponent } from "../components/post/post.component";
4+
import { NavigatorComponent } from "../components/navigator/navigator.component";
5+
import { SectionNavComponent } from "../components/section-nav/section-nav.component";
6+
import { FooterComponent } from "../components/footer/footer.component";
7+
8+
export const COMPONENTS: any[] = [
9+
TopNavComponent,
10+
SideNavComponent,
11+
PostComponent,
12+
NavigatorComponent,
13+
SectionNavComponent,
14+
FooterComponent
15+
];
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div class="doc-prev-next">
2+
<a class="doc-prev button" routerLink="/">
3+
<span></span>
4+
<span>Previous</span>
5+
</a>
6+
<a class="doc-next button" routerLink="/">
7+
<span>Next</span>
8+
<span></span>
9+
</a>
10+
</div>

src/app/main/components/navigator/navigator.component.sass

Whitespace-only changes.

0 commit comments

Comments
 (0)