Issue 12, move parte do django (backend) para uma pasta separada, ass…

…im na raiz fica apenas coisas fora do backend.
huogerac · Nov 6, 2022 · 53f4cc5 · 53f4cc5
1 parent 44a42b5
commit 53f4cc5
Show file tree

Hide file tree

Showing 28 changed files with 26 additions and 21 deletions.
diff --git a/meta.js b/meta.js
@@ -16,7 +16,8 @@ module.exports = {
   // "completeMessage": "{{#inPlace}}To get started:\n\n  npm install\n  npm run dev.{{else}}To get started:\n\n  cd {{destDirName}}\n  npm install\n  npm run dev.{{/inPlace}}",
   "complete": function (data, {logger, chalk}) {
     const base = data.inPlace ? '' : data.destDirName + '/'
-    fs.rename(`${base}__name__`, `${base}${data.name}`, onerror)
+    fs.rename(`${base}{{name}}/{{name}}`, `${base}{{name}}/${data.name}`, onerror)
+    fs.rename(`${base}{{name}}`, `${base}${data.name}`, onerror)
     cmds = data.inPlace ? '' : `cd ${data.destDirName}\n  `
     cmds += `follow the instructions on README.md
   (or see https://github.com/evolutio/djavue/blob/master/template/README.md)`

diff --git a/template/manage.py b/template/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{name}}.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{name}}.{{name}}.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

diff --git a/template/setup.cfg b/template/setup.cfg
@@ -1,5 +1,5 @@
 [tool:pytest]
-DJANGO_SETTINGS_MODULE = {{ name }}.settings
+DJANGO_SETTINGS_MODULE = {{name}}.{{ name }}.settings
 python_files = tests.py test_*.py *_tests.py
 addopts = -x -vv
 

diff --git a/template/uwsgi.ini b/template/uwsgi.ini
@@ -1,8 +1,8 @@
 [uwsgi]
 
-env = DJANGO_SETTINGS_MODULE={{name}}.settings
+env = DJANGO_SETTINGS_MODULE={{name}}.{{name}}.settings
 chdir           = /app
-module          = {{name}}.wsgi
+module          = {{name}}.{{name}}.wsgi
 master          = true
 processes       = 3
 http            = :8000

diff --git a/template/__name__/__init__.py → template/{{name}}/commons/__init__.py b/template/__name__/__init__.py → template/{{name}}/commons/__init__.py
diff --git a/template/commons/bunch.py → template/{{name}}/commons/bunch.py b/template/commons/bunch.py → template/{{name}}/commons/bunch.py
diff --git a/template/commons/dateutils.py → template/{{name}}/commons/dateutils.py b/template/commons/dateutils.py → template/{{name}}/commons/dateutils.py
diff --git a/template/commons/django_views_utils.py → ...te/{{name}}/commons/django_views_utils.py b/template/commons/django_views_utils.py → ...te/{{name}}/commons/django_views_utils.py
diff --git a/template/commons/__init__.py → template/{{name}}/core/__init__.py b/template/commons/__init__.py → template/{{name}}/core/__init__.py
diff --git a/template/core/admin.py → template/{{name}}/core/admin.py b/template/core/admin.py → template/{{name}}/core/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from core.models import ActivityLog, Todo
+from .models import ActivityLog, Todo
 
 
 class ActivityLogAdmin(admin.ModelAdmin):

diff --git a/template/core/apps.py → template/{{name}}/core/apps.py b/template/core/apps.py → template/{{name}}/core/apps.py
@@ -3,4 +3,4 @@
 
 class CoreConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'core'
+    name = '{{name}}.core'
diff --git a/template/core/migrations/0001_initial.py → .../{{name}}/core/migrations/0001_initial.py b/template/core/migrations/0001_initial.py → .../{{name}}/core/migrations/0001_initial.py
diff --git a/template/core/migrations/0002_todo.py → ...ate/{{name}}/core/migrations/0002_todo.py b/template/core/migrations/0002_todo.py → ...ate/{{name}}/core/migrations/0002_todo.py
diff --git a/template/core/__init__.py → ...late/{{name}}/core/migrations/__init__.py b/template/core/__init__.py → ...late/{{name}}/core/migrations/__init__.py
diff --git a/template/core/models.py → template/{{name}}/core/models.py b/template/core/models.py → template/{{name}}/core/models.py
diff --git a/template/core/migrations/__init__.py → template/{{name}}/core/service/__init__.py b/template/core/migrations/__init__.py → template/{{name}}/core/service/__init__.py
diff --git a/template/core/service/log_svc.py → template/{{name}}/core/service/log_svc.py b/template/core/service/log_svc.py → template/{{name}}/core/service/log_svc.py
@@ -1,6 +1,7 @@
-from core.models import ActivityLog
+from ..models import ActivityLog
 import json
 
