Migrated the tool chain to angular-cli and updated all dependencies to their latest versions.

.angular-cli.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "convertorizr"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.scss"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "scss",
+    "component": {}
+  }
+}

.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.gitignore

@@ -1,10 +1,43 @@
-*~
+# See http://help.github.com/ignore-files/ for more about ignoring files.
-.idea/
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
 *.iml
-atlassian-ide-plugin.xml
+
-node_modules/
+# IDE - VSCode
-typings/
+.vscode/*
-src/**/*.js
+!.vscode/settings.json
-src/**/*.js.map
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
 npm-debug.log
-dist/
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

.gitlab-ci.yml

@@ -7,9 +7,9 @@ stages:
 build_job:
   stage: build
   script:
-    - npm install
+    - yarn install
-    - npm run build-dev
+    - yarn run build
-    - npm run test
+    - yarn run test
   tags:
     - javascript
   except:
@@ -23,9 +23,9 @@ build_job:
 build_job_production:
   stage: build
   script:
-    - npm install
+    - yarn install
-    - npm run build
+    - yarn run build-prod
-    - npm run test
+    - yarn run test
   tags:
     - javascript
   only:

README.md

@@ -1,9 +1,28 @@
-# conv.friedli.info - Convert whatever you want!
+# Convertorizr
 
-This is a short introduction to the awesome converter hosted at [https://conv.friedli.info/].
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.
 
-Deployment is automated with Gitlab CI. Usage is self-explanatory. What else do you need to know?
+## Development server
 
-Contact the author at manuel-conv.friedli.info|at|fritteli.ch.
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
-Cheers!
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

config/helpers.js

@@ -1,7 +0,0 @@
-var path = require('path');
-var _root = path.resolve(__dirname, '..');
-function root(args) {
-    args = Array.prototype.slice.call(arguments, 0);
-    return path.join.apply(path, [_root].concat(args));
-}
-exports.root = root;

config/karma-test-shim.js

@@ -1,21 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es6');
-require('core-js/es7/reflect');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch');
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-var appContext = require.context('../src', true, /\.spec\.ts/);
-
-appContext.keys().forEach(appContext);
-
-var testing = require('@angular/core/testing');
-var browser = require('@angular/platform-browser-dynamic/testing');
-
-testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());

config/karma.conf.js

@@ -1,44 +0,0 @@
-var webpackConfig = require('./webpack.test');
-
-module.exports = function (config) {
-    var _config = {
-        basePath: '',
-
-        frameworks: ['jasmine'],
-
-        files: [
-            {
-                pattern: './config/karma-test-shim.js',
-                watched: false
-            }
-        ],
-
-        preprocessors: {
-            './config/karma-test-shim.js': ['webpack', 'sourcemap']
-        },
-
-        webpack: webpackConfig,
-
-        webpackMiddleware: {
-            stats: 'errors-only'
-        },
-
-        webpackServer: {
-            noInfo: true
-        },
-
-        reporters: ['kjhtml'],
-        port: 9876,
-        colors: true,
-        logLevel: config.LOG_INFO,
-        autoWatch: false,
-        browsers: ['PhantomJS'],
-        singleRun: true,
-        phantomjsLauncher: {
-            // Have phantomjs exit if a ResourceError is encountered (useful if karma exits without killing phantom) 
-            exitOnResourceError: true
-        }
-    };
-
-    config.set(_config);
-};

config/webpack.common.js

