diff --git a/.gitignore b/.gitignore index 0003d8357c28b28e8beb10e8b093b0bc595bd5c4..86984669a3ebae2263712d3eb290fd04b67c2d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,8 @@ __pycache__/ # .env # media and collected static files -oser_backend/media/ -oser_backend/static/ +media/ +static/ # Supervisor supervisord.pid diff --git a/.travis.yml b/.travis.yml index 534875989978353ce18518ba93b24c8da2447117..b61d7029e9f238442c40150f351c41a494698fe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ before_script: # - the one set up in settings/default.py - psql -c 'create database oser_backend_db;' -U postgres - # Go to the project root directory - - cd oser_backend # Apply database migrations - python manage.py migrate @@ -50,7 +48,7 @@ deploy: staging: oser-backend-staging run: # automatically run new migrations - - 'python oser_backend/manage.py migrate' + - 'python manage.py migrate' api_key: # Encrypted API key obtained from the following command # (requires TravisCI and Heroku CLI installed) diff --git a/Procfile b/Procfile index 35f5bd1452f8d7486de2e4dca1c224e72fa9d940..2a56f02829ca9006e52a3fd82f2a88d90090a069 100644 --- a/Procfile +++ b/Procfile @@ -1,4 +1,4 @@ -web: sh -c 'cd oser_backend && exec gunicorn oser_backend.wsgi:application --bind 0.0.0.0:$PORT --workers 1' +web: gunicorn oser_backend.wsgi:application --bind 0.0.0.0:$PORT # Toggle next line to start Celery in a worker process -# worker: sh -c 'cd oser_backend && exec celery -A oser_backend worker --beat -l info' +# worker: celery -A oser_backend worker --beat -l info diff --git a/README.md b/README.md index f66616548efc394a5cc27e864548f1ac4788dbae..90f843da9df2a725e6e7422fe329642af7077709 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,6 @@ $ pip install -r requirements.txt - Configurez la base de données en exécutant les migrations (rappelez-vous : *le serveur PostgreSQL doit être actif*) : ```bash -$ cd oser_backend $ python manage.py migrate ``` @@ -190,7 +189,7 @@ $ supervisorctl tail celery Le backend utilise le plan gratuit de [SendGrid](https://sendgrid.com) (jusqu'à 100 emails par jour) pour envoyer des emails et notifications aux utilisateurs. -La documentation de cette application est consultable ici : [oser_backend/mails/README.md](oser_backend/mails/README.md). +La documentation de cette application est consultable ici : [mails/README.md](mails/README.md). > En développement, utilisez la configuration `dev_sendgrid` pour [activer le mode bac à sable](https://github.com/sklarsa/django-sendgrid-v5#other-settings). > ``` diff --git a/oser_backend/api/__init__.py b/api/__init__.py similarity index 100% rename from oser_backend/api/__init__.py rename to api/__init__.py diff --git a/oser_backend/api/apps.py b/api/apps.py similarity index 100% rename from oser_backend/api/apps.py rename to api/apps.py diff --git a/oser_backend/api/auth.py b/api/auth.py similarity index 100% rename from oser_backend/api/auth.py rename to api/auth.py diff --git a/oser_backend/api/urls.py b/api/urls.py similarity index 100% rename from oser_backend/api/urls.py rename to api/urls.py diff --git a/oser_backend/aws/__init__.py b/aws/__init__.py similarity index 100% rename from oser_backend/aws/__init__.py rename to aws/__init__.py diff --git a/oser_backend/aws/backends.py b/aws/backends.py similarity index 100% rename from oser_backend/aws/backends.py rename to aws/backends.py diff --git a/oser_backend/aws/conf.py b/aws/conf.py similarity index 100% rename from oser_backend/aws/conf.py rename to aws/conf.py diff --git a/oser_backend/core/__init__.py b/core/__init__.py similarity index 100% rename from oser_backend/core/__init__.py rename to core/__init__.py diff --git a/oser_backend/core/admin.py b/core/admin.py similarity index 100% rename from oser_backend/core/admin.py rename to core/admin.py diff --git a/oser_backend/core/apps.py b/core/apps.py similarity index 100% rename from oser_backend/core/apps.py rename to core/apps.py diff --git a/oser_backend/core/factory.py b/core/factory.py similarity index 100% rename from oser_backend/core/factory.py rename to core/factory.py diff --git a/oser_backend/core/file_utils.py b/core/file_utils.py similarity index 100% rename from oser_backend/core/file_utils.py rename to core/file_utils.py diff --git a/oser_backend/core/management/__init__.py b/core/management/__init__.py similarity index 100% rename from oser_backend/core/management/__init__.py rename to core/management/__init__.py diff --git a/oser_backend/core/management/commands/__init__.py b/core/management/commands/__init__.py similarity index 100% rename from oser_backend/core/management/commands/__init__.py rename to core/management/commands/__init__.py diff --git a/oser_backend/core/management/commands/clean_media.py b/core/management/commands/clean_media.py similarity index 100% rename from oser_backend/core/management/commands/clean_media.py rename to core/management/commands/clean_media.py diff --git a/oser_backend/core/management/commands/data/article-0.jpg b/core/management/commands/data/article-0.jpg similarity index 100% rename from oser_backend/core/management/commands/data/article-0.jpg rename to core/management/commands/data/article-0.jpg diff --git a/oser_backend/core/management/commands/data/article-1.jpg b/core/management/commands/data/article-1.jpg similarity index 100% rename from oser_backend/core/management/commands/data/article-1.jpg rename to core/management/commands/data/article-1.jpg diff --git a/oser_backend/core/management/commands/data/article-2.jpg b/core/management/commands/data/article-2.jpg similarity index 100% rename from oser_backend/core/management/commands/data/article-2.jpg rename to core/management/commands/data/article-2.jpg diff --git a/oser_backend/core/management/commands/data/example.txt b/core/management/commands/data/example.txt similarity index 100% rename from oser_backend/core/management/commands/data/example.txt rename to core/management/commands/data/example.txt diff --git a/oser_backend/core/management/commands/data/visit-1.jpg b/core/management/commands/data/visit-1.jpg similarity index 100% rename from oser_backend/core/management/commands/data/visit-1.jpg rename to core/management/commands/data/visit-1.jpg diff --git a/oser_backend/core/management/commands/data/visit-2.jpg b/core/management/commands/data/visit-2.jpg similarity index 100% rename from oser_backend/core/management/commands/data/visit-2.jpg rename to core/management/commands/data/visit-2.jpg diff --git a/oser_backend/core/management/commands/data/visit-3.jpg b/core/management/commands/data/visit-3.jpg similarity index 100% rename from oser_backend/core/management/commands/data/visit-3.jpg rename to core/management/commands/data/visit-3.jpg diff --git a/oser_backend/core/management/commands/data/visit-factsheet.pdf b/core/management/commands/data/visit-factsheet.pdf similarity index 100% rename from oser_backend/core/management/commands/data/visit-factsheet.pdf rename to core/management/commands/data/visit-factsheet.pdf diff --git a/oser_backend/core/management/commands/data/visit-permission.pdf b/core/management/commands/data/visit-permission.pdf similarity index 100% rename from oser_backend/core/management/commands/data/visit-permission.pdf rename to core/management/commands/data/visit-permission.pdf diff --git a/oser_backend/core/management/commands/initadmin.py b/core/management/commands/initadmin.py similarity index 100% rename from oser_backend/core/management/commands/initadmin.py rename to core/management/commands/initadmin.py diff --git a/oser_backend/core/management/commands/populatedb.py b/core/management/commands/populatedb.py similarity index 100% rename from oser_backend/core/management/commands/populatedb.py rename to core/management/commands/populatedb.py diff --git a/oser_backend/core/management/commands/utils.py b/core/management/commands/utils.py similarity index 100% rename from oser_backend/core/management/commands/utils.py rename to core/management/commands/utils.py diff --git a/oser_backend/core/markdown.py b/core/markdown.py similarity index 100% rename from oser_backend/core/markdown.py rename to core/markdown.py diff --git a/oser_backend/core/migrations/0001_initial.py b/core/migrations/0001_initial.py similarity index 100% rename from oser_backend/core/migrations/0001_initial.py rename to core/migrations/0001_initial.py diff --git a/oser_backend/core/migrations/0002_delete_link.py b/core/migrations/0002_delete_link.py similarity index 100% rename from oser_backend/core/migrations/0002_delete_link.py rename to core/migrations/0002_delete_link.py diff --git a/oser_backend/core/migrations/0003_document.py b/core/migrations/0003_document.py similarity index 100% rename from oser_backend/core/migrations/0003_document.py rename to core/migrations/0003_document.py diff --git a/oser_backend/core/migrations/0004_address.py b/core/migrations/0004_address.py similarity index 100% rename from oser_backend/core/migrations/0004_address.py rename to core/migrations/0004_address.py diff --git a/oser_backend/core/migrations/0005_auto_20180408_1525.py b/core/migrations/0005_auto_20180408_1525.py similarity index 100% rename from oser_backend/core/migrations/0005_auto_20180408_1525.py rename to core/migrations/0005_auto_20180408_1525.py diff --git a/oser_backend/core/migrations/__init__.py b/core/migrations/__init__.py similarity index 100% rename from oser_backend/core/migrations/__init__.py rename to core/migrations/__init__.py diff --git a/oser_backend/core/models.py b/core/models.py similarity index 100% rename from oser_backend/core/models.py rename to core/models.py diff --git a/oser_backend/core/serializers.py b/core/serializers.py similarity index 100% rename from oser_backend/core/serializers.py rename to core/serializers.py diff --git a/oser_backend/core/tasks.py b/core/tasks.py similarity index 100% rename from oser_backend/core/tasks.py rename to core/tasks.py diff --git a/oser_backend/core/views.py b/core/views.py similarity index 100% rename from oser_backend/core/views.py rename to core/views.py diff --git a/oser_backend/logs/__init__.py b/logs/__init__.py similarity index 100% rename from oser_backend/logs/__init__.py rename to logs/__init__.py diff --git a/oser_backend/logs/apps.py b/logs/apps.py similarity index 100% rename from oser_backend/logs/apps.py rename to logs/apps.py diff --git a/oser_backend/logs/utils.py b/logs/utils.py similarity index 100% rename from oser_backend/logs/utils.py rename to logs/utils.py diff --git a/oser_backend/mails/README.md b/mails/README.md similarity index 100% rename from oser_backend/mails/README.md rename to mails/README.md diff --git a/oser_backend/mails/__init__.py b/mails/__init__.py similarity index 100% rename from oser_backend/mails/__init__.py rename to mails/__init__.py diff --git a/oser_backend/mails/apps.py b/mails/apps.py similarity index 100% rename from oser_backend/mails/apps.py rename to mails/apps.py diff --git a/oser_backend/mails/example.py b/mails/example.py similarity index 100% rename from oser_backend/mails/example.py rename to mails/example.py diff --git a/oser_backend/mails/management/__init__.py b/mails/management/__init__.py similarity index 100% rename from oser_backend/mails/management/__init__.py rename to mails/management/__init__.py diff --git a/oser_backend/mails/management/base.py b/mails/management/base.py similarity index 100% rename from oser_backend/mails/management/base.py rename to mails/management/base.py diff --git a/oser_backend/mails/management/commands/__init__.py b/mails/management/commands/__init__.py similarity index 100% rename from oser_backend/mails/management/commands/__init__.py rename to mails/management/commands/__init__.py diff --git a/oser_backend/mails/management/commands/rendernotification.py b/mails/management/commands/rendernotification.py similarity index 100% rename from oser_backend/mails/management/commands/rendernotification.py rename to mails/management/commands/rendernotification.py diff --git a/oser_backend/mails/management/commands/sendnotification.py b/mails/management/commands/sendnotification.py similarity index 100% rename from oser_backend/mails/management/commands/sendnotification.py rename to mails/management/commands/sendnotification.py diff --git a/oser_backend/mails/notifications.py b/mails/notifications.py similarity index 100% rename from oser_backend/mails/notifications.py rename to mails/notifications.py diff --git a/oser_backend/mails/settings.py b/mails/settings.py similarity index 100% rename from oser_backend/mails/settings.py rename to mails/settings.py diff --git a/oser_backend/mails/signals.py b/mails/signals.py similarity index 100% rename from oser_backend/mails/signals.py rename to mails/signals.py diff --git a/oser_backend/mails/templates/mails/notification.md b/mails/templates/mails/notification.md similarity index 100% rename from oser_backend/mails/templates/mails/notification.md rename to mails/templates/mails/notification.md diff --git a/oser_backend/mails/templates/myapp/today.md b/mails/templates/myapp/today.md similarity index 100% rename from oser_backend/mails/templates/myapp/today.md rename to mails/templates/myapp/today.md diff --git a/oser_backend/mails/tests.py b/mails/tests.py similarity index 100% rename from oser_backend/mails/tests.py rename to mails/tests.py diff --git a/oser_backend/manage.py b/manage.py similarity index 100% rename from oser_backend/manage.py rename to manage.py diff --git a/oser_backend/oser_backend/__init__.py b/oser_backend/__init__.py similarity index 100% rename from oser_backend/oser_backend/__init__.py rename to oser_backend/__init__.py diff --git a/oser_backend/oser_backend/celery.py b/oser_backend/celery.py similarity index 100% rename from oser_backend/oser_backend/celery.py rename to oser_backend/celery.py diff --git a/oser_backend/oser_backend/settings/__init__.py b/oser_backend/settings/__init__.py similarity index 100% rename from oser_backend/oser_backend/settings/__init__.py rename to oser_backend/settings/__init__.py diff --git a/oser_backend/oser_backend/settings/common.py b/oser_backend/settings/common.py similarity index 100% rename from oser_backend/oser_backend/settings/common.py rename to oser_backend/settings/common.py diff --git a/oser_backend/oser_backend/settings/dev.py b/oser_backend/settings/dev.py similarity index 100% rename from oser_backend/oser_backend/settings/dev.py rename to oser_backend/settings/dev.py diff --git a/oser_backend/oser_backend/settings/dev_aws.py b/oser_backend/settings/dev_aws.py similarity index 100% rename from oser_backend/oser_backend/settings/dev_aws.py rename to oser_backend/settings/dev_aws.py diff --git a/oser_backend/oser_backend/settings/dev_sendgrid.py b/oser_backend/settings/dev_sendgrid.py similarity index 100% rename from oser_backend/oser_backend/settings/dev_sendgrid.py rename to oser_backend/settings/dev_sendgrid.py diff --git a/oser_backend/oser_backend/settings/production.py b/oser_backend/settings/production.py similarity index 100% rename from oser_backend/oser_backend/settings/production.py rename to oser_backend/settings/production.py diff --git a/oser_backend/oser_backend/urls.py b/oser_backend/urls.py similarity index 100% rename from oser_backend/oser_backend/urls.py rename to oser_backend/urls.py diff --git a/oser_backend/oser_backend/wsgi.py b/oser_backend/wsgi.py similarity index 100% rename from oser_backend/oser_backend/wsgi.py rename to oser_backend/wsgi.py diff --git a/oser_backend/profiles/__init__.py b/profiles/__init__.py similarity index 100% rename from oser_backend/profiles/__init__.py rename to profiles/__init__.py diff --git a/oser_backend/profiles/admin.py b/profiles/admin.py similarity index 100% rename from oser_backend/profiles/admin.py rename to profiles/admin.py diff --git a/oser_backend/profiles/apps.py b/profiles/apps.py similarity index 100% rename from oser_backend/profiles/apps.py rename to profiles/apps.py diff --git a/oser_backend/profiles/factory.py b/profiles/factory.py similarity index 100% rename from oser_backend/profiles/factory.py rename to profiles/factory.py diff --git a/oser_backend/profiles/migrations/0001_initial.py b/profiles/migrations/0001_initial.py similarity index 100% rename from oser_backend/profiles/migrations/0001_initial.py rename to profiles/migrations/0001_initial.py diff --git a/oser_backend/profiles/migrations/0002_auto_20180512_1344.py b/profiles/migrations/0002_auto_20180512_1344.py similarity index 100% rename from oser_backend/profiles/migrations/0002_auto_20180512_1344.py rename to profiles/migrations/0002_auto_20180512_1344.py diff --git a/oser_backend/profiles/migrations/__init__.py b/profiles/migrations/__init__.py similarity index 100% rename from oser_backend/profiles/migrations/__init__.py rename to profiles/migrations/__init__.py diff --git a/oser_backend/profiles/models.py b/profiles/models.py similarity index 100% rename from oser_backend/profiles/models.py rename to profiles/models.py diff --git a/oser_backend/profiles/serializers.py b/profiles/serializers.py similarity index 100% rename from oser_backend/profiles/serializers.py rename to profiles/serializers.py diff --git a/oser_backend/profiles/settings.py b/profiles/settings.py similarity index 100% rename from oser_backend/profiles/settings.py rename to profiles/settings.py diff --git a/oser_backend/profiles/signals.py b/profiles/signals.py similarity index 100% rename from oser_backend/profiles/signals.py rename to profiles/signals.py diff --git a/oser_backend/profiles/utils.py b/profiles/utils.py similarity index 100% rename from oser_backend/profiles/utils.py rename to profiles/utils.py diff --git a/oser_backend/profiles/views.py b/profiles/views.py similarity index 100% rename from oser_backend/profiles/views.py rename to profiles/views.py diff --git a/oser_backend/register/__init__.py b/register/__init__.py similarity index 100% rename from oser_backend/register/__init__.py rename to register/__init__.py diff --git a/oser_backend/register/admin.py b/register/admin.py similarity index 100% rename from oser_backend/register/admin.py rename to register/admin.py diff --git a/oser_backend/register/apps.py b/register/apps.py similarity index 100% rename from oser_backend/register/apps.py rename to register/apps.py diff --git a/oser_backend/register/factory.py b/register/factory.py similarity index 100% rename from oser_backend/register/factory.py rename to register/factory.py diff --git a/oser_backend/register/migrations/0001_initial.py b/register/migrations/0001_initial.py similarity index 100% rename from oser_backend/register/migrations/0001_initial.py rename to register/migrations/0001_initial.py diff --git a/oser_backend/register/migrations/0002_auto_20180407_2314.py b/register/migrations/0002_auto_20180407_2314.py similarity index 100% rename from oser_backend/register/migrations/0002_auto_20180407_2314.py rename to register/migrations/0002_auto_20180407_2314.py diff --git a/oser_backend/register/migrations/0003_auto_20180407_2342.py b/register/migrations/0003_auto_20180407_2342.py similarity index 100% rename from oser_backend/register/migrations/0003_auto_20180407_2342.py rename to register/migrations/0003_auto_20180407_2342.py diff --git a/oser_backend/register/migrations/0004_auto_20180408_1412.py b/register/migrations/0004_auto_20180408_1412.py similarity index 100% rename from oser_backend/register/migrations/0004_auto_20180408_1412.py rename to register/migrations/0004_auto_20180408_1412.py diff --git a/oser_backend/register/migrations/0005_auto_20180408_1416.py b/register/migrations/0005_auto_20180408_1416.py similarity index 100% rename from oser_backend/register/migrations/0005_auto_20180408_1416.py rename to register/migrations/0005_auto_20180408_1416.py diff --git a/oser_backend/register/migrations/0006_address.py b/register/migrations/0006_address.py similarity index 100% rename from oser_backend/register/migrations/0006_address.py rename to register/migrations/0006_address.py diff --git a/oser_backend/register/migrations/0007_auto_20180408_1457.py b/register/migrations/0007_auto_20180408_1457.py similarity index 100% rename from oser_backend/register/migrations/0007_auto_20180408_1457.py rename to register/migrations/0007_auto_20180408_1457.py diff --git a/oser_backend/register/migrations/0008_auto_20180408_1518.py b/register/migrations/0008_auto_20180408_1518.py similarity index 100% rename from oser_backend/register/migrations/0008_auto_20180408_1518.py rename to register/migrations/0008_auto_20180408_1518.py diff --git a/oser_backend/register/migrations/0009_auto_20180408_1525.py b/register/migrations/0009_auto_20180408_1525.py similarity index 100% rename from oser_backend/register/migrations/0009_auto_20180408_1525.py rename to register/migrations/0009_auto_20180408_1525.py diff --git a/oser_backend/register/migrations/0010_auto_20180414_0000.py b/register/migrations/0010_auto_20180414_0000.py similarity index 100% rename from oser_backend/register/migrations/0010_auto_20180414_0000.py rename to register/migrations/0010_auto_20180414_0000.py diff --git a/oser_backend/register/migrations/0011_auto_20180414_0010.py b/register/migrations/0011_auto_20180414_0010.py similarity index 100% rename from oser_backend/register/migrations/0011_auto_20180414_0010.py rename to register/migrations/0011_auto_20180414_0010.py diff --git a/oser_backend/register/migrations/0012_auto_20180414_0016.py b/register/migrations/0012_auto_20180414_0016.py similarity index 100% rename from oser_backend/register/migrations/0012_auto_20180414_0016.py rename to register/migrations/0012_auto_20180414_0016.py diff --git a/oser_backend/register/migrations/0013_auto_20180505_1046.py b/register/migrations/0013_auto_20180505_1046.py similarity index 100% rename from oser_backend/register/migrations/0013_auto_20180505_1046.py rename to register/migrations/0013_auto_20180505_1046.py diff --git a/oser_backend/register/migrations/0014_registration_validated.py b/register/migrations/0014_registration_validated.py similarity index 100% rename from oser_backend/register/migrations/0014_registration_validated.py rename to register/migrations/0014_registration_validated.py diff --git a/oser_backend/register/migrations/0015_auto_20180505_1403.py b/register/migrations/0015_auto_20180505_1403.py similarity index 100% rename from oser_backend/register/migrations/0015_auto_20180505_1403.py rename to register/migrations/0015_auto_20180505_1403.py diff --git a/oser_backend/register/migrations/0016_auto_20180512_1047.py b/register/migrations/0016_auto_20180512_1047.py similarity index 100% rename from oser_backend/register/migrations/0016_auto_20180512_1047.py rename to register/migrations/0016_auto_20180512_1047.py diff --git a/oser_backend/register/migrations/0017_auto_20180512_1050.py b/register/migrations/0017_auto_20180512_1050.py similarity index 100% rename from oser_backend/register/migrations/0017_auto_20180512_1050.py rename to register/migrations/0017_auto_20180512_1050.py diff --git a/oser_backend/register/migrations/0018_auto_20180512_1112.py b/register/migrations/0018_auto_20180512_1112.py similarity index 100% rename from oser_backend/register/migrations/0018_auto_20180512_1112.py rename to register/migrations/0018_auto_20180512_1112.py diff --git a/oser_backend/register/migrations/__init__.py b/register/migrations/__init__.py similarity index 100% rename from oser_backend/register/migrations/__init__.py rename to register/migrations/__init__.py diff --git a/oser_backend/register/models.py b/register/models.py similarity index 100% rename from oser_backend/register/models.py rename to register/models.py diff --git a/oser_backend/register/serializers.py b/register/serializers.py similarity index 100% rename from oser_backend/register/serializers.py rename to register/serializers.py diff --git a/oser_backend/register/signals.py b/register/signals.py similarity index 100% rename from oser_backend/register/signals.py rename to register/signals.py diff --git a/oser_backend/register/views.py b/register/views.py similarity index 100% rename from oser_backend/register/views.py rename to register/views.py diff --git a/media/api-docs.png b/repo/api-docs.png similarity index 100% rename from media/api-docs.png rename to repo/api-docs.png diff --git a/media/api_home.png b/repo/api_home.png similarity index 100% rename from media/api_home.png rename to repo/api_home.png diff --git a/media/createsuperuser.png b/repo/createsuperuser.png similarity index 100% rename from media/createsuperuser.png rename to repo/createsuperuser.png diff --git a/media/django-admin-login-page.png b/repo/django-admin-login-page.png similarity index 100% rename from media/django-admin-login-page.png rename to repo/django-admin-login-page.png diff --git a/media/django-admin-user-detail.png b/repo/django-admin-user-detail.png similarity index 100% rename from media/django-admin-user-detail.png rename to repo/django-admin-user-detail.png diff --git a/media/django-admin-user-list.png b/repo/django-admin-user-list.png similarity index 100% rename from media/django-admin-user-list.png rename to repo/django-admin-user-list.png diff --git a/media/logo.png b/repo/logo.png similarity index 100% rename from media/logo.png rename to repo/logo.png diff --git a/oser_backend/staticfiles/css/admin-extra.css b/staticfiles/css/admin-extra.css similarity index 100% rename from oser_backend/staticfiles/css/admin-extra.css rename to staticfiles/css/admin-extra.css diff --git a/oser_backend/staticfiles/favicon.ico b/staticfiles/favicon.ico similarity index 100% rename from oser_backend/staticfiles/favicon.ico rename to staticfiles/favicon.ico diff --git a/supervisord.conf b/supervisord.conf index 713b94ee663440339a2002b96864cd5dfd1b2a0c..f01181a18e936e6f5d42311e2fb045c16d82d276 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -12,7 +12,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface command = redis-server [program:celery] -directory = oser_backend command = celery -A oser_backend worker --beat -l info stdout_logfile=celery.log stderr_logfile=celery.log diff --git a/oser_backend/templates/admin/base_site.html b/templates/admin/base_site.html similarity index 100% rename from oser_backend/templates/admin/base_site.html rename to templates/admin/base_site.html diff --git a/oser_backend/templates/markdownx/widget2.html b/templates/markdownx/widget2.html similarity index 100% rename from oser_backend/templates/markdownx/widget2.html rename to templates/markdownx/widget2.html diff --git a/oser_backend/tests/__init__.py b/tests/__init__.py similarity index 100% rename from oser_backend/tests/__init__.py rename to tests/__init__.py diff --git a/oser_backend/tests/test_auth.py b/tests/test_auth.py similarity index 100% rename from oser_backend/tests/test_auth.py rename to tests/test_auth.py diff --git a/oser_backend/tests/test_core/__init__.py b/tests/test_core/__init__.py similarity index 100% rename from oser_backend/tests/test_core/__init__.py rename to tests/test_core/__init__.py diff --git a/oser_backend/tests/test_core/test_address.py b/tests/test_core/test_address.py similarity index 100% rename from oser_backend/tests/test_core/test_address.py rename to tests/test_core/test_address.py diff --git a/oser_backend/tests/test_core/test_address_api.py b/tests/test_core/test_address_api.py similarity index 100% rename from oser_backend/tests/test_core/test_address_api.py rename to tests/test_core/test_address_api.py diff --git a/oser_backend/tests/test_core/test_clean_media.py b/tests/test_core/test_clean_media.py similarity index 100% rename from oser_backend/tests/test_core/test_clean_media.py rename to tests/test_core/test_clean_media.py diff --git a/oser_backend/tests/test_core/test_document.py b/tests/test_core/test_document.py similarity index 100% rename from oser_backend/tests/test_core/test_document.py rename to tests/test_core/test_document.py diff --git a/oser_backend/tests/test_core/test_document_api.py b/tests/test_core/test_document_api.py similarity index 100% rename from oser_backend/tests/test_core/test_document_api.py rename to tests/test_core/test_document_api.py diff --git a/oser_backend/tests/test_core/test_initadmin.py b/tests/test_core/test_initadmin.py similarity index 100% rename from oser_backend/tests/test_core/test_initadmin.py rename to tests/test_core/test_initadmin.py diff --git a/oser_backend/tests/test_core/test_markdown.py b/tests/test_core/test_markdown.py similarity index 100% rename from oser_backend/tests/test_core/test_markdown.py rename to tests/test_core/test_markdown.py diff --git a/oser_backend/tests/test_core/test_populatedb.py b/tests/test_core/test_populatedb.py similarity index 100% rename from oser_backend/tests/test_core/test_populatedb.py rename to tests/test_core/test_populatedb.py diff --git a/oser_backend/tests/test_core/test_tasks.py b/tests/test_core/test_tasks.py similarity index 100% rename from oser_backend/tests/test_core/test_tasks.py rename to tests/test_core/test_tasks.py diff --git a/oser_backend/tests/test_docs.py b/tests/test_docs.py similarity index 100% rename from oser_backend/tests/test_docs.py rename to tests/test_docs.py diff --git a/oser_backend/tests/test_misc.py b/tests/test_misc.py similarity index 100% rename from oser_backend/tests/test_misc.py rename to tests/test_misc.py diff --git a/oser_backend/tests/test_profiles/__init__.py b/tests/test_profiles/__init__.py similarity index 100% rename from oser_backend/tests/test_profiles/__init__.py rename to tests/test_profiles/__init__.py diff --git a/oser_backend/tests/test_profiles/test_student.py b/tests/test_profiles/test_student.py similarity index 100% rename from oser_backend/tests/test_profiles/test_student.py rename to tests/test_profiles/test_student.py diff --git a/oser_backend/tests/test_profiles/test_student_api.py b/tests/test_profiles/test_student_api.py similarity index 100% rename from oser_backend/tests/test_profiles/test_student_api.py rename to tests/test_profiles/test_student_api.py diff --git a/oser_backend/tests/test_profiles/test_tutor.py b/tests/test_profiles/test_tutor.py similarity index 100% rename from oser_backend/tests/test_profiles/test_tutor.py rename to tests/test_profiles/test_tutor.py diff --git a/oser_backend/tests/test_profiles/test_tutor_api.py b/tests/test_profiles/test_tutor_api.py similarity index 100% rename from oser_backend/tests/test_profiles/test_tutor_api.py rename to tests/test_profiles/test_tutor_api.py diff --git a/oser_backend/tests/test_profiles/test_utils.py b/tests/test_profiles/test_utils.py similarity index 100% rename from oser_backend/tests/test_profiles/test_utils.py rename to tests/test_profiles/test_utils.py diff --git a/oser_backend/tests/test_register/__init__.py b/tests/test_register/__init__.py similarity index 100% rename from oser_backend/tests/test_register/__init__.py rename to tests/test_register/__init__.py diff --git a/oser_backend/tests/test_register/test_emergency_contact.py b/tests/test_register/test_emergency_contact.py similarity index 100% rename from oser_backend/tests/test_register/test_emergency_contact.py rename to tests/test_register/test_emergency_contact.py diff --git a/oser_backend/tests/test_register/test_registration.py b/tests/test_register/test_registration.py similarity index 100% rename from oser_backend/tests/test_register/test_registration.py rename to tests/test_register/test_registration.py diff --git a/oser_backend/tests/test_register/test_registration_api.py b/tests/test_register/test_registration_api.py similarity index 100% rename from oser_backend/tests/test_register/test_registration_api.py rename to tests/test_register/test_registration_api.py diff --git a/oser_backend/tests/test_tutoring/__init__.py b/tests/test_tutoring/__init__.py similarity index 100% rename from oser_backend/tests/test_tutoring/__init__.py rename to tests/test_tutoring/__init__.py diff --git a/oser_backend/tests/test_tutoring/test_school.py b/tests/test_tutoring/test_school.py similarity index 100% rename from oser_backend/tests/test_tutoring/test_school.py rename to tests/test_tutoring/test_school.py diff --git a/oser_backend/tests/test_tutoring/test_school_api.py b/tests/test_tutoring/test_school_api.py similarity index 100% rename from oser_backend/tests/test_tutoring/test_school_api.py rename to tests/test_tutoring/test_school_api.py diff --git a/oser_backend/tests/test_tutoring/test_tutoring_group.py b/tests/test_tutoring/test_tutoring_group.py similarity index 100% rename from oser_backend/tests/test_tutoring/test_tutoring_group.py rename to tests/test_tutoring/test_tutoring_group.py diff --git a/oser_backend/tests/test_tutoring/test_tutoring_group_api.py b/tests/test_tutoring/test_tutoring_group_api.py similarity index 100% rename from oser_backend/tests/test_tutoring/test_tutoring_group_api.py rename to tests/test_tutoring/test_tutoring_group_api.py diff --git a/oser_backend/tests/test_tutoring/test_tutoring_session.py b/tests/test_tutoring/test_tutoring_session.py similarity index 100% rename from oser_backend/tests/test_tutoring/test_tutoring_session.py rename to tests/test_tutoring/test_tutoring_session.py diff --git a/oser_backend/tests/test_users/__init__.py b/tests/test_users/__init__.py similarity index 100% rename from oser_backend/tests/test_users/__init__.py rename to tests/test_users/__init__.py diff --git a/oser_backend/tests/test_users/test_user.py b/tests/test_users/test_user.py similarity index 100% rename from oser_backend/tests/test_users/test_user.py rename to tests/test_users/test_user.py diff --git a/oser_backend/tests/test_users/test_user_api.py b/tests/test_users/test_user_api.py similarity index 100% rename from oser_backend/tests/test_users/test_user_api.py rename to tests/test_users/test_user_api.py diff --git a/oser_backend/tests/test_utils.py b/tests/test_utils.py similarity index 100% rename from oser_backend/tests/test_utils.py rename to tests/test_utils.py diff --git a/oser_backend/tests/test_visits/__init__.py b/tests/test_visits/__init__.py similarity index 100% rename from oser_backend/tests/test_visits/__init__.py rename to tests/test_visits/__init__.py diff --git a/oser_backend/tests/test_visits/test_participation.py b/tests/test_visits/test_participation.py similarity index 100% rename from oser_backend/tests/test_visits/test_participation.py rename to tests/test_visits/test_participation.py diff --git a/oser_backend/tests/test_visits/test_participation_api.py b/tests/test_visits/test_participation_api.py similarity index 100% rename from oser_backend/tests/test_visits/test_participation_api.py rename to tests/test_visits/test_participation_api.py diff --git a/oser_backend/tests/test_visits/test_place.py b/tests/test_visits/test_place.py similarity index 100% rename from oser_backend/tests/test_visits/test_place.py rename to tests/test_visits/test_place.py diff --git a/oser_backend/tests/test_visits/test_signals.py b/tests/test_visits/test_signals.py similarity index 100% rename from oser_backend/tests/test_visits/test_signals.py rename to tests/test_visits/test_signals.py diff --git a/oser_backend/tests/test_visits/test_visit.py b/tests/test_visits/test_visit.py similarity index 100% rename from oser_backend/tests/test_visits/test_visit.py rename to tests/test_visits/test_visit.py diff --git a/oser_backend/tests/test_visits/test_visit_api.py b/tests/test_visits/test_visit_api.py similarity index 100% rename from oser_backend/tests/test_visits/test_visit_api.py rename to tests/test_visits/test_visit_api.py diff --git a/oser_backend/tests/utils/__init__.py b/tests/utils/__init__.py similarity index 100% rename from oser_backend/tests/utils/__init__.py rename to tests/utils/__init__.py diff --git a/oser_backend/tests/utils/api.py b/tests/utils/api.py similarity index 100% rename from oser_backend/tests/utils/api.py rename to tests/utils/api.py diff --git a/oser_backend/tests/utils/field_test.py b/tests/utils/field_test.py similarity index 100% rename from oser_backend/tests/utils/field_test.py rename to tests/utils/field_test.py diff --git a/oser_backend/tests/utils/mixins.py b/tests/utils/mixins.py similarity index 100% rename from oser_backend/tests/utils/mixins.py rename to tests/utils/mixins.py diff --git a/oser_backend/tests/utils/test_cases.py b/tests/utils/test_cases.py similarity index 100% rename from oser_backend/tests/utils/test_cases.py rename to tests/utils/test_cases.py diff --git a/oser_backend/tutoring/__init__.py b/tutoring/__init__.py similarity index 100% rename from oser_backend/tutoring/__init__.py rename to tutoring/__init__.py diff --git a/oser_backend/tutoring/admin.py b/tutoring/admin.py similarity index 100% rename from oser_backend/tutoring/admin.py rename to tutoring/admin.py diff --git a/oser_backend/tutoring/apps.py b/tutoring/apps.py similarity index 100% rename from oser_backend/tutoring/apps.py rename to tutoring/apps.py diff --git a/oser_backend/tutoring/conf.py b/tutoring/conf.py similarity index 100% rename from oser_backend/tutoring/conf.py rename to tutoring/conf.py diff --git a/oser_backend/tutoring/factory.py b/tutoring/factory.py similarity index 100% rename from oser_backend/tutoring/factory.py rename to tutoring/factory.py diff --git a/oser_backend/tutoring/migrations/0001_initial.py b/tutoring/migrations/0001_initial.py similarity index 100% rename from oser_backend/tutoring/migrations/0001_initial.py rename to tutoring/migrations/0001_initial.py diff --git a/oser_backend/tutoring/migrations/0002_auto_20180421_1425.py b/tutoring/migrations/0002_auto_20180421_1425.py similarity index 100% rename from oser_backend/tutoring/migrations/0002_auto_20180421_1425.py rename to tutoring/migrations/0002_auto_20180421_1425.py diff --git a/oser_backend/tutoring/migrations/0003_auto_20180429_1053.py b/tutoring/migrations/0003_auto_20180429_1053.py similarity index 100% rename from oser_backend/tutoring/migrations/0003_auto_20180429_1053.py rename to tutoring/migrations/0003_auto_20180429_1053.py diff --git a/oser_backend/tutoring/migrations/0004_auto_20180429_1159.py b/tutoring/migrations/0004_auto_20180429_1159.py similarity index 100% rename from oser_backend/tutoring/migrations/0004_auto_20180429_1159.py rename to tutoring/migrations/0004_auto_20180429_1159.py diff --git a/oser_backend/tutoring/migrations/0005_auto_20180512_1325.py b/tutoring/migrations/0005_auto_20180512_1325.py similarity index 100% rename from oser_backend/tutoring/migrations/0005_auto_20180512_1325.py rename to tutoring/migrations/0005_auto_20180512_1325.py diff --git a/oser_backend/tutoring/migrations/0006_auto_20180512_1344.py b/tutoring/migrations/0006_auto_20180512_1344.py similarity index 100% rename from oser_backend/tutoring/migrations/0006_auto_20180512_1344.py rename to tutoring/migrations/0006_auto_20180512_1344.py diff --git a/oser_backend/tutoring/migrations/__init__.py b/tutoring/migrations/__init__.py similarity index 100% rename from oser_backend/tutoring/migrations/__init__.py rename to tutoring/migrations/__init__.py diff --git a/oser_backend/tutoring/models.py b/tutoring/models.py similarity index 100% rename from oser_backend/tutoring/models.py rename to tutoring/models.py diff --git a/oser_backend/tutoring/serializers.py b/tutoring/serializers.py similarity index 100% rename from oser_backend/tutoring/serializers.py rename to tutoring/serializers.py diff --git a/oser_backend/tutoring/utils.py b/tutoring/utils.py similarity index 100% rename from oser_backend/tutoring/utils.py rename to tutoring/utils.py diff --git a/oser_backend/tutoring/validators.py b/tutoring/validators.py similarity index 100% rename from oser_backend/tutoring/validators.py rename to tutoring/validators.py diff --git a/oser_backend/tutoring/views.py b/tutoring/views.py similarity index 100% rename from oser_backend/tutoring/views.py rename to tutoring/views.py diff --git a/oser_backend/users/__init__.py b/users/__init__.py similarity index 100% rename from oser_backend/users/__init__.py rename to users/__init__.py diff --git a/oser_backend/users/admin.py b/users/admin.py similarity index 100% rename from oser_backend/users/admin.py rename to users/admin.py diff --git a/oser_backend/users/apps.py b/users/apps.py similarity index 100% rename from oser_backend/users/apps.py rename to users/apps.py diff --git a/oser_backend/users/factory.py b/users/factory.py similarity index 100% rename from oser_backend/users/factory.py rename to users/factory.py diff --git a/oser_backend/users/migrations/0001_initial.py b/users/migrations/0001_initial.py similarity index 100% rename from oser_backend/users/migrations/0001_initial.py rename to users/migrations/0001_initial.py diff --git a/oser_backend/users/migrations/0002_student_registration.py b/users/migrations/0002_student_registration.py similarity index 100% rename from oser_backend/users/migrations/0002_student_registration.py rename to users/migrations/0002_student_registration.py diff --git a/oser_backend/users/migrations/0003_auto_20180505_1734.py b/users/migrations/0003_auto_20180505_1734.py similarity index 100% rename from oser_backend/users/migrations/0003_auto_20180505_1734.py rename to users/migrations/0003_auto_20180505_1734.py diff --git a/oser_backend/users/migrations/__init__.py b/users/migrations/__init__.py similarity index 100% rename from oser_backend/users/migrations/__init__.py rename to users/migrations/__init__.py diff --git a/oser_backend/users/models.py b/users/models.py similarity index 100% rename from oser_backend/users/models.py rename to users/models.py diff --git a/oser_backend/users/serializers.py b/users/serializers.py similarity index 100% rename from oser_backend/users/serializers.py rename to users/serializers.py diff --git a/oser_backend/users/validators.py b/users/validators.py similarity index 100% rename from oser_backend/users/validators.py rename to users/validators.py diff --git a/oser_backend/users/views.py b/users/views.py similarity index 100% rename from oser_backend/users/views.py rename to users/views.py diff --git a/oser_backend/utils.py b/utils.py similarity index 100% rename from oser_backend/utils.py rename to utils.py diff --git a/oser_backend/visits/__init__.py b/visits/__init__.py similarity index 100% rename from oser_backend/visits/__init__.py rename to visits/__init__.py diff --git a/oser_backend/visits/admin.py b/visits/admin.py similarity index 100% rename from oser_backend/visits/admin.py rename to visits/admin.py diff --git a/oser_backend/visits/apps.py b/visits/apps.py similarity index 100% rename from oser_backend/visits/apps.py rename to visits/apps.py diff --git a/oser_backend/visits/factory.py b/visits/factory.py similarity index 100% rename from oser_backend/visits/factory.py rename to visits/factory.py diff --git a/oser_backend/visits/migrations/0001_initial.py b/visits/migrations/0001_initial.py similarity index 100% rename from oser_backend/visits/migrations/0001_initial.py rename to visits/migrations/0001_initial.py diff --git a/oser_backend/visits/migrations/0002_visitparticipant_accepted.py b/visits/migrations/0002_visitparticipant_accepted.py similarity index 100% rename from oser_backend/visits/migrations/0002_visitparticipant_accepted.py rename to visits/migrations/0002_visitparticipant_accepted.py diff --git a/oser_backend/visits/migrations/0003_auto_20180302_1104.py b/visits/migrations/0003_auto_20180302_1104.py similarity index 100% rename from oser_backend/visits/migrations/0003_auto_20180302_1104.py rename to visits/migrations/0003_auto_20180302_1104.py diff --git a/oser_backend/visits/migrations/0004_visitattachedfile.py b/visits/migrations/0004_visitattachedfile.py similarity index 100% rename from oser_backend/visits/migrations/0004_visitattachedfile.py rename to visits/migrations/0004_visitattachedfile.py diff --git a/oser_backend/visits/migrations/0005_remove_visitattachedfile_file.py b/visits/migrations/0005_remove_visitattachedfile_file.py similarity index 100% rename from oser_backend/visits/migrations/0005_remove_visitattachedfile_file.py rename to visits/migrations/0005_remove_visitattachedfile_file.py diff --git a/oser_backend/visits/migrations/0006_visitattachedfile_required.py b/visits/migrations/0006_visitattachedfile_required.py similarity index 100% rename from oser_backend/visits/migrations/0006_visitattachedfile_required.py rename to visits/migrations/0006_visitattachedfile_required.py diff --git a/oser_backend/visits/migrations/0007_auto_20180304_1413.py b/visits/migrations/0007_auto_20180304_1413.py similarity index 100% rename from oser_backend/visits/migrations/0007_auto_20180304_1413.py rename to visits/migrations/0007_auto_20180304_1413.py diff --git a/oser_backend/visits/migrations/0008_auto_20180319_2127.py b/visits/migrations/0008_auto_20180319_2127.py similarity index 100% rename from oser_backend/visits/migrations/0008_auto_20180319_2127.py rename to visits/migrations/0008_auto_20180319_2127.py diff --git a/oser_backend/visits/migrations/0009_auto_20180520_1230.py b/visits/migrations/0009_auto_20180520_1230.py similarity index 100% rename from oser_backend/visits/migrations/0009_auto_20180520_1230.py rename to visits/migrations/0009_auto_20180520_1230.py diff --git a/oser_backend/visits/migrations/0010_auto_20180520_1248.py b/visits/migrations/0010_auto_20180520_1248.py similarity index 100% rename from oser_backend/visits/migrations/0010_auto_20180520_1248.py rename to visits/migrations/0010_auto_20180520_1248.py diff --git a/oser_backend/visits/migrations/0011_auto_20180520_1253.py b/visits/migrations/0011_auto_20180520_1253.py similarity index 100% rename from oser_backend/visits/migrations/0011_auto_20180520_1253.py rename to visits/migrations/0011_auto_20180520_1253.py diff --git a/oser_backend/visits/migrations/0012_auto_20180520_1305.py b/visits/migrations/0012_auto_20180520_1305.py similarity index 100% rename from oser_backend/visits/migrations/0012_auto_20180520_1305.py rename to visits/migrations/0012_auto_20180520_1305.py diff --git a/oser_backend/visits/migrations/0013_visit_organizers.py b/visits/migrations/0013_visit_organizers.py similarity index 100% rename from oser_backend/visits/migrations/0013_visit_organizers.py rename to visits/migrations/0013_visit_organizers.py diff --git a/oser_backend/visits/migrations/0014_auto_20180520_1317.py b/visits/migrations/0014_auto_20180520_1317.py similarity index 100% rename from oser_backend/visits/migrations/0014_auto_20180520_1317.py rename to visits/migrations/0014_auto_20180520_1317.py diff --git a/oser_backend/visits/migrations/0015_auto_20180520_1403.py b/visits/migrations/0015_auto_20180520_1403.py similarity index 100% rename from oser_backend/visits/migrations/0015_auto_20180520_1403.py rename to visits/migrations/0015_auto_20180520_1403.py diff --git a/oser_backend/visits/migrations/0016_auto_20180522_2139.py b/visits/migrations/0016_auto_20180522_2139.py similarity index 100% rename from oser_backend/visits/migrations/0016_auto_20180522_2139.py rename to visits/migrations/0016_auto_20180522_2139.py diff --git a/oser_backend/visits/migrations/0017_auto_20180522_2233.py b/visits/migrations/0017_auto_20180522_2233.py similarity index 100% rename from oser_backend/visits/migrations/0017_auto_20180522_2233.py rename to visits/migrations/0017_auto_20180522_2233.py diff --git a/oser_backend/visits/migrations/0018_auto_20180523_2156.py b/visits/migrations/0018_auto_20180523_2156.py similarity index 100% rename from oser_backend/visits/migrations/0018_auto_20180523_2156.py rename to visits/migrations/0018_auto_20180523_2156.py diff --git a/oser_backend/visits/migrations/0019_auto_20180526_2034.py b/visits/migrations/0019_auto_20180526_2034.py similarity index 100% rename from oser_backend/visits/migrations/0019_auto_20180526_2034.py rename to visits/migrations/0019_auto_20180526_2034.py diff --git a/oser_backend/visits/migrations/__init__.py b/visits/migrations/__init__.py similarity index 100% rename from oser_backend/visits/migrations/__init__.py rename to visits/migrations/__init__.py diff --git a/oser_backend/visits/models.py b/visits/models.py similarity index 100% rename from oser_backend/visits/models.py rename to visits/models.py diff --git a/oser_backend/visits/notifications.py b/visits/notifications.py similarity index 100% rename from oser_backend/visits/notifications.py rename to visits/notifications.py diff --git a/oser_backend/visits/serializers.py b/visits/serializers.py similarity index 100% rename from oser_backend/visits/serializers.py rename to visits/serializers.py diff --git a/oser_backend/visits/settings.py b/visits/settings.py similarity index 100% rename from oser_backend/visits/settings.py rename to visits/settings.py diff --git a/oser_backend/visits/signals.py b/visits/signals.py similarity index 100% rename from oser_backend/visits/signals.py rename to visits/signals.py diff --git a/oser_backend/visits/templates/visits/confirm_participation.md b/visits/templates/visits/confirm_participation.md similarity index 100% rename from oser_backend/visits/templates/visits/confirm_participation.md rename to visits/templates/visits/confirm_participation.md diff --git a/oser_backend/visits/templates/visits/participation_cancelled.md b/visits/templates/visits/participation_cancelled.md similarity index 100% rename from oser_backend/visits/templates/visits/participation_cancelled.md rename to visits/templates/visits/participation_cancelled.md diff --git a/oser_backend/visits/views.py b/visits/views.py similarity index 100% rename from oser_backend/visits/views.py rename to visits/views.py