Merge branch 'user-sec-level' into dev

This commit is contained in:
Matthew Ross 2020-06-21 16:47:16 -04:00
commit af129bca20
6 changed files with 440 additions and 380 deletions

View File

@ -16,8 +16,8 @@ functional and minimal application for keeping track of tasks.
A web server running PHP 7.x with sqlite enabled (it may work on PHP 5.6, but
is not supported). See [PHP Supported Versions](https://www.php.net/supported-versions.php).
The server must have `sqlite3` and `php7-sqlite` installed.
**- OR -**
The server must have `sqlite3` and `php7-sqlite` installed.
**- OR -**
If you're comfortable changing code, you can use any database [supported by RedBeanPHP](https://redbeanphp.com/index.php?p=/connection).
### Install
@ -195,11 +195,11 @@ Because I like seeing the numbers.
Language | Files | Blank | Comment | Code
-----------|--------:|---------:|---------:|---------:
TypeScript | 69 | 1019 | 124 | 4250
PHP | 21 | 790 | 40 | 2396
HTML | 22 | 287 | 2 | 1604
SASS | 14 | 302 | 10 | 1365
**SUM:** | **126** | **2398** | **176** | **9615**
TypeScript | 67 | 978 | 129 | 4107
PHP | 20 | 752 | 40 | 2265
HTML | 21 | 268 | 2 | 1573
SASS | 14 | 299 | 10 | 1347
**SUM:** | **122** | **2297** | **181** | **9292**
Command: `cloc --exclude-dir=vendor,favicons --exclude-ext=json,svg,ini src/`

748
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "taskboard",
"version": "1.0.1",
"version": "1.0.2",
"description": "A Kanban-inspired app for keeping track of things that need to get done.",
"private": true,
"repository": {
@ -65,7 +65,7 @@
"chartist-plugin-tooltips": "^0.0.17",
"classlist.js": "^1.1.20150312",
"core-js": "^3.6.5",
"highlight.js": "^10.1.0",
"highlight.js": "^10.1.1",
"marked": "^1.1.0",
"node-sass": "^4.14.1",
"rxjs": "^6.5.5",
@ -73,8 +73,8 @@
"zone.js": "^0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.901.8",
"@angular/cli": "^9.1.8",
"@angular-devkit/build-angular": "^0.901.9",
"@angular/cli": "^9.1.9",
"@angular/compiler-cli": "^9.1.11",
"@angular/language-service": "^9.1.11",
"@types/chartist": "^0.9.48",

44
src/api/composer.lock generated
View File

@ -452,16 +452,16 @@
},
{
"name": "opis/closure",
"version": "3.5.4",
"version": "3.5.5",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b"
"reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/1d0deef692f66dae5d70663caee2867d0971306b",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b",
"url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"shasum": ""
},
"require": {
@ -509,7 +509,7 @@
"serialization",
"serialize"
],
"time": "2020-06-07T11:41:29+00:00"
"time": "2020-06-17T14:59:55+00:00"
},
{
"name": "phar-io/manifest",
@ -658,20 +658,20 @@
},
{
"name": "php-di/php-di",
"version": "6.2.0",
"version": "6.2.1",
"source": {
"type": "git",
"url": "https://github.com/PHP-DI/PHP-DI.git",
"reference": "5ca8b43f6dff54a30b0cd8bba86f76d8d1fd24c4"
"reference": "6875fe557c244b3830862c072c7719ca4ac2efe4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/5ca8b43f6dff54a30b0cd8bba86f76d8d1fd24c4",
"reference": "5ca8b43f6dff54a30b0cd8bba86f76d8d1fd24c4",
"url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/6875fe557c244b3830862c072c7719ca4ac2efe4",
"reference": "6875fe557c244b3830862c072c7719ca4ac2efe4",
"shasum": ""
},
"require": {
"opis/closure": "^3.5.4",
"opis/closure": "^3.5.5",
"php": ">=7.2.0",
"php-di/invoker": "^2.0",
"php-di/phpdoc-reader": "^2.0.1",
@ -726,7 +726,7 @@
"type": "tidelift"
}
],
"time": "2020-06-10T16:26:00+00:00"
"time": "2020-06-18T09:54:32+00:00"
},
{
"name": "php-di/phpdoc-reader",
@ -869,16 +869,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
"reference": "30441f2752e493c639526b215ed81d54f369d693"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
"reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
"reference": "30441f2752e493c639526b215ed81d54f369d693",
"shasum": ""
},
"require": {
@ -892,7 +892,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
"dev-1.x": "1.x-dev"
}
},
"autoload": {
@ -911,7 +911,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-02-18T18:59:58+00:00"
"time": "2020-06-19T20:22:09+00:00"
},
{
"name": "phpmailer/phpmailer",
@ -1298,16 +1298,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.6",
"version": "8.5.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348"
"reference": "809b4bf6754569870c1a93075929bae5615d5ee2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/809b4bf6754569870c1a93075929bae5615d5ee2",
"reference": "809b4bf6754569870c1a93075929bae5615d5ee2",
"shasum": ""
},
"require": {
@ -1387,7 +1387,7 @@
"type": "github"
}
],
"time": "2020-06-15T10:45:47+00:00"
"time": "2020-06-21T06:32:54+00:00"
},
{
"name": "psr/container",

View File

@ -19,6 +19,10 @@ export class ModalUser extends UserDisplay {
user.last_login, +user.security_level, +user.user_option_id,
user.username, user.board_access);
if (+user.id === 0) {
this.security_level = 3;
}
user.board_access.forEach(id => {
this.boardAccess.push('' + id);
});

View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
@Injectable()
export class Constants {
public get VERSION(): string { return '1.0.1'; }
public get VERSION(): string { return '1.0.2'; }
public get TOKEN(): string { return 'taskboard.jwt'; }
}