@@ -1,76 +0,0 @@
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var helpers = require('./helpers');
-
-module.exports = {
-    entry: {
-        'polyfills': './src/polyfills.ts',
-        'vendor': './src/vendor.ts',
-        'app': './src/main.ts'
-    },
-
-    resolve: {
-        extensions: ['.ts', '.js']
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                loaders: [
-                    {
-                        loader: 'awesome-typescript-loader',
-                        options: {
-                            configFileName: helpers.root('src', 'tsconfig.json')
-                        }
-                    },
-                    'angular2-template-loader'
-                ]
-            },
-            {
-                test: /\.html$/,
-                use: 'html-loader'
-            },
-            {
-                test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-                use: 'file-loader?name=assets/[name].[hash].[ext]'
-            },
-            {
-                test: /\.css$/,
-                exclude: helpers.root('src', 'app'),
-                use: ExtractTextPlugin.extract({
-                    fallback: 'style-loader',
-                    use: 'css-loader?sourceMap'
-                })
-            },
-            {
-                test: /\.css$/,
-                include: helpers.root('src', 'app'),
-                use: 'raw-loader'
-            }
-        ]
-    },
-
-    plugins: [
-        // Workaround for angular/angular#11580
-        new webpack.ContextReplacementPlugin(
-            // The (\\|\/) piece accounts for path separators in *nix and Windows
-            /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
-            helpers.root('./src'), // location of your src
-            {} // a map of your routes
-        ),
-
-        new webpack.optimize.CommonsChunkPlugin({
-            name: ['app', 'vendor', 'polyfills']
-        }),
-
-        new HtmlWebpackPlugin({
-            template: 'src/index.html'
-        }),
-
-        new webpack.optimize.UglifyJsPlugin({
-            comments: false
-        })
-    ]
-};

config/webpack.dev.js

@@ -1,24 +0,0 @@
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
-
-module.exports = webpackMerge(commonConfig, {
-    devtool: 'cheap-module-eval-source-map',
-
-    output: {
-        path: helpers.root('dist'),
-        publicPath: 'http://localhost:8080/',
-        filename: '[name].js',
-        chunkFilename: '[id].chunk.js'
-    },
-
-    plugins: [
-        new ExtractTextPlugin('[name].css')
-    ],
-
-    devServer: {
-        historyApiFallback: true,
-        stats: 'minimal'
-    }
-});

config/webpack.prod.js

@@ -1,39 +0,0 @@
-var webpack = require('webpack');
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
-
-module.exports = function (env) {
-    console.log("env:", env);
-    return webpackMerge(commonConfig, {
-        devtool: 'source-map',
-
-        output: {
-            path: helpers.root('dist'),
-            publicPath: '',
-            filename: '[name].[hash].js',
-            chunkFilename: '[id].[hash].chunk.js'
-        },
-
-        plugins: [
-            new webpack.NoEmitOnErrorsPlugin(),
-            new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
-                mangle: {
-                    keep_fnames: true
-                }
-            }),
-            new ExtractTextPlugin('[name].[hash].css'),
-            new webpack.DefinePlugin({
-                'process.env': {
-                    'NODE_ENV': JSON.stringify(env.NODE_ENV)
-                }
-            }),
-            new webpack.LoaderOptionsPlugin({
-                htmlLoader: {
-                    minimize: false // workaround for ng2
-                }
-            })
-        ]
-    });
-};

config/webpack.test.js

@@ -1,52 +0,0 @@
-var webpack = require('webpack');
-var helpers = require('./helpers');
-
-module.exports = {
-    devtool: 'inline-source-map',
-
-    resolve: {
-        extensions: ['.ts', '.js']
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                loaders: [
-                    {
-                        loader: 'awesome-typescript-loader',
-                        options: {configFileName: helpers.root('src', 'tsconfig.json')}
-                    }, 'angular2-template-loader'
-                ]
-            },
-            {
-                test: /\.html$/,
-                loader: 'html-loader'
-
-            },
-            {
-                test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-                loader: 'null-loader'
-            },
-            {
-                test: /\.css$/,
-                exclude: helpers.root('src', 'app'),
-                loader: 'null-loader'
-            },
-            {
-                test: /\.css$/,
-                include: helpers.root('src', 'app'),
-                loader: 'raw-loader'
-            }
-        ]
-    },
-
-    plugins: [
-        new webpack.ContextReplacementPlugin(
-            // The (\\|\/) piece accounts for path separators in *nix and Windows
-            /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
-            helpers.root('./src'), // location of your src
-            {} // a map of your routes
-        )
-    ]
-};

