Initial conversion to Angular 6
This commit is contained in:
Matthew Ross
parent
fa5941fe73
commit
5583515df9
@ -1,85 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
|
||||||
"project": {
|
|
||||||
"name": "TaskBoard"
|
|
||||||
},
|
|
||||||
"apps": [
|
|
||||||
{
|
|
||||||
"root": "src",
|
|
||||||
"outDir": "dist",
|
|
||||||
"assets": [
|
|
||||||
{
|
|
||||||
"glob": "**/!(composer*)*.*",
|
|
||||||
"input": "api",
|
|
||||||
"output": "api",
|
|
||||||
"allowOutsideOutDir": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "*.json",
|
|
||||||
"input": "json",
|
|
||||||
"output": "strings"
|
|
||||||
},
|
|
||||||
".htaccess",
|
|
||||||
"images",
|
|
||||||
"fonts"
|
|
||||||
],
|
|
||||||
"index": "index.html",
|
|
||||||
"main": "main.ts",
|
|
||||||
"polyfills": "polyfills.ts",
|
|
||||||
"test": "test.ts",
|
|
||||||
"tsconfig": "tsconfig.app.json",
|
|
||||||
"testTsconfig": "tsconfig.spec.json",
|
|
||||||
"prefix": "app",
|
|
||||||
"styles": [
|
|
||||||
"scss/main.scss"
|
|
||||||
],
|
|
||||||
"stylePreprocessorOptions": {
|
|
||||||
"includePaths": [
|
|
||||||
"../node_modules/bourbon/core/",
|
|
||||||
"../node_modules/bourbon-neat/app/assets/stylesheets/",
|
|
||||||
"../node_modules/bourbon-neat/app/assets/stylesheets/",
|
|
||||||
"../node_modules/scss-base/src/",
|
|
||||||
"../node_modules/chartist/dist/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",
|
|
||||||
"exclude": "**/node_modules/**"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"project": "src/tsconfig.spec.json",
|
|
||||||
"exclude": "**/node_modules/**"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"test": {
|
|
||||||
"karma": {
|
|
||||||
"config": "./karma.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaults": {
|
|
||||||
"styleExt": "scss",
|
|
||||||
"build": {
|
|
||||||
"showCircularDependencies": false
|
|
||||||
},
|
|
||||||
"component": {
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"warnings": {
|
|
||||||
"typescriptMismatch": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
6
.watch-filter.js
Normal file
6
.watch-filter.js
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
function filter (f, stat) {
|
||||||
|
console.log(f.indexOf('/dist/api/') >= 0)
|
||||||
|
return f.indexOf('/dist/api/') >= 0
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = filter
|
||||||
@ -96,15 +96,14 @@ Developing on TaskBoard is pretty simple too.
|
|||||||
3. If you don't have it already, install the Angular CLI globally with `npm i -g @angular/cli`
|
3. If you don't have it already, install the Angular CLI globally with `npm i -g @angular/cli`
|
||||||
4. Run `npm i` to install dependencies (this also installs the API dependencies)
|
4. Run `npm i` to install dependencies (this also installs the API dependencies)
|
||||||
5. Run `npm run watch` for the build to automatically run after any change.
|
5. Run `npm run watch` for the build to automatically run after any change.
|
||||||
a. You will need to change permissions on `dist/api/` manually after the first build.
|
|
||||||
|
|
||||||
#### Unit Tests
|
#### Unit Tests
|
||||||
|
|
||||||
Both the API and App are unit tested. To run all tests, use the command `npm run test-all`. For only one set, run `npm run test-api` or `npm run test-app`.
|
Both the API and App are unit tested. To run all tests, use the command `npm run test`. For only one set, run `npm run test:api` or `npm run test:app`.
|
||||||
|
|
||||||
To have the app tests run & update as you work, use the command `npm run test-watch`.
|
To have the app tests run & update as you work, use the command `npm run test:watch`.
|
||||||
|
|
||||||
If you want to run a single API test, add the following comment block before the test function and use the command `npm run test-api-single`.
|
If you want to run a single API test, add the following comment block before the test function and use the command `npm run test:api-single`.
|
||||||
|
|
||||||
``` php
|
``` php
|
||||||
/**
|
/**
|
||||||
|
|||||||
158
angular.json
Normal file
158
angular.json
Normal file
@ -0,0 +1,158 @@
|
|||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"TaskBoard": {
|
||||||
|
"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",
|
||||||
|
"showCircularDependencies": false,
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"glob": "**/!(composer*)*.*",
|
||||||
|
"input": "src/api",
|
||||||
|
"output": "/api"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"glob": "*.json",
|
||||||
|
"input": "src/json",
|
||||||
|
"output": "/strings"
|
||||||
|
},
|
||||||
|
"src/.htaccess",
|
||||||
|
"src/images",
|
||||||
|
"src/fonts"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/scss/main.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": "TaskBoard:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "TaskBoard:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "TaskBoard: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/scss/main.scss"
|
||||||
|
],
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"glob": "**/!(composer*)*.*",
|
||||||
|
"input": "src/api",
|
||||||
|
"output": "/api"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"glob": "*.json",
|
||||||
|
"input": "src/json",
|
||||||
|
"output": "/strings"
|
||||||
|
},
|
||||||
|
"src/.htaccess",
|
||||||
|
"src/images",
|
||||||
|
"src/fonts"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [
|
||||||
|
"src/tsconfig.app.json",
|
||||||
|
"src/tsconfig.spec.json"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"TaskBoard-e2e": {
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "",
|
||||||
|
"projectType": "application",
|
||||||
|
"architect": {
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "./protractor.conf.js",
|
||||||
|
"devServerTarget": "TaskBoard:serve"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [],
|
||||||
|
"exclude": [
|
||||||
|
"**/node_modules/**"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultProject": "TaskBoard",
|
||||||
|
"cli": {
|
||||||
|
"warnings": {
|
||||||
|
"typescriptMismatch": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"prefix": "app",
|
||||||
|
"styleext": "scss"
|
||||||
|
},
|
||||||
|
"@schematics/angular:directive": {
|
||||||
|
"prefix": "app"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -6,20 +6,20 @@ const path = require('path');
|
|||||||
module.exports = function (config) {
|
module.exports = function (config) {
|
||||||
config.set({
|
config.set({
|
||||||
basePath: '',
|
basePath: '',
|
||||||
frameworks: ['jasmine', '@angular/cli'],
|
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||||
plugins: [
|
plugins: [
|
||||||
require('karma-jasmine'),
|
require('karma-jasmine'),
|
||||||
require('karma-chrome-launcher'),
|
require('karma-chrome-launcher'),
|
||||||
require('karma-phantomjs-launcher'),
|
require('karma-phantomjs-launcher'),
|
||||||
require('karma-jasmine-html-reporter'),
|
require('karma-jasmine-html-reporter'),
|
||||||
require('karma-coverage-istanbul-reporter'),
|
require('karma-coverage-istanbul-reporter'),
|
||||||
require('@angular/cli/plugins/karma')
|
require('@angular-devkit/build-angular/plugins/karma')
|
||||||
],
|
],
|
||||||
client:{
|
client:{
|
||||||
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||||
},
|
},
|
||||||
coverageIstanbulReporter: {
|
coverageIstanbulReporter: {
|
||||||
reports: [ 'html', 'lcovonly' ],
|
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
|
||||||
dir: path.join(__dirname, 'coverage/app'),
|
dir: path.join(__dirname, 'coverage/app'),
|
||||||
fixWebpackSourcePaths: true
|
fixWebpackSourcePaths: true
|
||||||
},
|
},
|
||||||
|
|||||||
9460
package-lock.json
generated
9460
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
82
package.json
82
package.json
@ -25,65 +25,69 @@
|
|||||||
"api-changed": "dist/api/**/*.*"
|
"api-changed": "dist/api/**/*.*"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "ng b -oh=none -prod && chmod a+w dist/api",
|
"build": "ng b --output-hashing=none",
|
||||||
"build-dev": "ng b -oh=none && chmod a+w dist/api",
|
"build:prod": "npm-run-all -s \"build -- --prod\" api-changed",
|
||||||
"watch": "parallelshell \"ng b -oh=none -w\" \"npm run dist-watch\"",
|
"build:dev": "npm-run-all -s build api-changed",
|
||||||
"dist-watch": "npm-watch api-changed",
|
"watch": "npm-run-all -l -p \"build -- --watch\" dist-watch",
|
||||||
"api-changed": "chmod a+w dist/api",
|
"dist-watch": "watch \"npm run api-changed\" --filter=.watch-filter.js",
|
||||||
"test-app": "ng test -cc -sr",
|
"api-changed": "[ -d \"dist/api\" ] && chmod a+w dist/api",
|
||||||
"test": "npm run test-app && npm run test-api",
|
"test": "npm-run-all test:app test:api",
|
||||||
"test-watch": "ng test -cc",
|
"test:app": "ng test --code-coverage --watch=false",
|
||||||
"test-api": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml",
|
"test:api": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml",
|
||||||
"test-api-single": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml -g single",
|
"test:api-single": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml -g single",
|
||||||
|
"test:watch": "ng test --code-coverage --watch",
|
||||||
"lint": "ng lint",
|
"lint": "ng lint",
|
||||||
"e2e": "ng e2e",
|
|
||||||
"postinstall": "cd src/api/ && composer update && composer install --optimize-autoloader && cd ../../"
|
"postinstall": "cd src/api/ && composer update && composer install --optimize-autoloader && cd ../../"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^5.2.9",
|
"@angular/animations": "^6.0.2",
|
||||||
"@angular/common": "^5.2.9",
|
"@angular/common": "^6.0.2",
|
||||||
"@angular/compiler": "^5.2.9",
|
"@angular/compiler": "^6.0.2",
|
||||||
"@angular/core": "^5.2.9",
|
"@angular/core": "^6.0.2",
|
||||||
"@angular/forms": "^5.2.9",
|
"@angular/forms": "^6.0.2",
|
||||||
"@angular/http": "^5.2.9",
|
"@angular/http": "^6.0.2",
|
||||||
"@angular/platform-browser": "^5.2.9",
|
"@angular/platform-browser": "^6.0.2",
|
||||||
"@angular/platform-browser-dynamic": "^5.2.9",
|
"@angular/platform-browser-dynamic": "^6.0.2",
|
||||||
"@angular/router": "^5.2.9",
|
"@angular/router": "^6.0.2",
|
||||||
"chartist": "^0.11.0",
|
"chartist": "^0.11.0",
|
||||||
"chartist-plugin-tooltips": "^0.0.17",
|
"chartist-plugin-tooltips": "^0.0.17",
|
||||||
"classlist.js": "^1.1.20150312",
|
"classlist.js": "^1.1.20150312",
|
||||||
"core-js": "^2.5.5",
|
"core-js": "^2.5.6",
|
||||||
"dragula": "^3.7.2",
|
"dragula": "^3.7.2",
|
||||||
"highlight.js": "^9.12.0",
|
"highlight.js": "^9.12.0",
|
||||||
"marked": "^0.3.19",
|
"marked": "^0.3.19",
|
||||||
"ng2-dragula": "^1.5.0",
|
"ng2-dragula": "^1.5.0",
|
||||||
"rxjs": "^5.5.10",
|
"node-sass": "^4.9.0",
|
||||||
|
"rxjs": "^6.1.0",
|
||||||
|
"rxjs-compat": "^6.0.0-rc.0",
|
||||||
"scss-base": "^1.4.0",
|
"scss-base": "^1.4.0",
|
||||||
"zone.js": "^0.8.26"
|
"zone.js": "^0.8.26"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "~1.7.4",
|
"@angular-devkit/build-angular": "~0.6.3",
|
||||||
"@angular/compiler-cli": "^5.2.9",
|
"@angular/cli": "^6.0.3",
|
||||||
"@angular/language-service": "^5.2.9",
|
"@angular/compiler-cli": "^6.0.2",
|
||||||
"@types/jasmine": "~2.8.6",
|
"@angular/language-service": "^6.0.2",
|
||||||
|
"@types/jasmine": "~2.8.7",
|
||||||
"@types/jasminewd2": "~2.0.3",
|
"@types/jasminewd2": "~2.0.3",
|
||||||
"@types/node": "~9.6.4",
|
"@types/node": "~10.1.1",
|
||||||
"bourbon": "5.0.0",
|
"bourbon": "5.0.0",
|
||||||
"bourbon-neat": "1.9.0",
|
"bourbon-neat": "1.9.0",
|
||||||
"codelyzer": "^4.2.1",
|
"codelyzer": "^4.3.0",
|
||||||
"jasmine-core": "^2.8.0",
|
"jasmine": "^3.1.0",
|
||||||
|
"jasmine-core": "^3.1.0",
|
||||||
"jasmine-spec-reporter": "~4.2.1",
|
"jasmine-spec-reporter": "~4.2.1",
|
||||||
"karma": "~2.0.0",
|
"karma": "~2.0.2",
|
||||||
"karma-chrome-launcher": "~2.2.0",
|
"karma-chrome-launcher": "~2.2.0",
|
||||||
"karma-coverage-istanbul-reporter": "^1.4.2",
|
"karma-coverage-istanbul-reporter": "^2.0.0",
|
||||||
"karma-jasmine": "~1.1.1",
|
"karma-jasmine": "~1.1.2",
|
||||||
"karma-jasmine-html-reporter": "^0.2.2",
|
"karma-jasmine-html-reporter": "^1.1.0",
|
||||||
"karma-phantomjs-launcher": "^1.0.4",
|
"karma-phantomjs-launcher": "^1.0.4",
|
||||||
"npm-watch": "^0.3.0",
|
"npm-run-all": "^4.1.3",
|
||||||
"parallelshell": "^3.0.2",
|
"protractor": "~5.3.2",
|
||||||
"protractor": "~5.3.1",
|
"ts-node": "~6.0.3",
|
||||||
"ts-node": "~5.0.1",
|
"tslint": "~5.10.0",
|
||||||
"tslint": "~5.9.1",
|
"typescript": "^2.7.2",
|
||||||
"typescript": "^2.8.1"
|
"watch": "^1.0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
70
src/api/composer.lock
generated
70
src/api/composer.lock
generated
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_readme": [
|
"_readme": [
|
||||||
"This file locks the dependencies of your project to a known state",
|
"This file locks the dependencies of your project to a known state",
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "14e8b3dd5cae40acf67c37c5f168bf4c",
|
"content-hash": "14e8b3dd5cae40acf67c37c5f168bf4c",
|
||||||
@ -139,16 +139,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "gabordemooij/redbean",
|
"name": "gabordemooij/redbean",
|
||||||
"version": "v5.0",
|
"version": "v5.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/gabordemooij/redbean.git",
|
"url": "https://github.com/gabordemooij/redbean.git",
|
||||||
"reference": "44229acdf493e2229c1e33e3add211f23c05ee4d"
|
"reference": "a02e58ad5519149f572559a8293b5dffea385956"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/gabordemooij/redbean/zipball/44229acdf493e2229c1e33e3add211f23c05ee4d",
|
"url": "https://api.github.com/repos/gabordemooij/redbean/zipball/a02e58ad5519149f572559a8293b5dffea385956",
|
||||||
"reference": "44229acdf493e2229c1e33e3add211f23c05ee4d",
|
"reference": "a02e58ad5519149f572559a8293b5dffea385956",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -168,15 +168,15 @@
|
|||||||
{
|
{
|
||||||
"name": "Gabor de Mooij",
|
"name": "Gabor de Mooij",
|
||||||
"email": "gabor@redbeanphp.com",
|
"email": "gabor@redbeanphp.com",
|
||||||
"homepage": "http://redbeanphp.com"
|
"homepage": "https://redbeanphp.com"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "RedBeanPHP ORM",
|
"description": "RedBeanPHP ORM",
|
||||||
"homepage": "http://redbeanphp.com/",
|
"homepage": "https://redbeanphp.com/",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"orm"
|
"orm"
|
||||||
],
|
],
|
||||||
"time": "2017-10-19T21:38:38+00:00"
|
"time": "2018-04-01T11:51:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
@ -303,20 +303,20 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "myclabs/php-enum",
|
"name": "myclabs/php-enum",
|
||||||
"version": "1.5.2",
|
"version": "1.6.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/myclabs/php-enum.git",
|
"url": "https://github.com/myclabs/php-enum.git",
|
||||||
"reference": "3ed7088cfd0a0e06534b7f8b0eee82acea574fac"
|
"reference": "8c5649e4ed99acd53a40eada270154dcac089f7e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/myclabs/php-enum/zipball/3ed7088cfd0a0e06534b7f8b0eee82acea574fac",
|
"url": "https://api.github.com/repos/myclabs/php-enum/zipball/8c5649e4ed99acd53a40eada270154dcac089f7e",
|
||||||
"reference": "3ed7088cfd0a0e06534b7f8b0eee82acea574fac",
|
"reference": "8c5649e4ed99acd53a40eada270154dcac089f7e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3"
|
"php": ">=5.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.8.35|^5.7|^6.0",
|
"phpunit/phpunit": "^4.8.35|^5.7|^6.0",
|
||||||
@ -343,7 +343,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"enum"
|
"enum"
|
||||||
],
|
],
|
||||||
"time": "2017-06-28T16:24:08+00:00"
|
"time": "2018-05-09T08:09:15+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/fast-route",
|
"name": "nikic/fast-route",
|
||||||
@ -713,23 +713,23 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
"version": "1.7.5",
|
"version": "1.7.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpspec/prophecy.git",
|
"url": "https://github.com/phpspec/prophecy.git",
|
||||||
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
|
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
|
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
|
||||||
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
|
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"doctrine/instantiator": "^1.0.2",
|
"doctrine/instantiator": "^1.0.2",
|
||||||
"php": "^5.3|^7.0",
|
"php": "^5.3|^7.0",
|
||||||
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
|
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
|
||||||
"sebastian/comparator": "^1.1|^2.0",
|
"sebastian/comparator": "^1.1|^2.0|^3.0",
|
||||||
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
|
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
@ -772,20 +772,20 @@
|
|||||||
"spy",
|
"spy",
|
||||||
"stub"
|
"stub"
|
||||||
],
|
],
|
||||||
"time": "2018-02-19T10:16:54+00:00"
|
"time": "2018-04-18T13:57:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "5.3.0",
|
"version": "5.3.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
"reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
|
"reference": "c89677919c5dd6d3b3852f230a663118762218ac"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
|
||||||
"reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
|
"reference": "c89677919c5dd6d3b3852f230a663118762218ac",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -835,7 +835,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2017-12-06T09:29:45+00:00"
|
"time": "2018-04-06T15:36:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
@ -1025,16 +1025,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "6.5.7",
|
"version": "6.5.8",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "6bd77b57707c236833d2b57b968e403df060c9d9"
|
"reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
|
||||||
"reference": "6bd77b57707c236833d2b57b968e403df060c9d9",
|
"reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1105,7 +1105,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2018-02-26T07:01:09+00:00"
|
"time": "2018-04-10T11:38:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
@ -1923,16 +1923,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "slim/slim",
|
"name": "slim/slim",
|
||||||
"version": "3.9.2",
|
"version": "3.10.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/slimphp/Slim.git",
|
"url": "https://github.com/slimphp/Slim.git",
|
||||||
"reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
|
"reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
|
"url": "https://api.github.com/repos/slimphp/Slim/zipball/d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
|
||||||
"reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
|
"reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1990,7 +1990,7 @@
|
|||||||
"micro",
|
"micro",
|
||||||
"router"
|
"router"
|
||||||
],
|
],
|
||||||
"time": "2017-11-26T19:13:09+00:00"
|
"time": "2018-04-19T19:29:08+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "theseer/tokenizer",
|
"name": "theseer/tokenizer",
|
||||||
|
|||||||
@ -47,7 +47,11 @@ export class Login implements OnInit {
|
|||||||
this.isSubmitted = true;
|
this.isSubmitted = true;
|
||||||
|
|
||||||
this.authService.login(this.username, this.password, this.remember)
|
this.authService.login(this.username, this.password, this.remember)
|
||||||
.subscribe((response: ApiResponse) => {
|
.subscribe((response: any) => {
|
||||||
|
response = response.error
|
||||||
|
? <ApiResponse>response.error
|
||||||
|
: <ApiResponse>response;
|
||||||
|
|
||||||
response.alerts.forEach(msg => {
|
response.alerts.forEach(msg => {
|
||||||
this.notes.add(new Notification(msg.type, msg.text));
|
this.notes.add(new Notification(msg.type, msg.text));
|
||||||
});
|
});
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>TaskBoard - Kanban App</title>
|
<title>TaskBoard - Kanban App</title>
|
||||||
<base href="./">
|
<base href="/~kiswa/TaskBoard/dist/">
|
||||||
|
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
// Bourbon and Neat
|
// Bourbon and Neat
|
||||||
@import 'bourbon';
|
@import '../../node_modules/bourbon/core/bourbon';
|
||||||
@import 'neat-settings';
|
@import 'neat-settings';
|
||||||
@import 'neat';
|
@import '../../node_modules/bourbon-neat/app/assets/stylesheets/neat';
|
||||||
|
|
||||||
// scss-base
|
// scss-base
|
||||||
@import 'scss-base-settings';
|
@import 'scss-base-settings';
|
||||||
@import 'scss-base';
|
@import '../../node_modules/scss-base/src/scss-base';
|
||||||
|
|
||||||
// chartist
|
// chartist
|
||||||
@import 'chartist-settings';
|
@import 'chartist-settings';
|
||||||
@import 'chartist';
|
@import '../../node_modules/chartist/dist/chartist.css';
|
||||||
|
|
||||||
// dragula
|
// dragula
|
||||||
@import '../../node_modules/dragula/dist/dragula.css';
|
@import '../../node_modules/dragula/dist/dragula.css';
|
||||||
|
|||||||
@ -10,7 +10,8 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"test.ts"
|
"test.ts",
|
||||||
|
"polyfills.ts"
|
||||||
],
|
],
|
||||||
"include": [
|
"include": [
|
||||||
"**/*.spec.ts",
|
"**/*.spec.ts",
|
||||||
|
|||||||
@ -76,10 +76,12 @@ describe('TaskDisplay', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('parses task description markdown into text', () => {
|
it('parses task description markdown into text', () => {
|
||||||
component.taskData = <any>{ description: '# Make this HTML' };
|
setupBoard();
|
||||||
component.activeBoard = <any>{ issue_trackers: [
|
component.taskData.description = '# Make this HTML';
|
||||||
|
component.activeBoard.issue_trackers = <any>[
|
||||||
{ regex: 'test', url: '%BUGID%' }
|
{ regex: 'test', url: '%BUGID%' }
|
||||||
] };
|
];
|
||||||
|
component.ngOnInit();
|
||||||
|
|
||||||
const actual = component.getTaskDescription();
|
const actual = component.getTaskDescription();
|
||||||
|
|
||||||
@ -87,8 +89,9 @@ describe('TaskDisplay', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles checklists in markdown', () => {
|
it('handles checklists in markdown', () => {
|
||||||
component.taskData = <any>{ description: ' - [x] One\n - Two' };
|
setupBoard();
|
||||||
component.activeBoard = <any>{ issue_trackers: [] };
|
component.taskData.description = ' - [x] One\n - Two';
|
||||||
|
component.ngOnInit();
|
||||||
|
|
||||||
const actual = component.getTaskDescription();
|
const actual = component.getTaskDescription();
|
||||||
expect(actual).toEqual('<ul>\n<li class="checklist"><i class="icon icon-check"></i> ' +
|
expect(actual).toEqual('<ul>\n<li class="checklist"><i class="icon icon-check"></i> ' +
|
||||||
@ -96,8 +99,9 @@ describe('TaskDisplay', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('adds attributes to links in markdown', () => {
|
it('adds attributes to links in markdown', () => {
|
||||||
component.taskData = <any>{ description: '[link](google.com)' };
|
setupBoard();
|
||||||
component.activeBoard = <any>{ issue_trackers: [] };
|
component.taskData.description = '[link](google.com)';
|
||||||
|
component.ngOnInit();
|
||||||
|
|
||||||
const actual = component.getTaskDescription();
|
const actual = component.getTaskDescription();
|
||||||
expect(actual).toContain('target="tb_external" rel="noreferrer"');
|
expect(actual).toContain('target="tb_external" rel="noreferrer"');
|
||||||
@ -252,5 +256,20 @@ describe('TaskDisplay', () => {
|
|||||||
|
|
||||||
expect(emitted).toEqual(true);
|
expect(emitted).toEqual(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function setupBoard() {
|
||||||
|
const today = new Date();
|
||||||
|
|
||||||
|
component.activeBoard = <any>{
|
||||||
|
id: 1,
|
||||||
|
columns: [{ id: 1, name: 'test' }],
|
||||||
|
issue_trackers: []
|
||||||
|
};
|
||||||
|
component.taskData = <any>{
|
||||||
|
id: 1, description: '',
|
||||||
|
due_date: (today.getMonth() + 1) + '/' +
|
||||||
|
(today.getDate() + 1) + '/' + today.getFullYear()
|
||||||
|
};
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { TestBed, ComponentFixture } from '@angular/core/testing'
|
import { TestBed, ComponentFixture } from '@angular/core/testing';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
@ -82,6 +82,7 @@ describe('Modal', () => {
|
|||||||
} };
|
} };
|
||||||
|
|
||||||
keyUp(<any>{ keyCode: 13 });
|
keyUp(<any>{ keyCode: 13 });
|
||||||
|
expect(called).toEqual(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -67,6 +67,7 @@ describe('Models', () => {
|
|||||||
board_access: '', collapsed: true
|
board_access: '', collapsed: true
|
||||||
}]
|
}]
|
||||||
);
|
);
|
||||||
|
expect(actual.id).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can add a column', () => {
|
it('can add a column', () => {
|
||||||
@ -145,6 +146,7 @@ describe('Models', () => {
|
|||||||
}],
|
}],
|
||||||
[{ id: 1, name: '', default_task_color: '', board_id: 1 }]
|
[{ id: 1, name: '', default_task_color: '', board_id: 1 }]
|
||||||
);
|
);
|
||||||
|
expect(task.id).toEqual(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -11,6 +11,9 @@
|
|||||||
"typeRoots": [
|
"typeRoots": [
|
||||||
"node_modules/@types"
|
"node_modules/@types"
|
||||||
],
|
],
|
||||||
|
"paths": {
|
||||||
|
"dragula": ["../node_modules/dragula/dist/dragula.min.js"]
|
||||||
|
},
|
||||||
"lib": [
|
"lib": [
|
||||||
"es2017",
|
"es2017",
|
||||||
"dom"
|
"dom"
|
||||||
|
|||||||
@ -18,7 +18,6 @@
|
|||||||
"forin": true,
|
"forin": true,
|
||||||
"import-blacklist": [
|
"import-blacklist": [
|
||||||
true,
|
true,
|
||||||
"rxjs",
|
|
||||||
"rxjs/Rx"
|
"rxjs/Rx"
|
||||||
],
|
],
|
||||||
"import-spacing": true,
|
"import-spacing": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user