From 05c9e399a778fcf1009dd81410f4213f7665dd6c Mon Sep 17 00:00:00 2001 From: Konrad Koch Date: Mon, 21 May 2018 08:44:08 +0200 Subject: [PATCH 1/5] The file is unused The file is replaced with the propper app.config.ts file in the same folder --- hooks/src/app/appconfig.ts | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 hooks/src/app/appconfig.ts diff --git a/hooks/src/app/appconfig.ts b/hooks/src/app/appconfig.ts deleted file mode 100644 index b445260..0000000 --- a/hooks/src/app/appconfig.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { CONF_LOCAL } from '../environments/environment.local'; -import { CONF_DEV } from '../environments/environment.dev'; -import { CONF_PROD } from '../environments/environment.prod'; - -const ENV = 'PROFILE'; - -const LOCAL: String = 'local'; -const DEV: String = 'dev'; -const PROD: String = 'prod'; - -let conf: any; - -console.log('Env', ENV); - -if (ENV === PROD) { - conf = CONF_PROD; -} else if (ENV === DEV) { - conf = CONF_DEV; -} else { - conf = CONF_LOCAL; -} - -export const AppConfig = Object.assign({}, conf); From 35354b1025d98fd14d0566d3aa3112bb9c36fc91 Mon Sep 17 00:00:00 2001 From: Konrad Koch Date: Mon, 21 May 2018 08:46:41 +0200 Subject: [PATCH 2/5] Translation issue Removed french description and translated them to english --- hooks/environments/set_profile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/environments/set_profile.js b/hooks/environments/set_profile.js index 58d6987..ff858df 100644 --- a/hooks/environments/set_profile.js +++ b/hooks/environments/set_profile.js @@ -6,10 +6,10 @@ var path = require('path'); // use: var profile = process.env.ENV ? process.env.ENV : 'local'; -console.log('Déplacement du template de fichier de détection de configuration ...'); +console.log('Moving the configuration detection file template ...'); fs.copySync(path.resolve(__dirname,'./app.config.ts.tpl'), path.resolve(__dirname,'../../src/app/app.config.ts')); -console.log('Application du profil : ' + profile); +console.log('Application profile: ' + profile); replace({ regex: "'PROFILE'", From 06d6b0f8c5de703a9c7f5dcfc880a9673aa6eec8 Mon Sep 17 00:00:00 2001 From: Maxime GRIS Date: Fri, 25 May 2018 10:38:53 +0200 Subject: [PATCH 3/5] version 3.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b5f7b0..e166518 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-electron", - "version": "3.3.0", + "version": "3.4.0", "description": "Angular 5 with Electron (Typescript + SASS + Hot Reload)", "homepage": "https://github.com/maximegris/angular-electron", "author": { From 6dc97a1ea857b48a7a111768f58498c91a3572b5 Mon Sep 17 00:00:00 2001 From: Maxime GRIS Date: Fri, 25 May 2018 10:40:15 +0200 Subject: [PATCH 4/5] ref/ remove contributors --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 68650f4..ae274a2 100644 --- a/README.md +++ b/README.md @@ -85,12 +85,6 @@ You can desactivate "Developer Tools" by commenting `win.webContents.openDevTool Maybe you want to execute the application in the browser (WITHOUT HOT RELOAD ACTUALLY...) ? You can do it with `npm run ng:serve`. Note that you can't use Electron or NodeJS native libraries in this case. Please check `providers/electron.service.ts` to watch how conditional import of electron/Native libraries is done. -## Contributors - -[Maxime GRIS](https://github.com/maximegris) | -:---: -|[Maxime GRIS](https://github.com/maximegris)| - [build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master [build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master [dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge From 7d5eeb34f70648af92948076239c0ec03ca7878d Mon Sep 17 00:00:00 2001 From: Maxime GRIS Date: Fri, 25 May 2018 10:46:21 +0200 Subject: [PATCH 5/5] misc/ update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b9085..a305169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ ### Changelog All notable changes to this project will be documented in this file. +#### [Unreleased](https://github.com/maximegris/angular-electron/compare/3.3.0...3.4.0) +- Resolved Translation issue [`#186`](https://github.com/maximegris/angular-electron/pull/186) +- Removed unused file [`#185`](https://github.com/maximegris/angular-electron/pull/185) +- ref/ remove contributors [`6dc97a1`](https://github.com/maximegris/angular-electron/commit/6dc97a1ea857b48a7a111768f58498c91a3572b5) +- Translation issue [`35354b1`](https://github.com/maximegris/angular-electron/commit/35354b1025d98fd14d0566d3aa3112bb9c36fc91) +- version 3.4.0 [`06d6b0f`](https://github.com/maximegris/angular-electron/commit/06d6b0f8c5de703a9c7f5dcfc880a9673aa6eec8) + #### [3.3.0](https://github.com/maximegris/angular-electron/compare/3.2.0...3.3.0) - add Changelog file [`71083f1`](https://github.com/maximegris/angular-electron/commit/71083f12bf1e20225769af20a8a054ab8af4a6f9) - version 3.3.0 [`a88bda6`](https://github.com/maximegris/angular-electron/commit/a88bda66d83690b1064bcb11a0cb1bb893894caf)