From 40b6ce3bb6ca5067fbe0c5880d518f24edea861e Mon Sep 17 00:00:00 2001 From: Alexander Ryabtsev Date: Fri, 22 Mar 2019 16:46:39 +0200 Subject: [PATCH] Move backend to api directory --- project_template/_base/{ => api}/.env | 0 project_template/_base/{ => api}/Makefile | 0 project_template/_base/{ => api}/Pipfile | 0 project_template/_base/{ => api}/manage.py | 0 project_template/_base/{ => api}/project_name/__init__.py | 0 .../_base/{ => api}/project_name/apps/__init__.py | 0 .../_base/{ => api}/project_name/apps/account/__init__.py | 0 .../_base/{ => api}/project_name/apps/account/admin.py | 0 .../_base/{ => api}/project_name/apps/account/apps.py | 0 .../_base/{ => api}/project_name/apps/account/forms.py | 0 .../_base/{ => api}/project_name/apps/account/managers.py | 0 .../project_name/apps/account/migrations/0001_initial.py | 0 .../project_name/apps/account/migrations/__init__.py | 0 .../_base/{ => api}/project_name/apps/account/models.py | 0 .../_base/{ => api}/project_name/apps/common/__init__.py | 0 .../_base/{ => api}/project_name/apps/common/apps.py | 0 .../project_name/apps/common/management/__init__.py | 0 .../project_name/apps/common/management/commands/__init__.py | 0 .../apps/common/management/commands/generate_secretkey.py | 0 .../project_name/apps/common/management/commands/startapp.py | 0 .../{ => api}/project_name/apps/common/models/__init__.py | 0 .../_base/{ => api}/project_name/apps/common/models/core.py | 0 .../_base/{ => api}/project_name/settings/__init__.py | 0 .../_base/{ => api}/project_name/settings/contrib.py | 0 .../_base/{ => api}/project_name/settings/django.py | 0 .../_base/{ => api}/project_name/settings/environment.py | 0 .../_base/{ => api}/project_name/settings/project_name.py | 0 project_template/_base/{ => api}/project_name/urls.py | 0 project_template/_base/{ => api}/project_name/wsgi.py | 0 project_template/_base/{pylava.ini => api/pylama.ini} | 2 +- project_template/_base/{ => api}/pytest.ini | 0 project_template/_celery/{ => api}/project_name/celery.py | 0 .../_celery/{ => api}/project_name/settings/contrib.py | 0 startproject | 5 +++-- 34 files changed, 4 insertions(+), 3 deletions(-) rename project_template/_base/{ => api}/.env (100%) rename project_template/_base/{ => api}/Makefile (100%) rename project_template/_base/{ => api}/Pipfile (100%) rename project_template/_base/{ => api}/manage.py (100%) rename project_template/_base/{ => api}/project_name/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/admin.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/apps.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/forms.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/managers.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/migrations/0001_initial.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/migrations/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/account/models.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/apps.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/management/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/management/commands/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/management/commands/generate_secretkey.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/management/commands/startapp.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/models/__init__.py (100%) rename project_template/_base/{ => api}/project_name/apps/common/models/core.py (100%) rename project_template/_base/{ => api}/project_name/settings/__init__.py (100%) rename project_template/_base/{ => api}/project_name/settings/contrib.py (100%) rename project_template/_base/{ => api}/project_name/settings/django.py (100%) rename project_template/_base/{ => api}/project_name/settings/environment.py (100%) rename project_template/_base/{ => api}/project_name/settings/project_name.py (100%) rename project_template/_base/{ => api}/project_name/urls.py (100%) rename project_template/_base/{ => api}/project_name/wsgi.py (100%) rename project_template/_base/{pylava.ini => api/pylama.ini} (86%) rename project_template/_base/{ => api}/pytest.ini (100%) rename project_template/_celery/{ => api}/project_name/celery.py (100%) rename project_template/_celery/{ => api}/project_name/settings/contrib.py (100%) diff --git a/project_template/_base/.env b/project_template/_base/api/.env similarity index 100% rename from project_template/_base/.env rename to project_template/_base/api/.env diff --git a/project_template/_base/Makefile b/project_template/_base/api/Makefile similarity index 100% rename from project_template/_base/Makefile rename to project_template/_base/api/Makefile diff --git a/project_template/_base/Pipfile b/project_template/_base/api/Pipfile similarity index 100% rename from project_template/_base/Pipfile rename to project_template/_base/api/Pipfile diff --git a/project_template/_base/manage.py b/project_template/_base/api/manage.py similarity index 100% rename from project_template/_base/manage.py rename to project_template/_base/api/manage.py diff --git a/project_template/_base/project_name/__init__.py b/project_template/_base/api/project_name/__init__.py similarity index 100% rename from project_template/_base/project_name/__init__.py rename to project_template/_base/api/project_name/__init__.py diff --git a/project_template/_base/project_name/apps/__init__.py b/project_template/_base/api/project_name/apps/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/__init__.py rename to project_template/_base/api/project_name/apps/__init__.py diff --git a/project_template/_base/project_name/apps/account/__init__.py b/project_template/_base/api/project_name/apps/account/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/account/__init__.py rename to project_template/_base/api/project_name/apps/account/__init__.py diff --git a/project_template/_base/project_name/apps/account/admin.py b/project_template/_base/api/project_name/apps/account/admin.py similarity index 100% rename from project_template/_base/project_name/apps/account/admin.py rename to project_template/_base/api/project_name/apps/account/admin.py diff --git a/project_template/_base/project_name/apps/account/apps.py b/project_template/_base/api/project_name/apps/account/apps.py similarity index 100% rename from project_template/_base/project_name/apps/account/apps.py rename to project_template/_base/api/project_name/apps/account/apps.py diff --git a/project_template/_base/project_name/apps/account/forms.py b/project_template/_base/api/project_name/apps/account/forms.py similarity index 100% rename from project_template/_base/project_name/apps/account/forms.py rename to project_template/_base/api/project_name/apps/account/forms.py diff --git a/project_template/_base/project_name/apps/account/managers.py b/project_template/_base/api/project_name/apps/account/managers.py similarity index 100% rename from project_template/_base/project_name/apps/account/managers.py rename to project_template/_base/api/project_name/apps/account/managers.py diff --git a/project_template/_base/project_name/apps/account/migrations/0001_initial.py b/project_template/_base/api/project_name/apps/account/migrations/0001_initial.py similarity index 100% rename from project_template/_base/project_name/apps/account/migrations/0001_initial.py rename to project_template/_base/api/project_name/apps/account/migrations/0001_initial.py diff --git a/project_template/_base/project_name/apps/account/migrations/__init__.py b/project_template/_base/api/project_name/apps/account/migrations/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/account/migrations/__init__.py rename to project_template/_base/api/project_name/apps/account/migrations/__init__.py diff --git a/project_template/_base/project_name/apps/account/models.py b/project_template/_base/api/project_name/apps/account/models.py similarity index 100% rename from project_template/_base/project_name/apps/account/models.py rename to project_template/_base/api/project_name/apps/account/models.py diff --git a/project_template/_base/project_name/apps/common/__init__.py b/project_template/_base/api/project_name/apps/common/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/common/__init__.py rename to project_template/_base/api/project_name/apps/common/__init__.py diff --git a/project_template/_base/project_name/apps/common/apps.py b/project_template/_base/api/project_name/apps/common/apps.py similarity index 100% rename from project_template/_base/project_name/apps/common/apps.py rename to project_template/_base/api/project_name/apps/common/apps.py diff --git a/project_template/_base/project_name/apps/common/management/__init__.py b/project_template/_base/api/project_name/apps/common/management/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/common/management/__init__.py rename to project_template/_base/api/project_name/apps/common/management/__init__.py diff --git a/project_template/_base/project_name/apps/common/management/commands/__init__.py b/project_template/_base/api/project_name/apps/common/management/commands/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/common/management/commands/__init__.py rename to project_template/_base/api/project_name/apps/common/management/commands/__init__.py diff --git a/project_template/_base/project_name/apps/common/management/commands/generate_secretkey.py b/project_template/_base/api/project_name/apps/common/management/commands/generate_secretkey.py similarity index 100% rename from project_template/_base/project_name/apps/common/management/commands/generate_secretkey.py rename to project_template/_base/api/project_name/apps/common/management/commands/generate_secretkey.py diff --git a/project_template/_base/project_name/apps/common/management/commands/startapp.py b/project_template/_base/api/project_name/apps/common/management/commands/startapp.py similarity index 100% rename from project_template/_base/project_name/apps/common/management/commands/startapp.py rename to project_template/_base/api/project_name/apps/common/management/commands/startapp.py diff --git a/project_template/_base/project_name/apps/common/models/__init__.py b/project_template/_base/api/project_name/apps/common/models/__init__.py similarity index 100% rename from project_template/_base/project_name/apps/common/models/__init__.py rename to project_template/_base/api/project_name/apps/common/models/__init__.py diff --git a/project_template/_base/project_name/apps/common/models/core.py b/project_template/_base/api/project_name/apps/common/models/core.py similarity index 100% rename from project_template/_base/project_name/apps/common/models/core.py rename to project_template/_base/api/project_name/apps/common/models/core.py diff --git a/project_template/_base/project_name/settings/__init__.py b/project_template/_base/api/project_name/settings/__init__.py similarity index 100% rename from project_template/_base/project_name/settings/__init__.py rename to project_template/_base/api/project_name/settings/__init__.py diff --git a/project_template/_base/project_name/settings/contrib.py b/project_template/_base/api/project_name/settings/contrib.py similarity index 100% rename from project_template/_base/project_name/settings/contrib.py rename to project_template/_base/api/project_name/settings/contrib.py diff --git a/project_template/_base/project_name/settings/django.py b/project_template/_base/api/project_name/settings/django.py similarity index 100% rename from project_template/_base/project_name/settings/django.py rename to project_template/_base/api/project_name/settings/django.py diff --git a/project_template/_base/project_name/settings/environment.py b/project_template/_base/api/project_name/settings/environment.py similarity index 100% rename from project_template/_base/project_name/settings/environment.py rename to project_template/_base/api/project_name/settings/environment.py diff --git a/project_template/_base/project_name/settings/project_name.py b/project_template/_base/api/project_name/settings/project_name.py similarity index 100% rename from project_template/_base/project_name/settings/project_name.py rename to project_template/_base/api/project_name/settings/project_name.py diff --git a/project_template/_base/project_name/urls.py b/project_template/_base/api/project_name/urls.py similarity index 100% rename from project_template/_base/project_name/urls.py rename to project_template/_base/api/project_name/urls.py diff --git a/project_template/_base/project_name/wsgi.py b/project_template/_base/api/project_name/wsgi.py similarity index 100% rename from project_template/_base/project_name/wsgi.py rename to project_template/_base/api/project_name/wsgi.py diff --git a/project_template/_base/pylava.ini b/project_template/_base/api/pylama.ini similarity index 86% rename from project_template/_base/pylava.ini rename to project_template/_base/api/pylama.ini index fc8046c..cf253be 100644 --- a/project_template/_base/pylava.ini +++ b/project_template/_base/api/pylama.ini @@ -8,4 +8,4 @@ max_line_length = 120 [pylava:pylint] max_line_length = 120 -load-plugins = pylint_django +load-plugins = pylint_django \ No newline at end of file diff --git a/project_template/_base/pytest.ini b/project_template/_base/api/pytest.ini similarity index 100% rename from project_template/_base/pytest.ini rename to project_template/_base/api/pytest.ini diff --git a/project_template/_celery/project_name/celery.py b/project_template/_celery/api/project_name/celery.py similarity index 100% rename from project_template/_celery/project_name/celery.py rename to project_template/_celery/api/project_name/celery.py diff --git a/project_template/_celery/project_name/settings/contrib.py b/project_template/_celery/api/project_name/settings/contrib.py similarity index 100% rename from project_template/_celery/project_name/settings/contrib.py rename to project_template/_celery/api/project_name/settings/contrib.py diff --git a/startproject b/startproject index f759597..bad01e3 100755 --- a/startproject +++ b/startproject @@ -117,8 +117,8 @@ rm -rf ${TMP} ### Replace variables in files with real values ################################ find . -type f | xargs sed -i "" -e "s/{{ project_name }}/${NAME}/g; s/{{ django_version }}/${DJANGO_VERSION}/g; s/{{ doc_version }}/${DOC_VERSION}/g; s/{{ project_upper_name }}/${UPPER_NAME}/g" -mv project_name/settings/project_name.py project_name/settings/${NAME}.py -mv project_name ${NAME} +mv api/project_name/settings/project_name.py api/project_name/settings/${NAME}.py +mv api/project_name api/${NAME} find . -type f -name Pipfile | xargs sed -i "" -e "s/{{ python_version }}/${PYVER}/" clear @@ -156,6 +156,7 @@ case ${TMPL} in esac if [ -n $(command -v pipenv) ]; then + cd api pipenv --python ${PYVER} install --dev CONSOLE_MSG_FINISH=${MSG_FINISH} else