e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { ConvertorizrPage } from './app.po';
+
+describe('convertorizr App', () => {
+  let page: ConvertorizrPage;
+
+  beforeEach(() => {
+    page = new ConvertorizrPage();
+  });
+
+  it('should display message saying app works', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('app works!');
+  });
+});

e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, element, by } from 'protractor';
+
+export class ConvertorizrPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

e2e/tsconfig.e2e.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types":[
+      "jasmine",
+      "node"
+    ]
+  }
+}

karma.conf.js

@@ -1 +1,44 @@
-module.exports = require('./config/karma.conf.js');
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular/cli'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular/cli/plugins/karma')
+    ],
+    client:{
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    files: [
+      { pattern: './src/test.ts', watched: false }
+    ],
+    preprocessors: {
+      './src/test.ts': ['@angular/cli']
+    },
+    mime: {
+      'text/x-typescript': ['ts','tsx']
+    },
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
+    },
+    angularCli: {
+      environment: 'dev'
+    },
+    reporters: config.angularCli && config.angularCli.codeCoverage
+              ? ['progress', 'coverage-istanbul']
+              : ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false
+  });
+};

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "conv.friedli.info",
+  "name": "convertorizr",
   "version": "1.0.1-dev",
-  "description": "Decode or encode base64, punycode, HTML entities, URI components ...",
+  "description": "Decode or encode base64, punycode, HTML entities, URI components, ...",
   "keywords": [
     "encode",
     "decode",
@@ -19,54 +19,48 @@
     "type": "git",
     "url": "https://gittr.ch/manuel/dencode.org.git"
   },
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "build-prod": "ng build --env=prod",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
   "dependencies": {
-    "@angular/common": "^2.4.0",
+    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^2.4.0",
+    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^2.4.0",
+    "@angular/core": "^4.0.0",
-    "@angular/forms": "^2.4.0",
+    "@angular/forms": "^4.0.0",
-    "@angular/platform-browser": "^2.4.0",
+    "@angular/http": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^2.4.0",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
     "core-js": "^2.4.1",
-    "rxjs": "^5.0.1",
+    "rxjs": "^5.1.0",
-    "zone.js": "^0.7.4",
+    "zone.js": "^0.8.4",
-    "bootstrap": "^3.3.0",
     "quoted-printable": "^1.0.0",
     "utf8": "^2.1.0",
     "punycode": "^1.4.0"
   },
   "devDependencies": {
-    "@types/jasmine": "2.5.36",
+    "@angular/cli": "^1.0.0",
-    "@types/node": "^6.0.45",
+    "@angular/compiler-cli": "^4.0.0",
-    "angular2-template-loader": "^0.6.0",
+    "@types/jasmine": "^2.5.38",
-    "awesome-typescript-loader": "^3.0.4",
+    "@types/node": "^7.0.0",
-    "css-loader": "^0.26.1",
+    "codelyzer": "^2.0.0",
-    "extract-text-webpack-plugin": "^2.0.0",
+    "jasmine-core": "^2.5.2",
-    "file-loader": "^0.9.0",
+    "jasmine-spec-reporter": "^3.2.0",
-    "html-loader": "^0.4.3",
+    "karma": "^1.4.1",
-    "html-webpack-plugin": "^2.16.1",
-    "jasmine-core": "^2.4.1",
-    "karma": "^1.2.0",
     "karma-chrome-launcher": "^2.0.0",
-    "karma-firefox-launcher": "^1.0.1",
+    "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.0.2",
+    "karma-coverage-istanbul-reporter": "^1.0.0",
+    "karma-jasmine": "^1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-phantomjs-launcher": "^1.0.4",
+    "protractor": "^5.1.0",
-    "karma-sourcemap-loader": "^0.3.7",
+    "ts-node": "^3.0.0",
-    "karma-webpack": "^2.0.1",
+    "tslint": "^5.0.0",
-    "null-loader": "^0.1.1",
+    "typescript": "^2.2.0"
-    "phantomjs-prebuilt": "^2.1.14",
-    "raw-loader": "^0.5.1",
-    "rimraf": "^2.5.2",
-    "style-loader": "^0.13.1",
-    "typescript": "^2.0.10",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.4.1",
-    "webpack-merge": "^3.0.0"
-  },
-  "scripts": {
-    "start": "webpack-dev-server --inline --progress --port 8080",
-    "test": "karma start",
-    "build-dev": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail --env.NODE_ENV=development",
-    "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail --env.NODE_ENV=production"
   }
 }

