Merge pull request #1 from mandos21/refactor

refactor

app/__init__.py

@@ -5,13 +5,13 @@
 from mongoengine import connect
 from werkzeug.exceptions import HTTPException
 
-from app.controllers.auth_controller import auth_bp
-from app.controllers.encounter_controller import encounter_bp
-from app.controllers.item_controller import item_bp
-from app.controllers.roll_controller import roll_bp
-from app.controllers.rolltable_controller import rolltable_bp
-from app.controllers.room_controller import room_bp
-from app.controllers.user_controller import user_bp
+from app.views.auth import auth_bp
+from app.views.encounter import encounter_bp
+from app.views.item import item_bp
+from app.views.roll import roll_bp
+from app.views.rolltable import rolltable_bp
+from app.views.room import room_bp
+from app.views.user import user_bp
 from app.utils.json_provider import CustomJSONProvider
 from config.settings import settings
 

tests/controllers/test_encounter_controller.py → tests/views/test_encounter.py

@@ -1,6 +1,6 @@
 import unittest
 from app.models.encounter import Encounter
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class EncounterControllerTestCase(ControllerTestBase):

tests/controllers/test_item_controller.py → tests/views/test_item.py

@@ -1,7 +1,7 @@
 import unittest
 
 from app.models.item import Item
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class ItemControllerTestCase(ControllerTestBase):

tests/controllers/test_rolltable_controller.py → tests/views/test_rolltable.py

@@ -2,7 +2,7 @@
 
 from app.models.item import Item
 from app.models.rolltable import RollTable
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class RollTableControllerTestCase(ControllerTestBase):

tests/controllers/test_room_controller.py → tests/views/test_room.py

@@ -1,6 +1,6 @@
 import unittest
 from app.models.room import Room
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class RoomControllerTestCase(ControllerTestBase):

tests/controllers/test_user_controller.py → tests/views/test_user.py

@@ -3,7 +3,7 @@
 
 from app.models.item import Item
 from app.models.user import User
-from tests.controllers.controller_test_base import ControllerTestBase
+from tests.views.test_view_base import ControllerTestBase
 
 
 class UserControllerTestCase(ControllerTestBase):