+
 def log_login(user):
     logs = ActivityLog(
         type='login',

diff --git a/template/core/service/todo_svc.py → template/{{name}}/core/service/todo_svc.py b/template/core/service/todo_svc.py → template/{{name}}/core/service/todo_svc.py
@@ -1,4 +1,5 @@
-from core.models import Todo
+from ..models import Todo
+
 
 def add_todo(new_task):
     todo = Todo(description=new_task)

diff --git a/template/core/service/__init__.py → template/{{name}}/core/tests/__init__.py b/template/core/service/__init__.py → template/{{name}}/core/tests/__init__.py
diff --git a/template/core/tests/fixtures.py → template/{{name}}/core/tests/fixtures.py b/template/core/tests/fixtures.py → template/{{name}}/core/tests/fixtures.py
@@ -1,4 +1,4 @@
-from core.models import User
+from {{name}}.core.models import User
 
 
 def user_jon():

diff --git a/template/core/tests/test_auth_api.py → ...late/{{name}}/core/tests/test_auth_api.py b/template/core/tests/test_auth_api.py → ...late/{{name}}/core/tests/test_auth_api.py
@@ -1,5 +1,5 @@
-from core.models import User
-from core.tests import fixtures
+from {{name}}.core.models import User
+from . import fixtures
 
 
 def test_deve_retornar_usuario_nao_logado(client):

diff --git a/template/core/tests/test_todos.py → template/{{name}}/core/tests/test_todos.py b/template/core/tests/test_todos.py → template/{{name}}/core/tests/test_todos.py
@@ -1,5 +1,5 @@
-from core.models import User, Todo
-from core.tests import fixtures
+from {{name}}.core.models import User, Todo
+from . import fixtures
 
 
 def test_criar_tarefa_sem_login(client):

diff --git a/template/core/urls.py → template/{{name}}/core/urls.py b/template/core/urls.py → template/{{name}}/core/urls.py
diff --git a/template/core/views.py → template/{{name}}/core/views.py b/template/core/views.py → template/{{name}}/core/views.py
@@ -1,11 +1,13 @@
 # coding: utf-8
 import json
+
 from django.http import HttpResponse, JsonResponse
 from django.contrib import auth
-from commons.django_views_utils import ajax_login_required
-from core.service import log_svc, todo_svc
 from django.views.decorators.csrf import csrf_exempt
 
+from ..commons.django_views_utils import ajax_login_required
+from .service import log_svc, todo_svc
+
 
 def dapau(request):
     raise Exception('break on purpose')

diff --git a/template/core/tests/__init__.py → template/{{name}}/{{name}}/__init__.py b/template/core/tests/__init__.py → template/{{name}}/{{name}}/__init__.py
diff --git a/template/__name__/settings.py → template/{{name}}/{{name}}/settings.py b/template/__name__/settings.py → template/{{name}}/{{name}}/settings.py
@@ -51,7 +51,7 @@
 ]
 
 LOCAL_APPS = [
-    'core',
+    '{{name}}.core',
 ]
 
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
@@ -66,7 +66,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = '{{name}}.urls'
+ROOT_URLCONF = '{{name}}.{{name}}.urls'
 
 TEMPLATES = [
     {
@@ -84,7 +84,7 @@
     },
 ]
 
-WSGI_APPLICATION = '{{name}}.wsgi.application'
+WSGI_APPLICATION = '{{name}}.{{name}}.wsgi.application'
 
 
 # Database

diff --git a/template/__name__/urls.py → template/{{name}}/{{name}}/urls.py b/template/__name__/urls.py → template/{{name}}/{{name}}/urls.py
@@ -19,5 +19,5 @@
 urlpatterns = [
     path('admin/', admin.site.urls),
     # path('explorer/', include('explorer.urls')),
-    path('api/', include('core.urls')),
+    path('api/', include('{{name}}.core.urls')),
 ]
diff --git a/template/__name__/wsgi.py → template/{{name}}/{{name}}/wsgi.py b/template/__name__/wsgi.py → template/{{name}}/{{name}}/wsgi.py
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{name}}.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{name}}.{{name}}.settings")
 
 application = get_wsgi_application()