From 820e57f5552eb89f24865d42dae6e0ab67c7b5de Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 19 Jul 2017 14:06:43 +0900 Subject: [PATCH] ing --- package.json | 1 - src/ts/@overflow/app/index.tsx | 16 ++++++++-------- src/ts/@overflow/app/router/index.tsx | 4 ++-- .../app/views/member/{Signin.tsx => SignIn.tsx} | 4 ++-- .../views/member/{Signout.tsx => SignOut.tsx} | 0 .../app/views/member/{Signup.tsx => SignUp.tsx} | 0 src/ts/@overflow/commons/api/Service.ts | 3 ++- src/ts/@overflow/commons/context/inject.ts | 14 +++++--------- src/ts/@overflow/commons/context/injectable.ts | 2 ++ .../member/api/service/MemberService.ts | 4 ++-- tsconfig.json | 8 ++++---- 11 files changed, 27 insertions(+), 29 deletions(-) rename src/ts/@overflow/app/views/member/{Signin.tsx => SignIn.tsx} (73%) rename src/ts/@overflow/app/views/member/{Signout.tsx => SignOut.tsx} (100%) rename src/ts/@overflow/app/views/member/{Signup.tsx => SignUp.tsx} (100%) diff --git a/package.json b/package.json index a236854..b13c904 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "@types/react-redux": "^4.4.45", "@types/react-router": "^4.0.12", "@types/react-router-dom": "^4.0.5", - "@types/react-router-redux": "^5.0.3", "@types/react-tap-event-plugin": "^0.0.30", "@types/redux": "^3.6.0", "awesome-typescript-loader": "^3.1.3", diff --git a/src/ts/@overflow/app/index.tsx b/src/ts/@overflow/app/index.tsx index 1209df4..8ea2c4d 100644 --- a/src/ts/@overflow/app/index.tsx +++ b/src/ts/@overflow/app/index.tsx @@ -34,14 +34,14 @@ function* app(): any { sagaMiddleware.run(sagas); - ReactDOM.render( - - - {routes} - - , - appContainer, - ); + // ReactDOM.render( + // + // + // {routes} + // + // , + // appContainer, + // ); } sagaMiddleware.run(app); diff --git a/src/ts/@overflow/app/router/index.tsx b/src/ts/@overflow/app/router/index.tsx index 89683a9..8de59b7 100644 --- a/src/ts/@overflow/app/router/index.tsx +++ b/src/ts/@overflow/app/router/index.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { Route, Switch } from 'react-router-dom'; -import Signin from '../views/member/Signin'; +import SignIn from '../views/member/SignIn'; const routes = ( - + diff --git a/src/ts/@overflow/app/views/member/Signin.tsx b/src/ts/@overflow/app/views/member/SignIn.tsx similarity index 73% rename from src/ts/@overflow/app/views/member/Signin.tsx rename to src/ts/@overflow/app/views/member/SignIn.tsx index 6c14708..79f2073 100644 --- a/src/ts/@overflow/app/views/member/Signin.tsx +++ b/src/ts/@overflow/app/views/member/SignIn.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import { RouteComponentProps } from 'react-router'; -import SigninContainer from '@overflow/member/react/Signin'; +import SignInContainer from '@overflow/member/react/SignIn'; class Signin extends React.Component, object> { public render(): JSX.Element { return ( - + ); } } diff --git a/src/ts/@overflow/app/views/member/Signout.tsx b/src/ts/@overflow/app/views/member/SignOut.tsx similarity index 100% rename from src/ts/@overflow/app/views/member/Signout.tsx rename to src/ts/@overflow/app/views/member/SignOut.tsx diff --git a/src/ts/@overflow/app/views/member/Signup.tsx b/src/ts/@overflow/app/views/member/SignUp.tsx similarity index 100% rename from src/ts/@overflow/app/views/member/Signup.tsx rename to src/ts/@overflow/app/views/member/SignUp.tsx diff --git a/src/ts/@overflow/commons/api/Service.ts b/src/ts/@overflow/commons/api/Service.ts index 5061f67..5349fc6 100644 --- a/src/ts/@overflow/commons/api/Service.ts +++ b/src/ts/@overflow/commons/api/Service.ts @@ -1,4 +1,4 @@ -import { inject } from 'inversify'; +import inject from '../context/inject'; import WebSocketRPC from '../websocket/WebSocketRPC'; abstract class Service { @@ -7,6 +7,7 @@ abstract class Service { private name: string; protected constructor(name: string) { this.name = name; + } protected send(methodName: string, ...params: any[]): Promise { diff --git a/src/ts/@overflow/commons/context/inject.ts b/src/ts/@overflow/commons/context/inject.ts index 86e984b..a5ae2ad 100644 --- a/src/ts/@overflow/commons/context/inject.ts +++ b/src/ts/@overflow/commons/context/inject.ts @@ -2,14 +2,10 @@ import * as METADATA from './constants'; -function inject(): PropertyDecorator | ParameterDecorator { +const inject = (type: TFunction) => { return (target: Object, propertyKey: string | symbol, parameterIndex?: number): void => { - let metadata = new Metadata(METADATA.INJECT_TAG, serviceIdentifier); - - if (typeof parameterIndex === 'number') { - tagParameter(target, propertyKey, parameterIndex, metadata); - } else { - tagProperty(target, propertyKey, metadata); - } + console.log(''); }; -} +}; + +export default inject; diff --git a/src/ts/@overflow/commons/context/injectable.ts b/src/ts/@overflow/commons/context/injectable.ts index bae8e42..e555504 100644 --- a/src/ts/@overflow/commons/context/injectable.ts +++ b/src/ts/@overflow/commons/context/injectable.ts @@ -13,3 +13,5 @@ function injectable(): ClassDecorator { return target; }; } + +export default injectable; diff --git a/src/ts/@overflow/member/api/service/MemberService.ts b/src/ts/@overflow/member/api/service/MemberService.ts index fe7fb06..5554eda 100644 --- a/src/ts/@overflow/member/api/service/MemberService.ts +++ b/src/ts/@overflow/member/api/service/MemberService.ts @@ -1,10 +1,10 @@ import Service from '@overflow/commons/api/Service'; import Member from '../model/Member'; -// import service from '@overflow/commons/context/decorator/service'; +import injectable from '@overflow/commons/context/injectable'; -@service() +@injectable() export class MemberService extends Service { public constructor() { diff --git a/tsconfig.json b/tsconfig.json index bc72581..297556d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "allowSyntheticDefaultImports": true, - "baseUrl": "./src/ts", + "baseUrl": "src/ts", "declaration": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, @@ -10,7 +10,7 @@ "dom", "es6" ], - "module": "umd", + "module": "commonjs", "moduleResolution": "node", "newLine": "LF", "noImplicitAny": false, @@ -28,6 +28,7 @@ "node_modules/@types", "types" ] + }, "include": [ "src/ts/**/*" @@ -36,7 +37,6 @@ "build", "config", "node_modules", - "public", - "types" + "public" ] }