From cdb0769a20ddc3746f6c56eab2af94c8391a9293 Mon Sep 17 00:00:00 2001 From: Roman Rosluk Date: Sat, 10 Aug 2019 12:34:09 +0300 Subject: [PATCH] CRUD Observable tests --- angular.json | 3 +- projects/ngx-resource/core/package.json | 2 +- .../ngx-resource/core/src/lib/Declarations.ts | 5 + .../ngx-resource/core/src/lib/Resource.ts | 35 +- .../core/src/lib/ResourceAction.ts | 4 +- .../core/src/lib/ResourceModule.ts | 9 +- .../core/src/lib/ResourceParams.ts | 2 +- projects/ngx-resource/core/src/test.ts | 5 +- .../package.json | 5 +- .../lib/ResourceHandlerCordovaAdvancedHttp.ts | 2 +- .../src/lib/ResourceModule.ts | 7 +- .../handler-cordova-advanced-http/src/test.ts | 5 +- .../ngx-resource/handler-fetch/package.json | 5 +- .../handler-fetch/src/lib/ResourceModule.ts | 7 +- .../ngx-resource/handler-fetch/src/test.ts | 5 +- .../handler-ngx-http/package.json | 6 +- .../src/lib/ResourceModule.ts | 8 +- .../ngx-resource/handler-ngx-http/src/test.ts | 5 +- proxy.conf.json | 6 + server/node_modules/body-parser/package.json | 93 ++++ server/node_modules/express/package.json | 154 +++++++ server/node_modules/morgan/package.json | 92 ++++ server/package-lock.json | 399 ++++++++++++++++++ server/package.json | 16 + src/app/app.component.html | 20 +- src/app/app.component.ts | 2 +- src/app/app.module.ts | 10 +- .../crud-obs-test.component.html | 20 + .../crud-obs-test.component.scss | 0 .../crud-obs-test.component.spec.ts | 25 ++ .../crud-obs-test/crud-obs-test.component.ts | 24 ++ .../crud-obs-test.resource.spec.ts | 12 + .../crud-obs-test/crud-obs-test.resource.ts | 12 + src/styles.scss | 18 + 34 files changed, 939 insertions(+), 84 deletions(-) create mode 100644 proxy.conf.json create mode 100644 server/node_modules/body-parser/package.json create mode 100644 server/node_modules/express/package.json create mode 100644 server/node_modules/morgan/package.json create mode 100644 server/package-lock.json create mode 100644 server/package.json create mode 100644 src/app/components/crud-obs-test/crud-obs-test.component.html create mode 100644 src/app/components/crud-obs-test/crud-obs-test.component.scss create mode 100644 src/app/components/crud-obs-test/crud-obs-test.component.spec.ts create mode 100644 src/app/components/crud-obs-test/crud-obs-test.component.ts create mode 100644 src/app/resources/crud-obs-test/crud-obs-test.resource.spec.ts create mode 100644 src/app/resources/crud-obs-test/crud-obs-test.resource.ts diff --git a/angular.json b/angular.json index c2dea04..9c39628 100644 --- a/angular.json +++ b/angular.json @@ -62,7 +62,8 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "ngx-resource-mono:build" + "browserTarget": "ngx-resource-mono:build", + "proxyConfig": "proxy.conf.json" }, "configurations": { "production": { diff --git a/projects/ngx-resource/core/package.json b/projects/ngx-resource/core/package.json index ca8f3f8..f746ae7 100644 --- a/projects/ngx-resource/core/package.json +++ b/projects/ngx-resource/core/package.json @@ -1,6 +1,6 @@ { "name": "@ngx-resource/core", - "version": "7.0.0", + "version": "7.1.0", "description": "Core of resource library", "author": "Roman Rosluk ", "license": "MIT", diff --git a/projects/ngx-resource/core/src/lib/Declarations.ts b/projects/ngx-resource/core/src/lib/Declarations.ts index 42e2658..f9487dc 100644 --- a/projects/ngx-resource/core/src/lib/Declarations.ts +++ b/projects/ngx-resource/core/src/lib/Declarations.ts @@ -1,7 +1,12 @@ import { Observable, Subscription } from 'rxjs'; +import { Provider } from '@angular/core'; export type TTypePromiseNull = T | Promise | null; +export interface IResourceModuleConfig { + handler?: Provider; +} + export interface IResourceParamsBase { url?: string; pathPrefix?: string; diff --git a/projects/ngx-resource/core/src/lib/Resource.ts b/projects/ngx-resource/core/src/lib/Resource.ts index 5f14660..a610a3b 100644 --- a/projects/ngx-resource/core/src/lib/Resource.ts +++ b/projects/ngx-resource/core/src/lib/Resource.ts @@ -14,10 +14,29 @@ import { ResourceGlobalConfig } from './ResourceGlobalConfig'; import { ResourceHelper } from './ResourceHelper'; import { ResourceHandler } from './ResourceHandler'; import { ResourceModule } from './ResourceModule'; +import { Optional } from '@angular/core'; export class Resource { - protected requestHandler: ResourceHandler; + protected get requestHandler(): ResourceHandler { + + if (!this._requestHandler) { + + if (!ResourceModule.injector) { + throw new Error('ResourceModule.injector is missing'); + } + + this._requestHandler = ResourceModule.injector.get(ResourceHandler); + + if (!this._requestHandler) { + throw new Error('ResourceHandler provider is missing'); + } + + } + + return this._requestHandler; + + } private $url: string | null = null; private $pathPrefix: string | null = null; @@ -27,19 +46,17 @@ export class Resource { private $params: {} | null = null; private $query: {} | null = null; - constructor(requestHandler?: ResourceHandler) { + // tslint:disable-next-line:variable-name + private _requestHandler: ResourceHandler | null = null; - if (!requestHandler) { - requestHandler = ResourceModule.injector.get(ResourceHandler); - } + constructor(@Optional() requestHandler?: ResourceHandler) { - if (!requestHandler) { - throw new Error('ResourceHandler is missing'); + if (requestHandler) { + this._requestHandler = requestHandler; } - this.requestHandler = requestHandler; - (this.constructor as any).instance = this; + } /** diff --git a/projects/ngx-resource/core/src/lib/ResourceAction.ts b/projects/ngx-resource/core/src/lib/ResourceAction.ts index abb214f..f968f82 100644 --- a/projects/ngx-resource/core/src/lib/ResourceAction.ts +++ b/projects/ngx-resource/core/src/lib/ResourceAction.ts @@ -11,9 +11,9 @@ export function ResourceAction(methodOptions?: IResourceAction) { } // tslint:disable-next-line: only-arrow-functions - return function(target: Resource, propertyKey: string) { + return function (target: Resource, propertyKey: string) { - (target as any)[propertyKey] = function(...args: any[]): any { + (target as any)[propertyKey] = function (...args: any[]): any { const callbacks: any = args.filter((arg: any) => typeof arg === 'function'); const data: any = args.filter((arg: any) => typeof arg !== 'function'); diff --git a/projects/ngx-resource/core/src/lib/ResourceModule.ts b/projects/ngx-resource/core/src/lib/ResourceModule.ts index ac26dda..6963e39 100644 --- a/projects/ngx-resource/core/src/lib/ResourceModule.ts +++ b/projects/ngx-resource/core/src/lib/ResourceModule.ts @@ -1,15 +1,12 @@ -import { Injector, ModuleWithProviders, NgModule, Provider } from '@angular/core'; +import { Injector, ModuleWithProviders, NgModule } from '@angular/core'; import { ResourceHandlerNoop } from './ResourceHandlerNoop'; import { ResourceHandler } from './ResourceHandler'; - -export interface IResourceModuleConfig { - handler?: Provider; -} +import { IResourceModuleConfig } from './Declarations'; @NgModule() export class ResourceModule { - static injector: Injector; + static injector: Injector | null = null; /** * For root diff --git a/projects/ngx-resource/core/src/lib/ResourceParams.ts b/projects/ngx-resource/core/src/lib/ResourceParams.ts index 6bc942b..eb9debd 100755 --- a/projects/ngx-resource/core/src/lib/ResourceParams.ts +++ b/projects/ngx-resource/core/src/lib/ResourceParams.ts @@ -3,7 +3,7 @@ import { IResourceParams } from './Declarations'; export function ResourceParams(params: IResourceParams = {}) { // tslint:disable-next-line: only-arrow-functions - return function(target: any) { + return function (target: any) { target.prototype.getResourceOptions = () => params; diff --git a/projects/ngx-resource/core/src/test.ts b/projects/ngx-resource/core/src/test.ts index 978c64f..c0cbaac 100644 --- a/projects/ngx-resource/core/src/test.ts +++ b/projects/ngx-resource/core/src/test.ts @@ -3,10 +3,7 @@ import 'zone.js/dist/zone'; import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: any; diff --git a/projects/ngx-resource/handler-cordova-advanced-http/package.json b/projects/ngx-resource/handler-cordova-advanced-http/package.json index aef5dfd..fd96942 100644 --- a/projects/ngx-resource/handler-cordova-advanced-http/package.json +++ b/projects/ngx-resource/handler-cordova-advanced-http/package.json @@ -1,6 +1,6 @@ { "name": "@ngx-resource/handler-cordova-advanced-http", - "version": "7.0.0", + "version": "7.1.0", "description": "Resource Handler based on cordova-advanced-http", "author": "Roman Rosluk ", "license": "MIT", @@ -24,7 +24,6 @@ "resource-cordova-advanced-http" ], "peerDependencies": { - "@ngx-resource/core": "^7.0.0", - "@ngx-resource/handler-ngx-http": "^7.0.0" + "@ngx-resource/core": "^7.1.0" } } diff --git a/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceHandlerCordovaAdvancedHttp.ts b/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceHandlerCordovaAdvancedHttp.ts index ab97625..3f28f6c 100644 --- a/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceHandlerCordovaAdvancedHttp.ts +++ b/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceHandlerCordovaAdvancedHttp.ts @@ -245,7 +245,7 @@ export class ResourceHandlerCordovaAdvancedHttp extends ResourceHandler { case ResourceResponseBodyType.ArrayBuffer: const fileReader = new FileReader(); - fileReader.onload = function() { + fileReader.onload = function () { ret.body = this.result; if (isError) { diff --git a/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceModule.ts b/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceModule.ts index db15fda..89b9faa 100644 --- a/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceModule.ts +++ b/projects/ngx-resource/handler-cordova-advanced-http/src/lib/ResourceModule.ts @@ -1,10 +1,7 @@ -import { ModuleWithProviders, NgModule, Provider } from '@angular/core'; -import { ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { IResourceModuleConfig, ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; import { ResourceHandlerCordovaAdvancedHttp } from './ResourceHandlerCordovaAdvancedHttp'; -export interface IResourceModuleConfig { - handler?: Provider; -} @NgModule() export class ResourceModule extends ResourceModuleCore { diff --git a/projects/ngx-resource/handler-cordova-advanced-http/src/test.ts b/projects/ngx-resource/handler-cordova-advanced-http/src/test.ts index 978c64f..c0cbaac 100644 --- a/projects/ngx-resource/handler-cordova-advanced-http/src/test.ts +++ b/projects/ngx-resource/handler-cordova-advanced-http/src/test.ts @@ -3,10 +3,7 @@ import 'zone.js/dist/zone'; import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: any; diff --git a/projects/ngx-resource/handler-fetch/package.json b/projects/ngx-resource/handler-fetch/package.json index 7ef6a2d..67b2515 100644 --- a/projects/ngx-resource/handler-fetch/package.json +++ b/projects/ngx-resource/handler-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@ngx-resource/handler-fetch", - "version": "7.0.0-beta.1", + "version": "7.1.0-beta.1", "description": "Resource handler for fetch", "author": "Roman Rosluk ", "license": "MIT", @@ -20,7 +20,6 @@ "Resource" ], "peerDependencies": { - "@ngx-resource/core": "^7.0.0", - "@ngx-resource/handler-ngx-http": "^7.0.0" + "@ngx-resource/core": "^7.1.0" } } diff --git a/projects/ngx-resource/handler-fetch/src/lib/ResourceModule.ts b/projects/ngx-resource/handler-fetch/src/lib/ResourceModule.ts index 73125ef..af79d7c 100644 --- a/projects/ngx-resource/handler-fetch/src/lib/ResourceModule.ts +++ b/projects/ngx-resource/handler-fetch/src/lib/ResourceModule.ts @@ -1,10 +1,7 @@ -import { ModuleWithProviders, NgModule, Provider } from '@angular/core'; -import { ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { IResourceModuleConfig, ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; import { ResourceHandlerFetch } from './ResourceHandlerFetch'; -export interface IResourceModuleConfig { - handler?: Provider; -} @NgModule() export class ResourceModule extends ResourceModuleCore { diff --git a/projects/ngx-resource/handler-fetch/src/test.ts b/projects/ngx-resource/handler-fetch/src/test.ts index 978c64f..c0cbaac 100644 --- a/projects/ngx-resource/handler-fetch/src/test.ts +++ b/projects/ngx-resource/handler-fetch/src/test.ts @@ -3,10 +3,7 @@ import 'zone.js/dist/zone'; import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: any; diff --git a/projects/ngx-resource/handler-ngx-http/package.json b/projects/ngx-resource/handler-ngx-http/package.json index fe309b7..f8f58ac 100644 --- a/projects/ngx-resource/handler-ngx-http/package.json +++ b/projects/ngx-resource/handler-ngx-http/package.json @@ -1,6 +1,6 @@ { "name": "@ngx-resource/handler-ngx-http", - "version": "7.0.0", + "version": "7.1.0", "description": "Resource handler for angular", "author": "Roman Rosluk ", "license": "MIT", @@ -27,7 +27,7 @@ "peerDependencies": { "@angular/common": ">= 6.0.0", "@angular/core": ">= 6.0.0", - "rxjs": "^6.0.0", - "@ngx-resource/core": "^7.0.0" + "@ngx-resource/core": "^7.1.0", + "rxjs": "^6.0.0" } } diff --git a/projects/ngx-resource/handler-ngx-http/src/lib/ResourceModule.ts b/projects/ngx-resource/handler-ngx-http/src/lib/ResourceModule.ts index b69f286..da35da3 100644 --- a/projects/ngx-resource/handler-ngx-http/src/lib/ResourceModule.ts +++ b/projects/ngx-resource/handler-ngx-http/src/lib/ResourceModule.ts @@ -1,12 +1,8 @@ -import { ModuleWithProviders, NgModule, Provider } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; +import { IResourceModuleConfig, ResourceHandler, ResourceModule as ResourceModuleCore } from '@ngx-resource/core'; import { ResourceHandlerHttpClient } from './ResourceHandlerHttpClient'; -export interface IResourceModuleConfig { - handler?: Provider; -} - @NgModule() export class ResourceModule extends ResourceModuleCore { diff --git a/projects/ngx-resource/handler-ngx-http/src/test.ts b/projects/ngx-resource/handler-ngx-http/src/test.ts index 978c64f..c0cbaac 100644 --- a/projects/ngx-resource/handler-ngx-http/src/test.ts +++ b/projects/ngx-resource/handler-ngx-http/src/test.ts @@ -3,10 +3,7 @@ import 'zone.js/dist/zone'; import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: any; diff --git a/proxy.conf.json b/proxy.conf.json new file mode 100644 index 0000000..667c41a --- /dev/null +++ b/proxy.conf.json @@ -0,0 +1,6 @@ +{ + "/api": { + "target": "http://127.0.0.1:3222", + "secure": false + } +} diff --git a/server/node_modules/body-parser/package.json b/server/node_modules/body-parser/package.json new file mode 100644 index 0000000..4174047 --- /dev/null +++ b/server/node_modules/body-parser/package.json @@ -0,0 +1,93 @@ +{ + "_from": "body-parser", + "_id": "body-parser@1.19.0", + "_inBundle": false, + "_integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "_location": "/body-parser", + "_phantomChildren": {}, + "_requested": { + "type": "tag", + "registry": true, + "raw": "body-parser", + "name": "body-parser", + "escapedName": "body-parser", + "rawSpec": "", + "saveSpec": null, + "fetchSpec": "latest" + }, + "_requiredBy": [ + "#USER", + "/", + "/express" + ], + "_resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "_shasum": "96b2709e57c9c4e09a6fd66a8fd979844f69f08a", + "_spec": "body-parser", + "_where": "/Users/troy/Sites/ngx-resource/server", + "bugs": { + "url": "https://github.com/expressjs/body-parser/issues" + }, + "bundleDependencies": false, + "contributors": [ + { + "name": "Douglas Christopher Wilson", + "email": "doug@somethingdoug.com" + }, + { + "name": "Jonathan Ong", + "email": "me@jongleberry.com", + "url": "http://jongleberry.com" + } + ], + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "deprecated": false, + "description": "Node.js body parsing middleware", + "devDependencies": { + "eslint": "5.16.0", + "eslint-config-standard": "12.0.0", + "eslint-plugin-import": "2.17.2", + "eslint-plugin-markdown": "1.0.0", + "eslint-plugin-node": "8.0.1", + "eslint-plugin-promise": "4.1.1", + "eslint-plugin-standard": "4.0.0", + "istanbul": "0.4.5", + "methods": "1.1.2", + "mocha": "6.1.4", + "safe-buffer": "5.1.2", + "supertest": "4.0.2" + }, + "engines": { + "node": ">= 0.8" + }, + "files": [ + "lib/", + "LICENSE", + "HISTORY.md", + "index.js" + ], + "homepage": "https://github.com/expressjs/body-parser#readme", + "license": "MIT", + "name": "body-parser", + "repository": { + "type": "git", + "url": "git+https://github.com/expressjs/body-parser.git" + }, + "scripts": { + "lint": "eslint --plugin markdown --ext js,md .", + "test": "mocha --require test/support/env --reporter spec --check-leaks --bail test/", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/", + "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/" + }, + "version": "1.19.0" +} diff --git a/server/node_modules/express/package.json b/server/node_modules/express/package.json new file mode 100644 index 0000000..c1e2c35 --- /dev/null +++ b/server/node_modules/express/package.json @@ -0,0 +1,154 @@ +{ + "_from": "express", + "_id": "express@4.17.1", + "_inBundle": false, + "_integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "_location": "/express", + "_phantomChildren": {}, + "_requested": { + "type": "tag", + "registry": true, + "raw": "express", + "name": "express", + "escapedName": "express", + "rawSpec": "", + "saveSpec": null, + "fetchSpec": "latest" + }, + "_requiredBy": [ + "#USER", + "/" + ], + "_resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "_shasum": "4491fc38605cf51f8629d39c2b5d026f98a4c134", + "_spec": "express", + "_where": "/Users/troy/Sites/ngx-resource/server", + "author": { + "name": "TJ Holowaychuk", + "email": "tj@vision-media.ca" + }, + "bugs": { + "url": "https://github.com/expressjs/express/issues" + }, + "bundleDependencies": false, + "contributors": [ + { + "name": "Aaron Heckmann", + "email": "aaron.heckmann+github@gmail.com" + }, + { + "name": "Ciaran Jessup", + "email": "ciaranj@gmail.com" + }, + { + "name": "Douglas Christopher Wilson", + "email": "doug@somethingdoug.com" + }, + { + "name": "Guillermo Rauch", + "email": "rauchg@gmail.com" + }, + { + "name": "Jonathan Ong", + "email": "me@jongleberry.com" + }, + { + "name": "Roman Shtylman", + "email": "shtylman+expressjs@gmail.com" + }, + { + "name": "Young Jae Sim", + "email": "hanul@hanul.me" + } + ], + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "deprecated": false, + "description": "Fast, unopinionated, minimalist web framework", + "devDependencies": { + "after": "0.8.2", + "connect-redis": "3.4.1", + "cookie-parser": "~1.4.4", + "cookie-session": "1.3.3", + "ejs": "2.6.1", + "eslint": "2.13.1", + "express-session": "1.16.1", + "hbs": "4.0.4", + "istanbul": "0.4.5", + "marked": "0.6.2", + "method-override": "3.0.0", + "mocha": "5.2.0", + "morgan": "1.9.1", + "multiparty": "4.2.1", + "pbkdf2-password": "1.2.1", + "should": "13.2.3", + "supertest": "3.3.0", + "vhost": "~3.0.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "files": [ + "LICENSE", + "History.md", + "Readme.md", + "index.js", + "lib/" + ], + "homepage": "http://expressjs.com/", + "keywords": [ + "express", + "framework", + "sinatra", + "web", + "rest", + "restful", + "router", + "app", + "api" + ], + "license": "MIT", + "name": "express", + "repository": { + "type": "git", + "url": "git+https://github.com/expressjs/express.git" + }, + "scripts": { + "lint": "eslint .", + "test": "mocha --require test/support/env --reporter spec --bail --check-leaks test/ test/acceptance/", + "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/ test/acceptance/", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/ test/acceptance/", + "test-tap": "mocha --require test/support/env --reporter tap --check-leaks test/ test/acceptance/" + }, + "version": "4.17.1" +} diff --git a/server/node_modules/morgan/package.json b/server/node_modules/morgan/package.json new file mode 100644 index 0000000..2ffbc71 --- /dev/null +++ b/server/node_modules/morgan/package.json @@ -0,0 +1,92 @@ +{ + "_from": "morgan", + "_id": "morgan@1.9.1", + "_inBundle": false, + "_integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", + "_location": "/morgan", + "_phantomChildren": {}, + "_requested": { + "type": "tag", + "registry": true, + "raw": "morgan", + "name": "morgan", + "escapedName": "morgan", + "rawSpec": "", + "saveSpec": null, + "fetchSpec": "latest" + }, + "_requiredBy": [ + "#USER", + "/" + ], + "_resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", + "_shasum": "0a8d16734a1d9afbc824b99df87e738e58e2da59", + "_spec": "morgan", + "_where": "/Users/troy/Sites/ngx-resource/server", + "bugs": { + "url": "https://github.com/expressjs/morgan/issues" + }, + "bundleDependencies": false, + "contributors": [ + { + "name": "Douglas Christopher Wilson", + "email": "doug@somethingdoug.com" + }, + { + "name": "Jonathan Ong", + "email": "me@jongleberry.com", + "url": "http://jongleberry.com" + } + ], + "dependencies": { + "basic-auth": "~2.0.0", + "debug": "2.6.9", + "depd": "~1.1.2", + "on-finished": "~2.3.0", + "on-headers": "~1.0.1" + }, + "deprecated": false, + "description": "HTTP request logger middleware for node.js", + "devDependencies": { + "eslint": "5.5.0", + "eslint-config-standard": "12.0.0", + "eslint-plugin-import": "2.14.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "7.0.1", + "eslint-plugin-promise": "4.0.1", + "eslint-plugin-standard": "4.0.0", + "istanbul": "0.4.5", + "mocha": "2.5.3", + "split": "1.0.1", + "supertest": "1.1.0" + }, + "engines": { + "node": ">= 0.8.0" + }, + "files": [ + "LICENSE", + "HISTORY.md", + "README.md", + "index.js" + ], + "homepage": "https://github.com/expressjs/morgan#readme", + "keywords": [ + "express", + "http", + "logger", + "middleware" + ], + "license": "MIT", + "name": "morgan", + "repository": { + "type": "git", + "url": "git+https://github.com/expressjs/morgan.git" + }, + "scripts": { + "lint": "eslint --plugin markdown --ext js,md .", + "test": "mocha --check-leaks --reporter spec --bail", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks --reporter dot", + "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --check-leaks --reporter spec" + }, + "version": "1.9.1" +} diff --git a/server/package-lock.json b/server/package-lock.json new file mode 100644 index 0000000..44f65ec --- /dev/null +++ b/server/package-lock.json @@ -0,0 +1,399 @@ +{ + "name": "server", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + } + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ipaddr.js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } + }, + "morgan": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", + "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", + "requires": { + "basic-auth": "~2.0.0", + "debug": "2.6.9", + "depd": "~1.1.2", + "on-finished": "~2.3.0", + "on-headers": "~1.0.1" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "proxy-addr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.0" + } + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } + } + }, + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + } + } +} diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..096c3e9 --- /dev/null +++ b/server/package.json @@ -0,0 +1,16 @@ +{ + "name": "server", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "body-parser": "^1.19.0", + "express": "^4.17.1", + "morgan": "^1.9.1" + } +} diff --git a/src/app/app.component.html b/src/app/app.component.html index 5226d57..3065163 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,20 +1,2 @@ - -
-

- Welcome to {{ title }}! -

- Angular Logo -
-

Here are some links to help you start:

- + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 26a52aa..d3d64a8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,5 +6,5 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - title = 'ngx-resource-mono'; + } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f657163..3070a73 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,13 +2,19 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; +import { HttpClientModule } from '@angular/common/http'; +import { ResourceModule } from '@ngx-resource/handler-ngx-http'; +import { CrudObsTestComponent } from './components/crud-obs-test/crud-obs-test.component'; @NgModule({ declarations: [ - AppComponent + AppComponent, + CrudObsTestComponent ], imports: [ - BrowserModule + BrowserModule, + HttpClientModule, + ResourceModule.forRoot() ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/components/crud-obs-test/crud-obs-test.component.html b/src/app/components/crud-obs-test/crud-obs-test.component.html new file mode 100644 index 0000000..f3d7a21 --- /dev/null +++ b/src/app/components/crud-obs-test/crud-obs-test.component.html @@ -0,0 +1,20 @@ +

crud-obs-test tests!

+ + + + + + + + + + + + + +
MethodRes Async
QueryLoaded {{list.length}}
Get OneLoaded {{one.title}}
+ + + + Loading stuff... + diff --git a/src/app/components/crud-obs-test/crud-obs-test.component.scss b/src/app/components/crud-obs-test/crud-obs-test.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/crud-obs-test/crud-obs-test.component.spec.ts b/src/app/components/crud-obs-test/crud-obs-test.component.spec.ts new file mode 100644 index 0000000..c12ecba --- /dev/null +++ b/src/app/components/crud-obs-test/crud-obs-test.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CrudObsTestComponent } from './crud-obs-test.component'; + +describe('CrudObsTestComponent', () => { + let component: CrudObsTestComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CrudObsTestComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CrudObsTestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/crud-obs-test/crud-obs-test.component.ts b/src/app/components/crud-obs-test/crud-obs-test.component.ts new file mode 100644 index 0000000..def6b91 --- /dev/null +++ b/src/app/components/crud-obs-test/crud-obs-test.component.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { CrudObsTestResource } from '../../resources/crud-obs-test/crud-obs-test.resource'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'app-crud-obs-test', + templateUrl: './crud-obs-test.component.html', + styleUrls: ['./crud-obs-test.component.scss'] +}) +export class CrudObsTestComponent implements OnInit { + + query$: Observable; + getOne$: Observable; + + constructor(private testResource: CrudObsTestResource) { + this.query$ = this.testResource.query(); + this.getOne$ = this.testResource.get({id: Math.ceil(Math.random() * 50)}); + } + + ngOnInit() { + + } + +} diff --git a/src/app/resources/crud-obs-test/crud-obs-test.resource.spec.ts b/src/app/resources/crud-obs-test/crud-obs-test.resource.spec.ts new file mode 100644 index 0000000..d322803 --- /dev/null +++ b/src/app/resources/crud-obs-test/crud-obs-test.resource.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { CrudObsTestResource } from './crud-obs-test.resource'; + +describe('CrudObsTestResource', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: CrudObsTestResource = TestBed.get(CrudObsTestResource); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/resources/crud-obs-test/crud-obs-test.resource.ts b/src/app/resources/crud-obs-test/crud-obs-test.resource.ts new file mode 100644 index 0000000..33f16c5 --- /dev/null +++ b/src/app/resources/crud-obs-test/crud-obs-test.resource.ts @@ -0,0 +1,12 @@ +import { Injectable } from '@angular/core'; +import { ResourceCRUDObservable, ResourceParams } from '@ngx-resource/core'; + +@Injectable({ + providedIn: 'root' +}) +@ResourceParams({ + pathPrefix: '/api/crud-test' +}) +export class CrudObsTestResource extends ResourceCRUDObservable { + +} diff --git a/src/styles.scss b/src/styles.scss index 90d4ee0..74415bd 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1 +1,19 @@ /* You can add global styles to this file, and also import other style files */ + +table { + + tr.deleted td { + background: rgba(255, 0, 0, 0.46); + } + + + + th,td { + border: 1px solid #000; + + &.yes { + background: green; + font-weight: bold; + } + } +}