From af11f89d4421d17df783870e22f7131aca4db385 Mon Sep 17 00:00:00 2001 From: Maciej Matuszczak Date: Mon, 4 Mar 2019 20:58:22 +0100 Subject: [PATCH] Moved code to outside directory + added Travis to project --- .gitignore | 5 +++- {API/.makefile => .makefile}/clean.sh | 0 {API/.makefile => .makefile}/start.sh | 0 .travis.yml | 13 ++++++++ API/.ebextensions/python.config | 30 ------------------- API/.gitignore | 8 ----- API/.travis.yml | 1 - API/users/utils/__init__.py | 0 API/Dockerfile => Dockerfile | 0 API/Makefile => Makefile | 0 {API/MyToDo => MyToDo}/__init__.py | 0 {API/MyToDo => MyToDo}/settings.py | 0 {API/MyToDo => MyToDo}/urls.py | 0 {API/MyToDo => MyToDo}/wsgi.py | 0 README.md | 2 +- API/docker-compose.yml => docker-compose.yml | 0 ...cker-entrypoint.sh => docker-entrypoint.sh | 0 API/manage.py => manage.py | 0 API/package-lock.json => package-lock.json | 0 API/package.json => package.json | 0 API/requirements.txt => requirements.txt | 0 API/serverless.yml => serverless.yml | 0 {API => tasks}/__init__.py | 0 {API/tasks => tasks}/admin.py | 0 {API/tasks => tasks}/apps.py | 0 {API/tasks => tasks}/filters.py | 0 {API/tasks => tasks}/models.py | 0 {API/tasks => tasks}/permissions.py | 0 {API/tasks => tasks}/serializers.py | 0 {API/tasks => tasks}/tests.py | 0 {API/tasks => tasks}/urls.py | 0 {API/tasks => tasks}/views.py | 0 {API/tasks => users}/__init__.py | 0 {API/users => users}/admin.py | 0 {API/users => users}/apps.py | 0 {API/users => users}/filters.py | 0 {API/users => users/management}/__init__.py | 0 .../management/commands}/__init__.py | 0 .../management/commands/create_user.py | 0 {API/users => users}/models.py | 0 {API/users => users}/permissions.py | 0 {API/users => users}/serializers.py | 0 {API/users => users}/tests.py | 0 {API/users => users}/urls.py | 0 .../commands => users/utils}/__init__.py | 0 .../utils/jwt_response_payload_handler.py | 0 {API/users => users}/views.py | 0 47 files changed, 18 insertions(+), 41 deletions(-) rename {API/.makefile => .makefile}/clean.sh (100%) rename {API/.makefile => .makefile}/start.sh (100%) create mode 100644 .travis.yml delete mode 100644 API/.ebextensions/python.config delete mode 100644 API/.gitignore delete mode 100644 API/.travis.yml delete mode 100644 API/users/utils/__init__.py rename API/Dockerfile => Dockerfile (100%) rename API/Makefile => Makefile (100%) rename {API/MyToDo => MyToDo}/__init__.py (100%) rename {API/MyToDo => MyToDo}/settings.py (100%) rename {API/MyToDo => MyToDo}/urls.py (100%) rename {API/MyToDo => MyToDo}/wsgi.py (100%) rename API/docker-compose.yml => docker-compose.yml (100%) rename API/docker-entrypoint.sh => docker-entrypoint.sh (100%) rename API/manage.py => manage.py (100%) rename API/package-lock.json => package-lock.json (100%) rename API/package.json => package.json (100%) rename API/requirements.txt => requirements.txt (100%) rename API/serverless.yml => serverless.yml (100%) rename {API => tasks}/__init__.py (100%) rename {API/tasks => tasks}/admin.py (100%) rename {API/tasks => tasks}/apps.py (100%) rename {API/tasks => tasks}/filters.py (100%) rename {API/tasks => tasks}/models.py (100%) rename {API/tasks => tasks}/permissions.py (100%) rename {API/tasks => tasks}/serializers.py (100%) rename {API/tasks => tasks}/tests.py (100%) rename {API/tasks => tasks}/urls.py (100%) rename {API/tasks => tasks}/views.py (100%) rename {API/tasks => users}/__init__.py (100%) rename {API/users => users}/admin.py (100%) rename {API/users => users}/apps.py (100%) rename {API/users => users}/filters.py (100%) rename {API/users => users/management}/__init__.py (100%) rename {API/users/management => users/management/commands}/__init__.py (100%) rename {API/users => users}/management/commands/create_user.py (100%) rename {API/users => users}/models.py (100%) rename {API/users => users}/permissions.py (100%) rename {API/users => users}/serializers.py (100%) rename {API/users => users}/tests.py (100%) rename {API/users => users}/urls.py (100%) rename {API/users/management/commands => users/utils}/__init__.py (100%) rename {API/users => users}/utils/jwt_response_payload_handler.py (100%) rename {API/users => users}/views.py (100%) diff --git a/.gitignore b/.gitignore index cf65b4a..e659ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -64,4 +64,7 @@ www/ # Elastic Beanstalk Files .elasticbeanstalk/* !.elasticbeanstalk/*.cfg.yml -!.elasticbeanstalk/*.global.yml \ No newline at end of file +!.elasticbeanstalk/*.global.yml + +app.env +node_modules \ No newline at end of file diff --git a/API/.makefile/clean.sh b/.makefile/clean.sh similarity index 100% rename from API/.makefile/clean.sh rename to .makefile/clean.sh diff --git a/API/.makefile/start.sh b/.makefile/start.sh similarity index 100% rename from API/.makefile/start.sh rename to .makefile/start.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f367532 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +sudo: required +services: + - docker +langouage: python +python: + - 3.6 +install: + - pip install -r requirements.txt + - npm install +script: + - echo "CI test" +after_success: + - echo "Success" \ No newline at end of file diff --git a/API/.ebextensions/python.config b/API/.ebextensions/python.config deleted file mode 100644 index d7b3124..0000000 --- a/API/.ebextensions/python.config +++ /dev/null @@ -1,30 +0,0 @@ -option_settings: - "aws:elasticbeanstalk:application:environment": - DJANGO_SETTINGS_MODULE: "MyToDo.settings" - PYTHONPATH: "$PYTHONPATH" - "aws:elasticbeanstalk:container:python": - WSGIPath: "MyToDo/wsgi.py" - StaticFiles: "/static/=www/static/" - -packages: - yum: - postgresql95-devel: [] - -container_commands: - - 01_wsgipass: - command: 'echo "WSGIPassAuthorization On" >> ../wsgi.conf' - - 02_makemigrations: - command: "python manage.py makemigrations users tasks" - leader_only: true - - 03_migrate: - command: "python manage.py migrate" - leader_only: true - - 04_collectstatic: - command: "python manage.py collectstatic --noinput" - - 05_createsu: - command: "python manage.py create_user <1 - superuser or empty - normal user>" \ No newline at end of file diff --git a/API/.gitignore b/API/.gitignore deleted file mode 100644 index 4b3a09f..0000000 --- a/API/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ - -# Elastic Beanstalk Files -.elasticbeanstalk/* -!.elasticbeanstalk/*.cfg.yml -!.elasticbeanstalk/*.global.yml - -app.env -node_modules \ No newline at end of file diff --git a/API/.travis.yml b/API/.travis.yml deleted file mode 100644 index b107e9d..0000000 --- a/API/.travis.yml +++ /dev/null @@ -1 +0,0 @@ -language: python \ No newline at end of file diff --git a/API/users/utils/__init__.py b/API/users/utils/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/API/Dockerfile b/Dockerfile similarity index 100% rename from API/Dockerfile rename to Dockerfile diff --git a/API/Makefile b/Makefile similarity index 100% rename from API/Makefile rename to Makefile diff --git a/API/MyToDo/__init__.py b/MyToDo/__init__.py similarity index 100% rename from API/MyToDo/__init__.py rename to MyToDo/__init__.py diff --git a/API/MyToDo/settings.py b/MyToDo/settings.py similarity index 100% rename from API/MyToDo/settings.py rename to MyToDo/settings.py diff --git a/API/MyToDo/urls.py b/MyToDo/urls.py similarity index 100% rename from API/MyToDo/urls.py rename to MyToDo/urls.py diff --git a/API/MyToDo/wsgi.py b/MyToDo/wsgi.py similarity index 100% rename from API/MyToDo/wsgi.py rename to MyToDo/wsgi.py diff --git a/README.md b/README.md index 09aa971..e9cc6f4 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -"# MyToDo" +# MyToDo API diff --git a/API/docker-compose.yml b/docker-compose.yml similarity index 100% rename from API/docker-compose.yml rename to docker-compose.yml diff --git a/API/docker-entrypoint.sh b/docker-entrypoint.sh similarity index 100% rename from API/docker-entrypoint.sh rename to docker-entrypoint.sh diff --git a/API/manage.py b/manage.py similarity index 100% rename from API/manage.py rename to manage.py diff --git a/API/package-lock.json b/package-lock.json similarity index 100% rename from API/package-lock.json rename to package-lock.json diff --git a/API/package.json b/package.json similarity index 100% rename from API/package.json rename to package.json diff --git a/API/requirements.txt b/requirements.txt similarity index 100% rename from API/requirements.txt rename to requirements.txt diff --git a/API/serverless.yml b/serverless.yml similarity index 100% rename from API/serverless.yml rename to serverless.yml diff --git a/API/__init__.py b/tasks/__init__.py similarity index 100% rename from API/__init__.py rename to tasks/__init__.py diff --git a/API/tasks/admin.py b/tasks/admin.py similarity index 100% rename from API/tasks/admin.py rename to tasks/admin.py diff --git a/API/tasks/apps.py b/tasks/apps.py similarity index 100% rename from API/tasks/apps.py rename to tasks/apps.py diff --git a/API/tasks/filters.py b/tasks/filters.py similarity index 100% rename from API/tasks/filters.py rename to tasks/filters.py diff --git a/API/tasks/models.py b/tasks/models.py similarity index 100% rename from API/tasks/models.py rename to tasks/models.py diff --git a/API/tasks/permissions.py b/tasks/permissions.py similarity index 100% rename from API/tasks/permissions.py rename to tasks/permissions.py diff --git a/API/tasks/serializers.py b/tasks/serializers.py similarity index 100% rename from API/tasks/serializers.py rename to tasks/serializers.py diff --git a/API/tasks/tests.py b/tasks/tests.py similarity index 100% rename from API/tasks/tests.py rename to tasks/tests.py diff --git a/API/tasks/urls.py b/tasks/urls.py similarity index 100% rename from API/tasks/urls.py rename to tasks/urls.py diff --git a/API/tasks/views.py b/tasks/views.py similarity index 100% rename from API/tasks/views.py rename to tasks/views.py diff --git a/API/tasks/__init__.py b/users/__init__.py similarity index 100% rename from API/tasks/__init__.py rename to users/__init__.py diff --git a/API/users/admin.py b/users/admin.py similarity index 100% rename from API/users/admin.py rename to users/admin.py diff --git a/API/users/apps.py b/users/apps.py similarity index 100% rename from API/users/apps.py rename to users/apps.py diff --git a/API/users/filters.py b/users/filters.py similarity index 100% rename from API/users/filters.py rename to users/filters.py diff --git a/API/users/__init__.py b/users/management/__init__.py similarity index 100% rename from API/users/__init__.py rename to users/management/__init__.py diff --git a/API/users/management/__init__.py b/users/management/commands/__init__.py similarity index 100% rename from API/users/management/__init__.py rename to users/management/commands/__init__.py diff --git a/API/users/management/commands/create_user.py b/users/management/commands/create_user.py similarity index 100% rename from API/users/management/commands/create_user.py rename to users/management/commands/create_user.py diff --git a/API/users/models.py b/users/models.py similarity index 100% rename from API/users/models.py rename to users/models.py diff --git a/API/users/permissions.py b/users/permissions.py similarity index 100% rename from API/users/permissions.py rename to users/permissions.py diff --git a/API/users/serializers.py b/users/serializers.py similarity index 100% rename from API/users/serializers.py rename to users/serializers.py diff --git a/API/users/tests.py b/users/tests.py similarity index 100% rename from API/users/tests.py rename to users/tests.py diff --git a/API/users/urls.py b/users/urls.py similarity index 100% rename from API/users/urls.py rename to users/urls.py diff --git a/API/users/management/commands/__init__.py b/users/utils/__init__.py similarity index 100% rename from API/users/management/commands/__init__.py rename to users/utils/__init__.py diff --git a/API/users/utils/jwt_response_payload_handler.py b/users/utils/jwt_response_payload_handler.py similarity index 100% rename from API/users/utils/jwt_response_payload_handler.py rename to users/utils/jwt_response_payload_handler.py diff --git a/API/users/views.py b/users/views.py similarity index 100% rename from API/users/views.py rename to users/views.py