diff --git a/showcase/angular.json b/showcase/angular.json index 4c4726e9d3..4cee4c77c8 100644 --- a/showcase/angular.json +++ b/showcase/angular.json @@ -22,11 +22,6 @@ "input": "../node_modules/@mdi/angular-material", "output": "./assets/material-icons" }, - { - "glob": "**/*", - "input": "src/assets/img", - "output": "./assets/img" - }, { "glob": "**/*", "input": "assets", diff --git a/showcase/assets-base/browserconfig.xml b/showcase/assets-base/browserconfig.xml deleted file mode 100644 index 93e4833c65..0000000000 --- a/showcase/assets-base/browserconfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - #ffffff - - - diff --git a/showcase/assets/translations/nl.json b/showcase/assets/translations/nl.json deleted file mode 100644 index 0ed45cf961..0000000000 --- a/showcase/assets/translations/nl.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "SHOWCASE": { - "HOME": { - "TITLE": "Stark Showcase applicatie" - } - } -} diff --git a/showcase/package.json b/showcase/package.json index 1d48b739b9..5cbae9f60e 100644 --- a/showcase/package.json +++ b/showcase/package.json @@ -119,8 +119,8 @@ "@angular/platform-browser-dynamic": "6.0.2", "@angular/platform-server": "6.0.2", "@angular/router": "6.0.2", - "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-e075cf5.tgz", - "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-e075cf5.tgz", + "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-18ddc7a.tgz", + "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-18ddc7a.tgz", "@uirouter/visualizer": "6.0.0", "core-js": "2.5.7", "eligrey-classlist-js-polyfill": "1.2.20180112", @@ -135,8 +135,8 @@ "zone.js": "0.8.26" }, "devDependencies": { - "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-e12021d.tgz", - "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-e12021d.tgz", + "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-18ddc7a.tgz", + "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-18ddc7a.tgz", "@types/core-js": "2.5.0", "@types/hammerjs": "2.0.35", "@types/node": "8.10.15", diff --git a/showcase/src/app/app.e2e.ts b/showcase/src/app/app.e2e.ts index 9de7c8078d..8f9d78dd9e 100644 --- a/showcase/src/app/app.e2e.ts +++ b/showcase/src/app/app.e2e.ts @@ -24,10 +24,4 @@ describe("App", () => { const result: boolean = true; expect(subject).toEqual(result); }); - - it("should have buttons", async () => { - const subject: string = await element(by.css("button")).getText(); - const result: string = "Submit Value"; - expect(subject).toEqual(result); - }); }); diff --git a/showcase/src/app/app.module.ts b/showcase/src/app/app.module.ts index 2c25c1dff9..0e3d37e482 100644 --- a/showcase/src/app/app.module.ts +++ b/showcase/src/app/app.module.ts @@ -36,6 +36,7 @@ import { Deserialize } from "cerialize"; * Translations */ import { TranslateModule, TranslateService } from "@ngx-translate/core"; +import { initializeTranslation } from "./translation.config"; /* * Platform and Environment providers/directives/pipes */ @@ -54,10 +55,6 @@ import "../styles/styles.pcss"; import "../styles/styles.scss"; /* tslint:enable */ -const translationsEn: object = require("../../assets/translations/en.json"); -const translationsFr: object = require("../../assets/translations/fr.json"); -const translationsNl: object = require("../../assets/translations/nl.json"); - // Application wide providers const APP_PROVIDERS: any[] = [AppState]; @@ -159,16 +156,9 @@ export class AppModule { matIconRegistry: MatIconRegistry, domSanitizer: DomSanitizer ) { + initializeTranslation(this.translateService); registerMaterialIconSet(matIconRegistry, domSanitizer); - // TODO should use StarkLanguages, StarkLanguage, etc - this.translateService.addLangs(["en", "fr", "nl"]); - this.translateService.setTranslation("en", translationsEn, true); - this.translateService.setTranslation("fr", translationsFr, true); - this.translateService.setTranslation("nl", translationsNl, true); - this.translateService.setDefaultLang("en"); - this.translateService.use("en"); - const user: StarkUser = { uuid: "abc123", username: "John", diff --git a/showcase/src/app/home/home.component.ts b/showcase/src/app/home/home.component.ts index 2200b4d12a..c794454fbf 100644 --- a/showcase/src/app/home/home.component.ts +++ b/showcase/src/app/home/home.component.ts @@ -4,23 +4,9 @@ import { STARK_LOGGING_SERVICE, StarkErrorImpl, StarkLoggingService } from "@nat import { AppState } from "../app.service"; @Component({ - /** - * The selector is what angular internally uses - * for `document.querySelectorAll(selector)` in our index.html - * where, in this case, selector is the string 'home'. - */ selector: "home", // - /** - * We need to tell Angular's Dependency Injection which providers are in our app. - */ providers: [], - /** - * Our list of styles in our component. We may add more to compose many styles together. - */ styleUrls: ["./home.component.pcss"], - /** - * Every Angular template is first compiled by the browser before Angular runs it's compiler. - */ templateUrl: "./home.component.html" }) export class HomeComponent implements OnInit { diff --git a/showcase/src/app/translation.config.ts b/showcase/src/app/translation.config.ts new file mode 100644 index 0000000000..71966be047 --- /dev/null +++ b/showcase/src/app/translation.config.ts @@ -0,0 +1,19 @@ +import { TranslateService } from "@ngx-translate/core"; +import { mergeTranslations } from "../../../packages/stark-core/src/common/translations/translations"; +import { StarkLocale } from "../../../packages/stark-core/src/common/translations/locale.intf"; + +const translationsEn: object = require("../assets/translations/en.json"); +const translationsFr: object = require("../assets/translations/fr.json"); +const translationsNl: object = require("../assets/translations/nl.json"); + +export function initializeTranslation(translateService: TranslateService): void { + translateService.addLangs(["en", "fr", "nl"]); + translateService.setDefaultLang("en"); + translateService.use("nl"); + + const english: StarkLocale = { languageCode: "en", translations: translationsEn }; + const french: StarkLocale = { languageCode: "fr", translations: translationsFr }; + const dutch: StarkLocale = { languageCode: "nl", translations: translationsNl }; + + mergeTranslations(translateService, english, french, dutch); +} diff --git a/showcase/assets-base/README.md b/showcase/src/assets-base/README.md similarity index 100% rename from showcase/assets-base/README.md rename to showcase/src/assets-base/README.md diff --git a/showcase/src/assets-base/browserconfig.xml b/showcase/src/assets-base/browserconfig.xml new file mode 100644 index 0000000000..c5fdb921b9 --- /dev/null +++ b/showcase/src/assets-base/browserconfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + #ffffff + + + diff --git a/showcase/assets-base/crossdomain.xml b/showcase/src/assets-base/crossdomain.xml similarity index 100% rename from showcase/assets-base/crossdomain.xml rename to showcase/src/assets-base/crossdomain.xml diff --git a/showcase/assets-base/favicon.ico b/showcase/src/assets-base/favicon.ico similarity index 100% rename from showcase/assets-base/favicon.ico rename to showcase/src/assets-base/favicon.ico diff --git a/showcase/assets-base/humans.txt b/showcase/src/assets-base/humans.txt similarity index 100% rename from showcase/assets-base/humans.txt rename to showcase/src/assets-base/humans.txt diff --git a/showcase/assets-base/manifest.json b/showcase/src/assets-base/manifest.json similarity index 62% rename from showcase/assets-base/manifest.json rename to showcase/src/assets-base/manifest.json index 30759d71aa..6557101984 100644 --- a/showcase/assets-base/manifest.json +++ b/showcase/src/assets-base/manifest.json @@ -5,37 +5,37 @@ "display": "standalone", "icons": [ { - "src": "/assets/images/favicon/android-icon-36x36.png", + "src": "/assets/images/app-icons/android-icon-36x36.png", "sizes": "36x36", "type": "image/png", "density": "0.75" }, { - "src": "/assets/images/favicon/android-icon-48x48.png", + "src": "/assets/images/app-icons/android-icon-48x48.png", "sizes": "48x48", "type": "image/png", "density": "1.0" }, { - "src": "/assets/images/favicon/android-icon-72x72.png", + "src": "/assets/images/app-icons/android-icon-72x72.png", "sizes": "72x72", "type": "image/png", "density": "1.5" }, { - "src": "/assets/images/favicon/android-icon-96x96.png", + "src": "/assets/images/app-icons/android-icon-96x96.png", "sizes": "96x96", "type": "image/png", "density": "2.0" }, { - "src": "/assets/images/favicon/android-icon-144x144.png", + "src": "/assets/images/app-icons/android-icon-144x144.png", "sizes": "144x144", "type": "image/png", "density": "3.0" }, { - "src": "/assets/images/favicon/android-icon-192x192.png", + "src": "/assets/images/app-icons/android-icon-192x192.png", "sizes": "192x192", "type": "image/png", "density": "4.0" diff --git a/showcase/assets-base/robots.txt b/showcase/src/assets-base/robots.txt similarity index 100% rename from showcase/assets-base/robots.txt rename to showcase/src/assets-base/robots.txt diff --git a/showcase/assets-base/service-worker.js b/showcase/src/assets-base/service-worker.js similarity index 100% rename from showcase/assets-base/service-worker.js rename to showcase/src/assets-base/service-worker.js diff --git a/showcase/assets/README.md b/showcase/src/assets/README.md similarity index 71% rename from showcase/assets/README.md rename to showcase/src/assets/README.md index a81d4883d1..e1c53846a7 100644 --- a/showcase/assets/README.md +++ b/showcase/src/assets/README.md @@ -1,4 +1,4 @@ -This folder should contain all static assets of Stark. +This folder should contain all static assets of the application. Note that all the contents of this folder will be copied to the "assets" folder in "dist". For example, "assets/images" will be copied to "dist/assets/images" diff --git a/showcase/src/assets/icon/android-icon-144x144.png b/showcase/src/assets/icon/android-icon-144x144.png deleted file mode 100644 index 90169cb327..0000000000 Binary files a/showcase/src/assets/icon/android-icon-144x144.png and /dev/null differ diff --git a/showcase/src/assets/icon/android-icon-192x192.png b/showcase/src/assets/icon/android-icon-192x192.png deleted file mode 100644 index 8d05a1944e..0000000000 Binary files a/showcase/src/assets/icon/android-icon-192x192.png and /dev/null differ diff --git a/showcase/src/assets/icon/android-icon-36x36.png b/showcase/src/assets/icon/android-icon-36x36.png deleted file mode 100644 index 924420f3f1..0000000000 Binary files a/showcase/src/assets/icon/android-icon-36x36.png and /dev/null differ diff --git a/showcase/src/assets/icon/android-icon-48x48.png b/showcase/src/assets/icon/android-icon-48x48.png deleted file mode 100644 index d8cf8d4f4e..0000000000 Binary files a/showcase/src/assets/icon/android-icon-48x48.png and /dev/null differ diff --git a/showcase/src/assets/icon/android-icon-72x72.png b/showcase/src/assets/icon/android-icon-72x72.png deleted file mode 100644 index 544b26efed..0000000000 Binary files a/showcase/src/assets/icon/android-icon-72x72.png and /dev/null differ diff --git a/showcase/src/assets/icon/android-icon-96x96.png b/showcase/src/assets/icon/android-icon-96x96.png deleted file mode 100644 index 0a346f6dc3..0000000000 Binary files a/showcase/src/assets/icon/android-icon-96x96.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-114x114.png b/showcase/src/assets/icon/apple-icon-114x114.png deleted file mode 100644 index 3a41f51f53..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-114x114.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-120x120.png b/showcase/src/assets/icon/apple-icon-120x120.png deleted file mode 100644 index f652ce9533..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-120x120.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-144x144.png b/showcase/src/assets/icon/apple-icon-144x144.png deleted file mode 100644 index 90169cb327..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-144x144.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-152x152.png b/showcase/src/assets/icon/apple-icon-152x152.png deleted file mode 100644 index e4b41cd372..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-152x152.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-180x180.png b/showcase/src/assets/icon/apple-icon-180x180.png deleted file mode 100644 index c0c2f99f14..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-180x180.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-57x57.png b/showcase/src/assets/icon/apple-icon-57x57.png deleted file mode 100644 index 627459ab3b..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-57x57.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-60x60.png b/showcase/src/assets/icon/apple-icon-60x60.png deleted file mode 100644 index f67e8cc1f6..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-60x60.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-72x72.png b/showcase/src/assets/icon/apple-icon-72x72.png deleted file mode 100644 index 544b26efed..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-72x72.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-76x76.png b/showcase/src/assets/icon/apple-icon-76x76.png deleted file mode 100644 index d203b63397..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-76x76.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon-precomposed.png b/showcase/src/assets/icon/apple-icon-precomposed.png deleted file mode 100644 index dbdc793698..0000000000 Binary files a/showcase/src/assets/icon/apple-icon-precomposed.png and /dev/null differ diff --git a/showcase/src/assets/icon/apple-icon.png b/showcase/src/assets/icon/apple-icon.png deleted file mode 100644 index dbdc793698..0000000000 Binary files a/showcase/src/assets/icon/apple-icon.png and /dev/null differ diff --git a/showcase/src/assets/icon/browserconfig.xml b/showcase/src/assets/icon/browserconfig.xml deleted file mode 100644 index c554148223..0000000000 --- a/showcase/src/assets/icon/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/showcase/src/assets/icon/favicon-16x16.png b/showcase/src/assets/icon/favicon-16x16.png deleted file mode 100644 index e8eec5d788..0000000000 Binary files a/showcase/src/assets/icon/favicon-16x16.png and /dev/null differ diff --git a/showcase/src/assets/icon/favicon-32x32.png b/showcase/src/assets/icon/favicon-32x32.png deleted file mode 100644 index ee12264431..0000000000 Binary files a/showcase/src/assets/icon/favicon-32x32.png and /dev/null differ diff --git a/showcase/src/assets/icon/favicon-96x96.png b/showcase/src/assets/icon/favicon-96x96.png deleted file mode 100644 index 0a346f6dc3..0000000000 Binary files a/showcase/src/assets/icon/favicon-96x96.png and /dev/null differ diff --git a/showcase/src/assets/icon/favicon.ico b/showcase/src/assets/icon/favicon.ico deleted file mode 100644 index 2239c6c6d6..0000000000 Binary files a/showcase/src/assets/icon/favicon.ico and /dev/null differ diff --git a/showcase/src/assets/icon/ms-icon-144x144.png b/showcase/src/assets/icon/ms-icon-144x144.png deleted file mode 100644 index 90169cb327..0000000000 Binary files a/showcase/src/assets/icon/ms-icon-144x144.png and /dev/null differ diff --git a/showcase/src/assets/icon/ms-icon-150x150.png b/showcase/src/assets/icon/ms-icon-150x150.png deleted file mode 100644 index ac3301e14d..0000000000 Binary files a/showcase/src/assets/icon/ms-icon-150x150.png and /dev/null differ diff --git a/showcase/src/assets/icon/ms-icon-310x310.png b/showcase/src/assets/icon/ms-icon-310x310.png deleted file mode 100644 index d7e13f0491..0000000000 Binary files a/showcase/src/assets/icon/ms-icon-310x310.png and /dev/null differ diff --git a/showcase/src/assets/icon/ms-icon-70x70.png b/showcase/src/assets/icon/ms-icon-70x70.png deleted file mode 100644 index 7686baf5b1..0000000000 Binary files a/showcase/src/assets/icon/ms-icon-70x70.png and /dev/null differ diff --git a/showcase/src/assets/img/angular.png b/showcase/src/assets/images/angular.png similarity index 100% rename from showcase/src/assets/img/angular.png rename to showcase/src/assets/images/angular.png diff --git a/showcase/assets/images/app-header.png b/showcase/src/assets/images/app-header.png similarity index 100% rename from showcase/assets/images/app-header.png rename to showcase/src/assets/images/app-header.png diff --git a/showcase/assets/images/favicon/android-icon-144x144.png b/showcase/src/assets/images/app-icons/android-icon-144x144.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-144x144.png rename to showcase/src/assets/images/app-icons/android-icon-144x144.png diff --git a/showcase/assets/images/favicon/android-icon-192x192.png b/showcase/src/assets/images/app-icons/android-icon-192x192.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-192x192.png rename to showcase/src/assets/images/app-icons/android-icon-192x192.png diff --git a/showcase/assets/images/favicon/android-icon-36x36.png b/showcase/src/assets/images/app-icons/android-icon-36x36.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-36x36.png rename to showcase/src/assets/images/app-icons/android-icon-36x36.png diff --git a/showcase/assets/images/favicon/android-icon-48x48.png b/showcase/src/assets/images/app-icons/android-icon-48x48.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-48x48.png rename to showcase/src/assets/images/app-icons/android-icon-48x48.png diff --git a/showcase/assets/images/favicon/android-icon-72x72.png b/showcase/src/assets/images/app-icons/android-icon-72x72.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-72x72.png rename to showcase/src/assets/images/app-icons/android-icon-72x72.png diff --git a/showcase/assets/images/favicon/android-icon-96x96.png b/showcase/src/assets/images/app-icons/android-icon-96x96.png similarity index 100% rename from showcase/assets/images/favicon/android-icon-96x96.png rename to showcase/src/assets/images/app-icons/android-icon-96x96.png diff --git a/showcase/assets/images/favicon/apple-icon-114x114.png b/showcase/src/assets/images/app-icons/apple-icon-114x114.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-114x114.png rename to showcase/src/assets/images/app-icons/apple-icon-114x114.png diff --git a/showcase/assets/images/favicon/apple-icon-120x120.png b/showcase/src/assets/images/app-icons/apple-icon-120x120.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-120x120.png rename to showcase/src/assets/images/app-icons/apple-icon-120x120.png diff --git a/showcase/assets/images/favicon/apple-icon-144x144.png b/showcase/src/assets/images/app-icons/apple-icon-144x144.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-144x144.png rename to showcase/src/assets/images/app-icons/apple-icon-144x144.png diff --git a/showcase/assets/images/favicon/apple-icon-152x152.png b/showcase/src/assets/images/app-icons/apple-icon-152x152.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-152x152.png rename to showcase/src/assets/images/app-icons/apple-icon-152x152.png diff --git a/showcase/assets/images/favicon/apple-icon-180x180.png b/showcase/src/assets/images/app-icons/apple-icon-180x180.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-180x180.png rename to showcase/src/assets/images/app-icons/apple-icon-180x180.png diff --git a/showcase/assets/images/favicon/apple-icon-57x57.png b/showcase/src/assets/images/app-icons/apple-icon-57x57.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-57x57.png rename to showcase/src/assets/images/app-icons/apple-icon-57x57.png diff --git a/showcase/assets/images/favicon/apple-icon-60x60.png b/showcase/src/assets/images/app-icons/apple-icon-60x60.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-60x60.png rename to showcase/src/assets/images/app-icons/apple-icon-60x60.png diff --git a/showcase/assets/images/favicon/apple-icon-72x72.png b/showcase/src/assets/images/app-icons/apple-icon-72x72.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-72x72.png rename to showcase/src/assets/images/app-icons/apple-icon-72x72.png diff --git a/showcase/assets/images/favicon/apple-icon-76x76.png b/showcase/src/assets/images/app-icons/apple-icon-76x76.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-76x76.png rename to showcase/src/assets/images/app-icons/apple-icon-76x76.png diff --git a/showcase/assets/images/favicon/apple-icon-precomposed.png b/showcase/src/assets/images/app-icons/apple-icon-precomposed.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon-precomposed.png rename to showcase/src/assets/images/app-icons/apple-icon-precomposed.png diff --git a/showcase/assets/images/favicon/apple-icon.png b/showcase/src/assets/images/app-icons/apple-icon.png similarity index 100% rename from showcase/assets/images/favicon/apple-icon.png rename to showcase/src/assets/images/app-icons/apple-icon.png diff --git a/showcase/assets/images/favicon/favicon-16x16.png b/showcase/src/assets/images/app-icons/favicon-16x16.png similarity index 100% rename from showcase/assets/images/favicon/favicon-16x16.png rename to showcase/src/assets/images/app-icons/favicon-16x16.png diff --git a/showcase/assets/images/favicon/favicon-32x32.png b/showcase/src/assets/images/app-icons/favicon-32x32.png similarity index 100% rename from showcase/assets/images/favicon/favicon-32x32.png rename to showcase/src/assets/images/app-icons/favicon-32x32.png diff --git a/showcase/assets/images/favicon/favicon-96x96.png b/showcase/src/assets/images/app-icons/favicon-96x96.png similarity index 100% rename from showcase/assets/images/favicon/favicon-96x96.png rename to showcase/src/assets/images/app-icons/favicon-96x96.png diff --git a/showcase/assets/images/favicon/ms-icon-144x144.png b/showcase/src/assets/images/app-icons/ms-icon-144x144.png similarity index 100% rename from showcase/assets/images/favicon/ms-icon-144x144.png rename to showcase/src/assets/images/app-icons/ms-icon-144x144.png diff --git a/showcase/assets/images/favicon/ms-icon-150x150.png b/showcase/src/assets/images/app-icons/ms-icon-150x150.png similarity index 100% rename from showcase/assets/images/favicon/ms-icon-150x150.png rename to showcase/src/assets/images/app-icons/ms-icon-150x150.png diff --git a/showcase/assets/images/favicon/ms-icon-310x310.png b/showcase/src/assets/images/app-icons/ms-icon-310x310.png similarity index 100% rename from showcase/assets/images/favicon/ms-icon-310x310.png rename to showcase/src/assets/images/app-icons/ms-icon-310x310.png diff --git a/showcase/assets/images/favicon/ms-icon-70x70.png b/showcase/src/assets/images/app-icons/ms-icon-70x70.png similarity index 100% rename from showcase/assets/images/favicon/ms-icon-70x70.png rename to showcase/src/assets/images/app-icons/ms-icon-70x70.png diff --git a/showcase/assets/images/content-ghost.png b/showcase/src/assets/images/content-ghost.png similarity index 100% rename from showcase/assets/images/content-ghost.png rename to showcase/src/assets/images/content-ghost.png diff --git a/showcase/assets/images/empty-state/thinking.svg b/showcase/src/assets/images/empty-state/thinking.svg similarity index 100% rename from showcase/assets/images/empty-state/thinking.svg rename to showcase/src/assets/images/empty-state/thinking.svg diff --git a/showcase/assets/images/logo/logo-blue.svg b/showcase/src/assets/images/logo/logo-blue.svg similarity index 100% rename from showcase/assets/images/logo/logo-blue.svg rename to showcase/src/assets/images/logo/logo-blue.svg diff --git a/showcase/assets/images/logo/logo-full-en-white.svg b/showcase/src/assets/images/logo/logo-full-en-white.svg similarity index 100% rename from showcase/assets/images/logo/logo-full-en-white.svg rename to showcase/src/assets/images/logo/logo-full-en-white.svg diff --git a/showcase/assets/images/logo/logo-nbb-en.gif b/showcase/src/assets/images/logo/logo-nbb-en.gif similarity index 100% rename from showcase/assets/images/logo/logo-nbb-en.gif rename to showcase/src/assets/images/logo/logo-nbb-en.gif diff --git a/showcase/assets/images/logo/logo-white.svg b/showcase/src/assets/images/logo/logo-white.svg similarity index 100% rename from showcase/assets/images/logo/logo-white.svg rename to showcase/src/assets/images/logo/logo-white.svg diff --git a/showcase/assets/images/logo/nbb-logo-en.png b/showcase/src/assets/images/logo/nbb-logo-en.png similarity index 100% rename from showcase/assets/images/logo/nbb-logo-en.png rename to showcase/src/assets/images/logo/nbb-logo-en.png diff --git a/showcase/assets/images/no-user-image.gif b/showcase/src/assets/images/no-user-image.gif similarity index 100% rename from showcase/assets/images/no-user-image.gif rename to showcase/src/assets/images/no-user-image.gif diff --git a/showcase/assets/images/touch/apple-touch-icon.png b/showcase/src/assets/images/touch/apple-touch-icon.png similarity index 100% rename from showcase/assets/images/touch/apple-touch-icon.png rename to showcase/src/assets/images/touch/apple-touch-icon.png diff --git a/showcase/assets/images/touch/chrome-touch-icon-192x192.png b/showcase/src/assets/images/touch/chrome-touch-icon-192x192.png similarity index 100% rename from showcase/assets/images/touch/chrome-touch-icon-192x192.png rename to showcase/src/assets/images/touch/chrome-touch-icon-192x192.png diff --git a/showcase/assets/images/touch/icon-128x128.png b/showcase/src/assets/images/touch/icon-128x128.png similarity index 100% rename from showcase/assets/images/touch/icon-128x128.png rename to showcase/src/assets/images/touch/icon-128x128.png diff --git a/showcase/assets/images/touch/ms-touch-icon-144x144-precomposed.png b/showcase/src/assets/images/touch/ms-touch-icon-144x144-precomposed.png similarity index 100% rename from showcase/assets/images/touch/ms-touch-icon-144x144-precomposed.png rename to showcase/src/assets/images/touch/ms-touch-icon-144x144-precomposed.png diff --git a/showcase/assets/images/watermark-sm.gif b/showcase/src/assets/images/watermark-sm.gif similarity index 100% rename from showcase/assets/images/watermark-sm.gif rename to showcase/src/assets/images/watermark-sm.gif diff --git a/showcase/src/assets/img/tipe.png b/showcase/src/assets/img/tipe.png deleted file mode 100644 index 4939f07061..0000000000 Binary files a/showcase/src/assets/img/tipe.png and /dev/null differ diff --git a/showcase/src/assets/manifest.json b/showcase/src/assets/manifest.json index 71d4fd9f82..3d10925d61 100644 --- a/showcase/src/assets/manifest.json +++ b/showcase/src/assets/manifest.json @@ -2,32 +2,32 @@ "name": "App", "icons": [ { - "src": "/assets/icon/android-icon-36x36.png", + "src": "/assets/images/app-icons/android-icon-36x36.png", "sizes": "36x36", "type": "image/png" }, { - "src": "/assets/icon/android-icon-48x48.png", + "src": "/assets/images/app-icons/android-icon-48x48.png", "sizes": "48x48", "type": "image/png" }, { - "src": "/assets/icon/android-icon-72x72.png", + "src": "/assets/images/app-icons/android-icon-72x72.png", "sizes": "72x72", "type": "image/png" }, { - "src": "/assets/icon/android-icon-96x96.png", + "src": "/assets/images/app-icons/android-icon-96x96.png", "sizes": "96x96", "type": "image/png" }, { - "src": "/assets/icon/android-icon-144x144.png", + "src": "/assets/images/app-icons/android-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src": "/assets/icon/android-icon-192x192.png", + "src": "/assets/images/app-icons/android-icon-192x192.png", "sizes": "192x192", "type": "image/png" } diff --git a/showcase/assets/translations/en.json b/showcase/src/assets/translations/en.json similarity index 50% rename from showcase/assets/translations/en.json rename to showcase/src/assets/translations/en.json index 8f99a08bd4..759ad9063c 100644 --- a/showcase/assets/translations/en.json +++ b/showcase/src/assets/translations/en.json @@ -1,7 +1,7 @@ { "SHOWCASE": { "HOME": { - "TITLE": "Stark Showcase" + "TITLE": "Stark Showcase application" } } } diff --git a/showcase/assets/translations/fr.json b/showcase/src/assets/translations/fr.json similarity index 100% rename from showcase/assets/translations/fr.json rename to showcase/src/assets/translations/fr.json diff --git a/showcase/src/assets/translations/nl.json b/showcase/src/assets/translations/nl.json new file mode 100644 index 0000000000..0f67511ed7 --- /dev/null +++ b/showcase/src/assets/translations/nl.json @@ -0,0 +1,7 @@ +{ + "SHOWCASE": { + "HOME": { + "TITLE": "Stark demonstratie toepassing" + } + } +} diff --git a/showcase/src/index.html b/showcase/src/index.html index e83f5afd36..93df1909ef 100644 --- a/showcase/src/index.html +++ b/showcase/src/index.html @@ -27,31 +27,28 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + <%= htmlWebpackPlugin.options.starkAppMetadata.name %> - <% if (htmlWebpackPlugin.options.metadata.IS_DEV_SERVER && htmlWebpackPlugin.options.metadata.HMR !== true) { %> @@ -73,8 +70,6 @@ - - diff --git a/starter/package.json b/starter/package.json index 678a0711c3..2c08448f60 100644 --- a/starter/package.json +++ b/starter/package.json @@ -124,8 +124,8 @@ "@angular/platform-browser-dynamic": "6.0.2", "@angular/platform-server": "6.0.2", "@angular/router": "6.0.2", - "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-e40780b.tgz", - "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-e40780b.tgz", + "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-18ddc7a.tgz", + "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-18ddc7a.tgz", "@uirouter/visualizer": "6.0.0", "core-js": "2.5.7", "eligrey-classlist-js-polyfill": "1.2.20180112", @@ -140,8 +140,8 @@ "zone.js": "0.8.26" }, "devDependencies": { - "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-e40780b.tgz", - "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-e40780b.tgz", + "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-18ddc7a.tgz", + "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-18ddc7a.tgz", "@types/core-js": "2.5.0", "@types/hammerjs": "2.0.35", "@types/node": "8.10.15",