protractor.conf.js

@@ -0,0 +1,30 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './e2e/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  beforeLaunch: function() {
+    require('ts-node').register({
+      project: 'e2e/tsconfig.e2e.json'
+    });
+  },
+  onPrepare() {
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};

src/app/app.component.css

@@ -1,118 +0,0 @@
-.inputwrapper {
-    font-family: "ABeeZee", sans-serif;
-    margin: 0 1em 1em 1em;
-}
-
-.textwrapper {
-    margin: 0 0 1em 0;
-    padding: 0 1em 0 0;
-}
-
-.arrow_box {
-    position: relative;
-    background: #fff;
-    border: 1px solid #aaa;
-}
-
-.arrow_box:focus {
-    border-color: #888;
-}
-
-.arrow_box:hover {
-    border-color: #333;
-}
-
-.arrow_box:after, .arrow_box:before {
-    top: 100%;
-    left: 50%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.arrow_box:after {
-    border-color: rgba(255, 255, 255, 0);
-    border-top-color: #fff;
-    border-width: 1em;
-    margin-left: -1em;
-}
-
-.arrow_box:before {
-    border-color: rgba(170, 170, 170, 0);
-    border-top-color: #aaa;
-    border-width: calc(1em + 1px);
-    margin-left: calc(-1em - 1px);
-}
-
-.arrow_box:focus:before {
-    border-color: rgba(136, 136, 136, 0);
-    border-top-color: #888;
-}
-
-.arrow_box:hover:before {
-    border-color: rgba(51, 51, 51, 0);
-    border-top-color: #333;
-}
-
-.selectwrapper > .arrow_box {
-    display: inline-block;
-}
-
-.textinput {
-    background-color: #fff;
-    border: none;
-    color: #000;
-    font-family: "Free Monospaced", monospace;
-    height: 10em;
-    margin: 0;
-    padding: 0.5em;
-    resize: vertical;
-    width: 100%;
-}
-
-.textinput:focus {
-    border-color: #888;
-}
-
-.textinput:hover {
-    border-color: #333;
-}
-
-.selectwrapper {
-    margin: 0 0 1em 0;
-    padding: 0;
-    text-align: center;
-}
-
-.select {
-    background-color: #fff;
-    border: none;
-    color: #000;
-    font-family: "ABeeZee", sans-serif;
-    margin: 0;
-    padding: 0.5em;
-}
-
-.option {
-    /*    font-family: "ABeeZee", sans-serif;*/
-}
-
-.selectwrapper.error > .arrow_box {
-    border-color: red;
-}
-
-.selectwrapper.error > .arrow_box:before {
-    border-top-color: red;
-}
-
-.selectwrapper.error select {
-    color: red;
-}
-
-.errormessage {
-    color: red;
-    text-align: center;
-}

src/app/app.component.scss

@@ -0,0 +1,118 @@
+.inputwrapper {
+  font-family: "ABeeZee", sans-serif;
+  margin: 0 1em 1em 1em;
+}
+
+.textwrapper {
+  margin: 0 0 1em 0;
+  padding: 0 1em 0 0;
+}
+
+.arrow_box {
+  position: relative;
+  background: #fff;
+  border: 1px solid #aaa;
+}
+
+.arrow_box:focus {
+  border-color: #888;
+}
+
+.arrow_box:hover {
+  border-color: #333;
+}
+
+.arrow_box:after, .arrow_box:before {
+  top: 100%;
+  left: 50%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+
+.arrow_box:after {
+  border-color: rgba(255, 255, 255, 0);
+  border-top-color: #fff;
+  border-width: 1em;
+  margin-left: -1em;
+}
+
+.arrow_box:before {
+  border-color: rgba(170, 170, 170, 0);
+  border-top-color: #aaa;
+  border-width: calc(1em + 1px);
+  margin-left: calc(-1em - 1px);
+}
+
+.arrow_box:focus:before {
+  border-color: rgba(136, 136, 136, 0);
+  border-top-color: #888;
+}
+
+.arrow_box:hover:before {
+  border-color: rgba(51, 51, 51, 0);
+  border-top-color: #333;
+}
+
+.selectwrapper > .arrow_box {
+  display: inline-block;
+}
+
+.textinput {
+  background-color: #fff;
+  border: none;
+  color: #000;
+  font-family: "Free Monospaced", monospace;
+  height: 10em;
+  margin: 0;
+  padding: 0.5em;
+  resize: vertical;
+  width: 100%;
+}
+
+.textinput:focus {
+  border-color: #888;
+}
+
+.textinput:hover {
+  border-color: #333;
+}
+
+.selectwrapper {
+  margin: 0 0 1em 0;
+  padding: 0;
+  text-align: center;
+}
+
+.select {
+  background-color: #fff;
+  border: none;
+  color: #000;
+  font-family: "ABeeZee", sans-serif;
+  margin: 0;
+  padding: 0.5em;
+}
+
+.option {
+  /*    font-family: "ABeeZee", sans-serif;*/
+}
+
+.selectwrapper.error > .arrow_box {
+  border-color: red;
+}
+
+.selectwrapper.error > .arrow_box:before {
+  border-top-color: red;
+}
+
+.selectwrapper.error select {
+  color: red;
+}
+
+.errormessage {
+  color: red;
+  text-align: center;
+}

src/app/app.component.spec.ts

@@ -1,16 +1,32 @@
-import {TestBed} from "@angular/core/testing";
+import {async, TestBed} from "@angular/core/testing";
-import {AppComponent} from "./app.component";
-import {FormsModule} from "@angular/forms";
 
-describe('App', () => {
+import {AppComponent} from "./app.component";
-    beforeEach(() => {
+
+describe('AppComponent', () => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
-            declarations: [AppComponent],
+      declarations: [
-            imports: [FormsModule]
+        AppComponent
-        });
+      ],
-    });
+    }).compileComponents();
-    it('should work', () => {
+  }));
-        let fixture = TestBed.createComponent(AppComponent);
+
-        expect(fixture.componentInstance instanceof AppComponent).toBe(true, 'should create AppComponent');
+  it('should create the app', async(() => {
-    });
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+
+  // it(`should have as title 'app works!'`, async(() => {
+  //   const fixture = TestBed.createComponent(AppComponent);
+  //   const app = fixture.debugElement.componentInstance;
+  //   expect(app.title).toEqual('app works!');
+  // }));
+
+  // it('should render title in a h1 tag', async(() => {
+  //   const fixture = TestBed.createComponent(AppComponent);
+  //   fixture.detectChanges();
+  //   const compiled = fixture.debugElement.nativeElement;
+  //   expect(compiled.querySelector('h1').textContent).toContain('app works!');
+  // }));
 });

