change api dir

Author: zhangjie

api/app.py

@@ -17,10 +17,10 @@ def create_app():
     Config.init_app(app)
     db.init_app(app)
 
-    from .auth import api_auth as auth_blueprint
+    from .resources.auth import api_auth as auth_blueprint
     app.register_blueprint(auth_blueprint, url_prefix='/api')
 
-    from .users import api_user as user_blueprint
+    from .resources.users import api_user as user_blueprint
     app.register_blueprint(user_blueprint, url_prefix='/api')
 
     return app

api/auth/common/__init__.py api/resources/__init__.pyapi/auth/common/__init__.py renamed to api/resources/__init__.py

@@ -1,7 +1,7 @@
 from flask import Blueprint
-from ..app import api
-from .resources.login import LoginApi
-from .resources.logout import LogOutApi
+from api.app import api
+from .login import LoginApi
+from .logout import LogOutApi
 
 api_auth = Blueprint('auth', __name__)
 

api/auth/__init__.py api/resources/auth/__init__.pyapi/auth/__init__.py renamed to api/resources/auth/__init__.py

@@ -3,7 +3,7 @@
 from api.auth_token import token_auth
 from api.errors import *
 
-from .resources.users import User
+from .users import User
 
 api_user = Blueprint('users', __name__)
 

api/auth/resources/login.py api/resources/auth/login.pyapi/auth/resources/login.py renamed to api/resources/auth/login.py

@@ -1,4 +1,5 @@
 from flask_restful import fields, marshal_with, reqparse, Resource
+from api.models import User as UM
 
 
 def valid_email(str):
@@ -16,17 +17,17 @@ def email(email_str):
 post_parser = reqparse.RequestParser()
 post_parser.add_argument(
     'username', dest='username',
-    location='form', required=True,
+    location='json', required=True,
     help='The user\'s username',
 )
 post_parser.add_argument(
     'email', dest='email',
-    type=email, location='form',
+    type=email, location='json',
     required=True, help='The user\'s email',
 )
 post_parser.add_argument(
     'user_priority', dest='user_priority',
-    type=int, location='form',
+    type=int, location='json',
     default=1, choices=range(5), help='The user\'s priority',
 )
 
@@ -44,15 +45,22 @@ def email(email_str):
     }),
 }
 
+user_f = {
+    'username': fields.String,
+    'uri': fields.Url()
+}
+
 
 class User(Resource):
 
-    @marshal_with(user_fields)
+    @marshal_with(user_f)
     def post(self):
         args = post_parser.parse_args()
         # user = create_user(args.username, args.email, args.user_priority)
         print(args)
-        return {}
+        user = UM.query.first()
+        return user
 
+    @marshal_with(user_f)
     def get(self):
-        print('ok')
+        return {}