diff --git a/.angular-cli.json b/.angular-cli.json deleted file mode 100644 index c59b04a..0000000 --- a/.angular-cli.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "angular-seed-project" - }, - "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": "seed", - "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": {} - } -} diff --git a/.vscode/settings.json b/.vscode/settings.json index df23a45..745fc53 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,6 +11,9 @@ "nativescript/src/app/**/*.ts": { "when": "$(basename).tns.ts" }, + "nativescript/src/app/**/*.sass": { + "when": "$(basename).tns.sass" + }, "nativescript/src/app/**/*.spec.ts": true }, "files.watcherExclude": { diff --git a/angular.json b/angular.json new file mode 100644 index 0000000..db9b9d3 --- /dev/null +++ b/angular.json @@ -0,0 +1,128 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "angular-seed-project": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist", + "index": "src/index.html", + "main": "src/main.ts", + "tsConfig": "src/tsconfig.app.json", + "polyfills": "src/polyfills.ts", + "assets": [ + "src/assets", + "src/favicon.ico" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + }, + "configurations": { + "production": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "angular-seed-project:build" + }, + "configurations": { + "production": { + "browserTarget": "angular-seed-project:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "angular-seed-project:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "karmaConfig": "./karma.conf.js", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "scripts": [], + "styles": [ + "src/styles.scss" + ], + "assets": [ + "src/assets", + "src/favicon.ico" + ] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [] + } + } + } + }, + "angular-seed-project-e2e": { + "root": "", + "sourceRoot": "e2e", + "projectType": "application", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "./protractor.conf.js", + "devServerTarget": "angular-seed-project:serve" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "e2e/tsconfig.e2e.json" + ], + "exclude": [] + } + } + } + } + }, + "defaultProject": "angular-seed-project", + "schematics": { + "@schematics/angular:component": { + "prefix": "seed", + "styleext": "scss" + }, + "@schematics/angular:directive": { + "prefix": "seed" + } + } +} \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 84b4cd5..c3b7640 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,33 +4,31 @@ module.exports = function (config) { config.set({ basePath: '', - frameworks: ['jasmine', '@angular/cli'], + frameworks: ['jasmine', '@angular-devkit/build-angular'], plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage-istanbul-reporter'), - require('@angular/cli/plugins/karma') + require('@angular-devkit/build-angular/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' ], + dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], fixWebpackSourcePaths: true }, - angularCli: { - environment: 'dev' - }, + reporters: config.angularCli && config.angularCli.codeCoverage ? ['progress', 'coverage-istanbul'] : ['progress', 'kjhtml'], diff --git a/nativescript/App_Resources/Android/app.gradle b/nativescript/App_Resources/Android/app.gradle index 6345b6a..30587e8 100644 --- a/nativescript/App_Resources/Android/app.gradle +++ b/nativescript/App_Resources/Android/app.gradle @@ -8,7 +8,7 @@ android { defaultConfig { generatedDensities = [] - applicationId = "__PACKAGE__" + applicationId = "com.domain.project" } aaptOptions { additionalParameters "--no-version-vectors" diff --git a/nativescript/App_Resources/Android/drawable-hdpi/icon.png b/nativescript/App_Resources/Android/drawable-hdpi/icon.png deleted file mode 100755 index 1034356..0000000 Binary files a/nativescript/App_Resources/Android/drawable-hdpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/drawable-ldpi/icon.png b/nativescript/App_Resources/Android/drawable-ldpi/icon.png deleted file mode 100755 index ddfc17a..0000000 Binary files a/nativescript/App_Resources/Android/drawable-ldpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/drawable-mdpi/icon.png b/nativescript/App_Resources/Android/drawable-mdpi/icon.png deleted file mode 100755 index 486e410..0000000 Binary files a/nativescript/App_Resources/Android/drawable-mdpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/drawable-xhdpi/icon.png b/nativescript/App_Resources/Android/drawable-xhdpi/icon.png deleted file mode 100644 index f291882..0000000 Binary files a/nativescript/App_Resources/Android/drawable-xhdpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/drawable-xxhdpi/icon.png b/nativescript/App_Resources/Android/drawable-xxhdpi/icon.png deleted file mode 100644 index 4f69cb2..0000000 Binary files a/nativescript/App_Resources/Android/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/drawable-xxxhdpi/icon.png b/nativescript/App_Resources/Android/drawable-xxxhdpi/icon.png deleted file mode 100644 index 50887a8..0000000 Binary files a/nativescript/App_Resources/Android/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/nativescript/App_Resources/Android/AndroidManifest.xml b/nativescript/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from nativescript/App_Resources/Android/AndroidManifest.xml rename to nativescript/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/nativescript/App_Resources/Android/drawable-hdpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-hdpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-hdpi/icon.png new file mode 100644 index 0000000..9cde84c Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-hdpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-hdpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-hdpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/nativescript/App_Resources/Android/drawable-ldpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-ldpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-ldpi/icon.png new file mode 100644 index 0000000..4d6a674 Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-ldpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-ldpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-ldpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/nativescript/App_Resources/Android/drawable-mdpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-mdpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-mdpi/icon.png new file mode 100644 index 0000000..92ccc85 Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-mdpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-mdpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-mdpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/nativescript/App_Resources/Android/drawable-nodpi/splash_screen.xml b/nativescript/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from nativescript/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to nativescript/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/nativescript/App_Resources/Android/drawable-xhdpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xhdpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png new file mode 100644 index 0000000..8bcde62 Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-xhdpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xhdpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/nativescript/App_Resources/Android/drawable-xxhdpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xxhdpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png new file mode 100644 index 0000000..9d81c85 Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-xxhdpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xxhdpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/nativescript/App_Resources/Android/drawable-xxxhdpi/background.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xxxhdpi/background.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png new file mode 100644 index 0000000..9a34d0d Binary files /dev/null and b/nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/nativescript/App_Resources/Android/drawable-xxxhdpi/logo.png b/nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from nativescript/App_Resources/Android/drawable-xxxhdpi/logo.png rename to nativescript/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/nativescript/App_Resources/Android/values-v21/colors.xml b/nativescript/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from nativescript/App_Resources/Android/values-v21/colors.xml rename to nativescript/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/nativescript/App_Resources/Android/values-v21/styles.xml b/nativescript/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from nativescript/App_Resources/Android/values-v21/styles.xml rename to nativescript/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/nativescript/App_Resources/Android/values/colors.xml b/nativescript/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from nativescript/App_Resources/Android/values/colors.xml rename to nativescript/App_Resources/Android/src/main/res/values/colors.xml diff --git a/nativescript/App_Resources/Android/values/styles.xml b/nativescript/App_Resources/Android/src/main/res/values/styles.xml similarity index 97% rename from nativescript/App_Resources/Android/values/styles.xml rename to nativescript/App_Resources/Android/src/main/res/values/styles.xml index 1e8c7f2..c793e6d 100644 --- a/nativescript/App_Resources/Android/values/styles.xml +++ b/nativescript/App_Resources/Android/src/main/res/values/styles.xml @@ -32,7 +32,7 @@ - +