src/app/app.component.ts

@@ -1,23 +1,21 @@
 import {Component, OnInit} from "@angular/core";
-import {ConverterRegistryService} from "./converterregistry.service";
-import {InputComponentManagerService} from "./inputcomponentmanager.service";
-import {Converter} from "./converter/converter";
 import {NativeLibraryWrapperService} from "./nativelibrarywrapper.service";
+import {InputComponentManagerService} from "./inputcomponentmanager.service";
+import {ConverterRegistryService} from "./converterregistry.service";
 import {Step} from "./step";
-import "../assets/css/style.css";
+import {Converter} from "./converter/converter";
 
 @Component({
-    selector: "den-app",
+  selector: 'app-root',
-    templateUrl: "./app.component.html",
+  templateUrl: './app.component.html',
-    styleUrls: ["./app.component.css"],
+  styleUrls: ['./app.component.scss'],
   providers: [ConverterRegistryService, InputComponentManagerService, NativeLibraryWrapperService]
 })
-export class AppComponent extends OnInit {
+export class AppComponent implements OnInit {
   public steps: Step[] = [];
   public converters: Converter[] = [];
 
   constructor(private converterRegistryService: ConverterRegistryService, private inputComponentManagerService: InputComponentManagerService) {
-        super();
   }
 
   convert(step: Step, $event: any): void {

src/app/app.module.ts

@@ -1,16 +1,18 @@
-import {NgModule} from "@angular/core";
 import {BrowserModule} from "@angular/platform-browser";
+import {NgModule} from "@angular/core";
 import {FormsModule} from "@angular/forms";
+
 import {AppComponent} from "./app.component";
 
 @NgModule({
+  declarations: [
+    AppComponent
+  ],
   imports: [
     BrowserModule,
     FormsModule
   ],
-    declarations: [
+  providers: [],
-        AppComponent
-    ],
   bootstrap: [AppComponent]
 })
 export class AppModule {

src/app/nativelibrarywrapper.service.ts

@@ -2,6 +2,9 @@ import {Injectable} from "@angular/core";
 import {Punycode} from "./punycode";
 import {Utf8} from "./utf8";
 import {QuotedPrintable} from "./quotedprintable";
+import * as QuotedPrintableNative from "quoted-printable";
+import * as Utf8Native from "utf8";
+import * as PunycodeNative from "punycode";
 
 @Injectable()
 export class NativeLibraryWrapperService {
@@ -10,8 +13,8 @@ export class NativeLibraryWrapperService {
   public punycode: Punycode;
 
   constructor() {
-        this.utf8 = require("utf8");
+    this.utf8 = Utf8Native;
-        this.quotedPrintable = require("quoted-printable");
+    this.quotedPrintable = QuotedPrintableNative;
-        this.punycode = require("punycode");
+    this.punycode = PunycodeNative;
   }
 }

src/assets/css/style.css

@@ -1,37 +0,0 @@
-@font-face {
-    font-family: "ABeeZee";
-    font-stretch: normal;
-    font-style: normal;
-    font-variant: normal;
-    font-weight: normal;
-    src: local("ABeeZee Regular"),
-    local("ABeeZee-Regular"),
-    local("ABeeZee"),
-    url("../fonts/abeezee-regular.woff") format("woff");
-}
-
-@font-face {
-    font-family: "Free Monospaced";
-    src: url("../fonts/freemono.eot?") format("eot"),
-    url("../fonts/freemono.woff") format("woff"),
-    url("../fonts/freemono.ttf") format("truetype"),
-    url("../fonts/freemono.svg#FreeMono") format("svg");
-    font-weight: normal;
-    font-style: normal;
-}
-
-body {
-    background-color: white;
-    color: black;
-    font-family: "ABeeZee", sans-serif;
-    margin: 0;
-    padding: 1em 0 0 0;
-}
-
-h1 {
-    text-align: center;
-}
-
-.apploader {
-    text-align: center;
-}

src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

src/environments/environment.ts

@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false
+};

src/index.html

@@ -1,9 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 <head>
-    <meta charset="UTF-8"/>
+  <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/>
+  <title>Convertorizr</title>
-    <title>conv.friedli.info - Convert whatever you want!</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
 <h1>Convert it all</h1>
@@ -11,8 +14,8 @@
   it requires you to <strong>enable Javascript</strong> to do so. So please turn it on in your
   Browser. You won't regret it!
 </noscript>
-<den-app>
+<app-root>
   <div class="apploader">Please hold on, we're starting the turbines ...</div>
-</den-app>
+</app-root>
 </body>
 </html>

src/main.ts

@@ -1,8 +1,10 @@
-import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
+import { enableProdMode } from '@angular/core';
-import {AppModule} from "./app/app.module";
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import {enableProdMode} from "@angular/core";
 
-if (process.env.NODE_ENV === "production") {
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
   enableProdMode();
 }
 

src/polyfills.ts

@@ -1,11 +1,68 @@
-import "core-js/es6";
+/**
-import "core-js/es7/reflect";
+ * This file includes polyfills needed by Angular and is loaded before the app.
-require("zone.js/dist/zone");
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
 
-if (process.env.ENV === 'production') {
+/***************************************************************************************************
-    // Production
+ * BROWSER POLYFILLS
-} else {
+ */
-    // Development and test
+
-    Error['stackTraceLimit'] = Infinity;
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-    require('zone.js/dist/long-stack-trace-zone');
+// import 'core-js/es6/symbol';
-}
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following to support `@angular/animation`. */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+/** Evergreen browsers require these. **/
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
+
+/** ALL Firefox browsers require the following to support `@angular/animation`. **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.

src/styles.scss

@@ -0,0 +1,38 @@
+/* You can add global styles to this file, and also import other style files */
+@font-face {
+  font-family: "ABeeZee";
+  font-stretch: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-weight: normal;
+  src: local("ABeeZee Regular"),
+  local("ABeeZee-Regular"),
+  local("ABeeZee"),
+  url("assets/fonts/abeezee-regular.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Free Monospaced";
+  src: url("assets/fonts/freemono.eot?") format("eot"),
+  url("assets/fonts/freemono.woff") format("woff"),
+  url("assets/fonts/freemono.ttf") format("truetype"),
+  url("assets/fonts/freemono.svg#FreeMono") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+body {
+  background-color: white;
+  color: black;
+  font-family: "ABeeZee", sans-serif;
+  margin: 0;
+  padding: 1em 0 0 0;
+}
+
+h1 {
+  text-align: center;
+}
+
+.apploader {
+  text-align: center;
+}

src/test.ts

@@ -0,0 +1,32 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare var __karma__: any;
+declare var require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function () {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();

src/tsconfig.app.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}

src/tsconfig.spec.json

@@ -0,0 +1,20 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es5",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

src/typings.d.ts

@@ -0,0 +1,5 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}

src/vendor.ts

@@ -1,5 +0,0 @@
-import "@angular/core";
-import "@angular/platform-browser";
-import "@angular/platform-browser-dynamic";
-import "@angular/forms";
-import "rxjs";

tsconfig.json

@@ -1,20 +1,20 @@
 {
+  "compileOnSave": false,
   "compilerOptions": {
-    "alwaysStrict": true,
+    "outDir": "./dist/out-tsc",
-    "target": "es5",
+    "baseUrl": "src",
-    "module": "commonjs",
-    "moduleResolution": "node",
     "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": [
+    "target": "es5",
-      "es2015",
-      "dom"
-    ],
-    "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
     "typeRoots": [
-      "../node_modules/@types/"
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2016",
+      "dom"
     ]
   }
 }

tslint.json

@@ -0,0 +1,116 @@
+{
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
+  "rules": {
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "eofline": true,
+    "forin": true,
+    "import-blacklist": [true, "rxjs"],
+    "import-spacing": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      "static-before-instance",
+      "variables-before-functions"
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [true, "ignore-params"],
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "typeof-compare": true,
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+
+    "directive-selector": [true, "attribute", "app", "camelCase"],
+    "component-selector": [true, "element", "app", "kebab-case"],
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "no-access-missing-member": true,
+    "templates-use-public": true,
+    "invoke-injectable": true
+  }
+}

webpack.config.js

@@ -1 +0,0 @@
-module.exports = require('./config/webpack.dev.js');