-
Notifications
You must be signed in to change notification settings - Fork 465
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into snyk-fix-2rzh7u
- Loading branch information
Showing
37 changed files
with
5,259 additions
and
2,387 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import '@storybook/addon-actions/register'; | ||
| import '@storybook/addon-links/register'; | ||
| import '@storybook/addon-notes/register'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| import { configure } from '@storybook/angular'; | ||
|
|
||
| // automatically import all files ending in *.stories.ts | ||
| const req = require.context('../src/', true, /\.stories\.ts$/); | ||
| function loadStories() { | ||
| require('../src/stories/index.ts'); | ||
| req.keys().forEach((filename) => req(filename)); | ||
| } | ||
|
|
||
| configure(loadStories, module); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| { | ||
| "extends": "../tsconfig.json", | ||
| "exclude": ["../src/test.ts", "../src/**/*.spec.ts"], | ||
| "include": ["../src/**/*"] | ||
| "extends": "../src/tsconfig.app.json", | ||
| "compilerOptions": { | ||
| "types": ["node", "googlemaps"] | ||
| }, | ||
| "exclude": [ | ||
| "../src/test.ts", | ||
| "../src/**/*.spec.ts", | ||
| "../projects/**/*.spec.ts" | ||
| ], | ||
| "include": ["../src/**/*", "../projects/**/*"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { HttpClientModule, HttpClient } from '@angular/common/http'; | ||
| import { | ||
| TranslateModule, | ||
| TranslateLoader, | ||
| TranslateService | ||
| } from '@ngx-translate/core'; | ||
| import { TranslateHttpLoader } from '@ngx-translate/http-loader'; | ||
|
|
||
| // AoT requires an exported function for factories | ||
| export function HttpLoaderFactory(http: HttpClient) { | ||
| return new TranslateHttpLoader(http); | ||
| } | ||
|
|
||
| @NgModule({ | ||
| declarations: [], | ||
| imports: [ | ||
| HttpClientModule, | ||
| TranslateModule.forRoot({ | ||
| loader: { | ||
| provide: TranslateLoader, | ||
| useFactory: HttpLoaderFactory, | ||
| deps: [HttpClient] | ||
| } | ||
| }) | ||
| ], | ||
| exports: [TranslateModule] | ||
| }) | ||
| export class I18nModule { | ||
| constructor(translate: TranslateService) { | ||
| translate.setDefaultLang('en'); | ||
| translate.use('en'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.