Skip to content

Commit ab87b3d

Browse files
svetoldo4444kavalorkin
authored andcommitted
feat(demo): update landing page (#4981)
* fix(landing): fix cypress tests after chahge langing * fix(getting-started): change component and route getting-started to documentation
1 parent 3f536bf commit ab87b3d

File tree

11 files changed

+33
-30
lines changed

11 files changed

+33
-30
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Before opening an issue, please search for duplicates (opened and closed)
22
https://github.com/valor-software/ngx-bootstrap/issues
3-
There's no need to open an issue here if you want to ask general question, use [StackOverflow](https://stackoverflow.com/questions/tagged/ngx-bootstrap) or [Slack](https://ngx-slack.herokuapp.com/) instead
3+
There's no need to open an issue here if you want to ask general question, use [StackOverflow](https://stackoverflow.com/questions/tagged/ngx-bootstrap) or [Slack](https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg) instead
44

55
### Bug description or feature request:
66

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ This `CONTRIBUTING.md` is adapted from the Angular's `CONTRIBUTING.md`, availabl
243243
[coc]: https://github.com/valor-software/ngx-bootstrap/blob/development/CODE_OF_CONDUCT.md
244244
[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
245245
[github]: https://github.com/valor-software/ngx-bootstrap
246-
[slack]: https://ngx-slack.herokuapp.com
246+
[slack]: https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg
247247
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
248248
[plunker]: http://plnkr.co/edit
249249
[stackoverflow]: http://stackoverflow.com/questions/tagged/ngx-bootstrap

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ Please read our [contribution guidelines](https://github.com/valor-software/ngx-
172172
Please read central `ngx` modules [readme](https://github.com/valor-software/ng2-plans) for details, plans and approach
173173

174174
### Credits
175-
Crossbrowser testing sponsored by [Saucelab](https://saucelabs.com/)
176-
[<img src="https://saucelabs.com/content/images/circle-logo@2x.png" alt="Browser Stack" width="31" height="31">](https://saucelabs.com/)
175+
Crossbrowser testing sponsored by [Saucelabs](https://saucelabs.com/)
176+
[<img src="https://saucelabs.com/content/images/circle-logo@2x.png" alt="Saucelabs" width="31" height="31">](https://saucelabs.com/)
177177

178178
### License
179179

cypress/integration/landing_page_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Landing Page test suite', () => {
4444
describe('Navigation buttons', () => {
4545
it('Get started button redirects to Getting Started page', () => {
4646
const buttonText = 'Get started';
47-
const searchedUrl = '/getting-started';
47+
const searchedUrl = '/documentation';
4848

4949
landing.clickByText(landing.navBtn, buttonText);
5050

@@ -54,7 +54,7 @@ describe('Landing Page test suite', () => {
5454

5555
it('Documentation button is enabled and contains link to documentation', () => {
5656
const buttonText = 'Documentation';
57-
const searchedUrl = '/getting-started';
57+
const searchedUrl = '/documentation';
5858

5959
cy.get(landing.navBtn).contains(buttonText)
6060
.should('be.enabled');

demo/src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { environment } from '../environments/environment';
1010
import { ngdoc } from '../ng-api-doc';
1111
import { AppComponent } from './app.component';
1212
import { routes } from './app.routing';
13-
import { GettingStartedComponent } from './common/getting-started/getting-started.component';
13+
import { DocumentationComponent } from './common/documentation/documentation.component';
1414
import { LandingComponent } from './common/landing/landing.component';
1515
import { TopMenuComponent } from './common/top-menu/top-menu.component';
1616
import { DocsModule } from './docs';
@@ -19,7 +19,7 @@ import { StyleManager } from './theme/style-manager';
1919
import { ThemeStorage } from './theme/theme-storage';
2020

2121
@NgModule({
22-
declarations: [AppComponent, GettingStartedComponent, TopMenuComponent, LandingComponent],
22+
declarations: [AppComponent, DocumentationComponent, TopMenuComponent, LandingComponent],
2323
imports: [
2424
DocsModule,
2525
FormsModule,

demo/src/app/app.routing.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LandingComponent } from './common/landing/landing.component';
2-
import { GettingStartedComponent } from './common/getting-started/getting-started.component';
2+
import { DocumentationComponent } from './common/documentation/documentation.component';
33

44
export const routes = [
55
{
@@ -8,9 +8,9 @@ export const routes = [
88
component: LandingComponent
99
},
1010
{
11-
path: 'getting-started',
12-
data: ['Getting started'],
13-
component: GettingStartedComponent
11+
path: 'documentation',
12+
data: ['Documentation'],
13+
component: DocumentationComponent
1414
},
1515
{
1616
path: 'accordion',

demo/src/app/common/getting-started/getting-started.component.html renamed to demo/src/app/common/documentation/documentation.component.html

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@ <h1 align="center">
1616
</p>
1717

1818
<p align="center">
19-
<span style="margin-top: 10px;display: inline-block;width: 120px;">
20-
<iframe frameborder="0" scrolling="0" style="height: 20px;width: 120px;"
21-
title="github stars count"
22-
src="https://ghbtns.com/github-btn.html?user=valor-software&repo=ngx-bootstrap&type=star&count=true"></iframe></span>
23-
<br/>
19+
<span class="d-flex justify-content-center align-items-center">
20+
<a class="mr-1" href="https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg">
21+
<img src="https://a.slack-edge.com/66f9/img/icons/ios-256.png" width="25" height="25" alt="slack" >
22+
</a>
23+
<span style="display: inline-block;width: 120px;height: 20px;">
24+
<iframe frameborder="0" scrolling="0" style="height: 20px;width: 120px;"
25+
title="github stars count"
26+
src="https://ghbtns.com/github-btn.html?user=valor-software&repo=ngx-bootstrap&type=star&count=true"></iframe>
27+
</span>
28+
29+
</span>
2430

2531
<a href="https://badge.fury.io/js/ngx-bootstrap">
2632
<img src="https://badge.fury.io/js/ngx-bootstrap.svg" alt="npm version">
@@ -35,16 +41,13 @@ <h1 align="center">
3541
<img alt="build status" src="https://travis-ci.org/valor-software/ngx-bootstrap.svg?branch=development">
3642
</a>
3743
<br/>
38-
<a href="https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg">
39-
<img src="https://a.slack-edge.com/66f9/img/icons/ios-256.png" width="25" height="25" alt="slack" >
40-
</a>
4144
</p>
4245

4346
<div class="section">
4447

4548
<h2>Links</h2>
4649
<ul>
47-
<li><a href="http://valor-software.com/ngx-bootstrap/">Documentation</a></li>
50+
<!--<li><a href="http://valor-software.com/ngx-bootstrap/">Documentation</a></li>-->
4851
<li><a href="https://github.com/valor-software/ngx-bootstrap/blob/development/CHANGELOG.md">Release Notes</a></li>
4952
<li><a href="https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg">Slack Community</a></li>
5053
</ul>
@@ -167,9 +170,9 @@ <h3>If you need more modules check <a href="https://github.com/valor-software/ng
167170
<h3>Credits</h3>
168171

169172
<p>Crossbrowser testing sponsored by
170-
<a href="https://saucelabs.com/" class="pr-1">Saucelab</a>
173+
<a href="https://saucelabs.com/" class="pr-1">Saucelabs</a>
171174
<a href="https://saucelabs.com/">
172-
<img src="https://saucelabs.com/content/images/circle-logo@2x.png" alt="Browser Stack" width="31" height="31">
175+
<img src="https://saucelabs.com/content/images/circle-logo@2x.png" alt="Saucelabs" width="31" height="31">
173176
</a>
174177
</p>
175178

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4-
selector: 'getting-started',
5-
templateUrl: './getting-started.component.html'
4+
selector: 'documentation',
5+
templateUrl: './documentation.component.html'
66
})
7-
export class GettingStartedComponent {
7+
export class DocumentationComponent {
88
name = `Native Angular widgets for Bootstrap 3 and Bootstrap 4`;
99
src = 'https://github.com/valor-software/ngx-bootstrap';
1010
}

demo/src/app/common/landing/landing.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<h1 class="slogan">Develop better. Faster.</h1>
88
<p class="descr">Bootstrap components, powered by Angular</p>
99
<div class="btn-block">
10-
<a class="btn btn-primary" (click)="scrollToSection()" routerLink="/getting-started">Get started</a>
11-
<a class="btn btn-outline-secondary" routerLink="/getting-started">Documentation</a>
10+
<a class="btn btn-primary text-white" (click)="scrollToSection()">Get started</a>
11+
<a class="btn btn-outline-secondary" routerLink="/documentation">Documentation</a>
1212
</div>
1313
<p class="version">{{currentVersion}}</p>
1414
</section>

demo/src/app/common/landing/landing.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ export class LandingComponent implements AfterViewInit {
4444
}
4545

4646
scrollToSection() {
47-
this.router.navigate(['.', 'getting-started' ], {fragment: 'getting-started'});
47+
this.router.navigate(['.', 'documentation' ], {fragment: 'getting-started'});
4848
}
4949
}

0 commit comments

Comments
 (0)