From 89ffdccc28bc46d7c30609b55a166007bb4f6346 Mon Sep 17 00:00:00 2001
From: janmax <j.michal@stud.uni-goettingen.de>
Date: Thu, 30 Nov 2017 11:52:06 +0100
Subject: [PATCH] Moved the first bunch of files
---
Makefile | 32 ++++++-------
backend/Makefile | 42 ------------------
{backend/core => core}/__init__.py | 0
{backend/core => core}/admin.py | 0
{backend/core => core}/apps.py | 0
{backend/core => core}/grady_speak.py | 0
.../core => core}/migrations/0001_initial.py | 0
.../migrations/0002_auto_20171110_1612.py | 0
.../migrations/0003_student_matrikel_no.py | 0
{backend/core => core}/migrations/__init__.py | 0
{backend/core => core}/models.py | 0
{backend/core => core}/permissions.py | 0
{backend/core => core}/serializers.py | 0
{backend/core => core}/tests/__init__.py | 0
.../core => core}/tests/data_factories.py | 0
.../core => core}/tests/test_access_rights.py | 0
{backend/core => core}/tests/test_auth.py | 0
{backend/core => core}/tests/test_examlist.py | 0
.../tests/test_factory_and_feedback.py | 0
.../core => core}/tests/test_student_page.py | 0
.../tests/test_student_reviewer_viewset.py | 0
.../tests/test_submissiontypeview.py | 0
.../tests/test_tutor_api_endpoints.py | 0
{backend/core => core}/urls.py | 0
{backend/core => core}/views.py | 0
backend/delbert.py => delbert.py | 0
.../Entity Relation Model.erdplus | 0
.../Database Design/Relational Schema.erdplus | 0
.../Database Design/er-model.graphml | 0
.../erdplus-diagram-pdf-export.pdf | Bin
.../erdplus-er-model-export.pdf | Bin
{backend/docs => docs}/core_uml.png | Bin
{backend/grady => grady}/__init__.py | 0
{backend/grady => grady}/settings/__init__.py | 0
{backend/grady => grady}/settings/default.py | 0
{backend/grady => grady}/settings/live.py | 0
{backend/grady => grady}/urls.py | 0
{backend/grady => grady}/wsgi.py | 0
backend/manage.py => manage.py | 0
backend/requirements.txt => requirements.txt | 0
{backend/scripts => scripts}/README.rst | 0
{backend/scripts => scripts}/compile.py | 0
{backend/util => util}/__init__.py | 0
{backend/util => util}/convert.py | 0
{backend/util => util}/factories.py | 0
{backend/util => util}/importer.py | 0
{backend/util => util}/messages.py | 0
{backend/util => util}/processing.py | 0
{backend/util => util}/testcases.py | 0
49 files changed, 13 insertions(+), 61 deletions(-)
delete mode 100644 backend/Makefile
rename {backend/core => core}/__init__.py (100%)
rename {backend/core => core}/admin.py (100%)
rename {backend/core => core}/apps.py (100%)
rename {backend/core => core}/grady_speak.py (100%)
rename {backend/core => core}/migrations/0001_initial.py (100%)
rename {backend/core => core}/migrations/0002_auto_20171110_1612.py (100%)
rename {backend/core => core}/migrations/0003_student_matrikel_no.py (100%)
rename {backend/core => core}/migrations/__init__.py (100%)
rename {backend/core => core}/models.py (100%)
rename {backend/core => core}/permissions.py (100%)
rename {backend/core => core}/serializers.py (100%)
rename {backend/core => core}/tests/__init__.py (100%)
rename {backend/core => core}/tests/data_factories.py (100%)
rename {backend/core => core}/tests/test_access_rights.py (100%)
rename {backend/core => core}/tests/test_auth.py (100%)
rename {backend/core => core}/tests/test_examlist.py (100%)
rename {backend/core => core}/tests/test_factory_and_feedback.py (100%)
rename {backend/core => core}/tests/test_student_page.py (100%)
rename {backend/core => core}/tests/test_student_reviewer_viewset.py (100%)
rename {backend/core => core}/tests/test_submissiontypeview.py (100%)
rename {backend/core => core}/tests/test_tutor_api_endpoints.py (100%)
rename {backend/core => core}/urls.py (100%)
rename {backend/core => core}/views.py (100%)
rename backend/delbert.py => delbert.py (100%)
rename {backend/docs => docs}/Database Design/Entity Relation Model.erdplus (100%)
rename {backend/docs => docs}/Database Design/Relational Schema.erdplus (100%)
rename {backend/docs => docs}/Database Design/er-model.graphml (100%)
rename {backend/docs => docs}/Database Design/erdplus-diagram-pdf-export.pdf (100%)
rename {backend/docs => docs}/Database Design/erdplus-er-model-export.pdf (100%)
rename {backend/docs => docs}/core_uml.png (100%)
rename {backend/grady => grady}/__init__.py (100%)
rename {backend/grady => grady}/settings/__init__.py (100%)
rename {backend/grady => grady}/settings/default.py (100%)
rename {backend/grady => grady}/settings/live.py (100%)
rename {backend/grady => grady}/urls.py (100%)
rename {backend/grady => grady}/wsgi.py (100%)
rename backend/manage.py => manage.py (100%)
rename backend/requirements.txt => requirements.txt (100%)
rename {backend/scripts => scripts}/README.rst (100%)
rename {backend/scripts => scripts}/compile.py (100%)
rename {backend/util => util}/__init__.py (100%)
rename {backend/util => util}/convert.py (100%)
rename {backend/util => util}/factories.py (100%)
rename {backend/util => util}/importer.py (100%)
rename {backend/util => util}/messages.py (100%)
rename {backend/util => util}/processing.py (100%)
rename {backend/util => util}/testcases.py (100%)
diff --git a/Makefile b/Makefile
index 4b670d2d..64d359b2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,14 @@ DB_NAME = postgres
.PHONY: collectstatic run install migrations-check isort isort-check
collectstatic: # used only in production
- ./backend/manage.py collectstatic --ignore node_modules
- ./manage.py compress --force
+ python manage.py collectstatic --ignore node_modules
+ python manage.py compress --force
run:
- python backend/manage.py runserver 0.0.0.0:8000
+ python manage.py runserver 0.0.0.0:8000
migrations-check:
- python backend/manage.py makemigrations --check --dry-run
+ python manage.py makemigrations --check --dry-run
isort:
isort -rc $(APP_LIST)
@@ -20,29 +20,23 @@ isort-check:
isort -c -rc $(APP_LIST)
loaddata:
- ./backend/manage.py loaddata core/fixtures/testdata-groups.json
+ python manage.py loaddata core/fixtures/testdata-groups.json
loadexamples:
- ./backend/manage.py loaddata core/fixtures/testdata-user.json
- ./backend/manage.py loaddata core/fixtures/testdata-core.json
+ python manage.py loaddata core/fixtures/testdata-user.json
+ python manage.py loaddata core/fixtures/testdata-core.json
install:
- pip install -r backend/requirements.txt
- yarn --cwd frontend/
- yarn --cwd backend/
+ pip install -r requirements.txt
+ yarn
test:
- python backend/manage.py run test
+ python manage.py test
coverage:
- coverage run backend/manage.py test
+ coverage run manage.py test
coverage report
-docker-db-create:
- docker create --name $(DB_NAME) -p 5432:5432 postgres:9.5
+db:
+ docker run --rm --name $(DB_NAME) -p 5432:5432 postgres:9.5
-docker-db-start:
- docker start $(DB_NAME)
-
-docker-db-stop:
- docker stop $(DB_NAME)
diff --git a/backend/Makefile b/backend/Makefile
deleted file mode 100644
index 64d359b2..00000000
--- a/backend/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-APP_LIST ?= core grady util
-DB_NAME = postgres
-
-.PHONY: collectstatic run install migrations-check isort isort-check
-
-collectstatic: # used only in production
- python manage.py collectstatic --ignore node_modules
- python manage.py compress --force
-
-run:
- python manage.py runserver 0.0.0.0:8000
-
-migrations-check:
- python manage.py makemigrations --check --dry-run
-
-isort:
- isort -rc $(APP_LIST)
-
-isort-check:
- isort -c -rc $(APP_LIST)
-
-loaddata:
- python manage.py loaddata core/fixtures/testdata-groups.json
-
-loadexamples:
- python manage.py loaddata core/fixtures/testdata-user.json
- python manage.py loaddata core/fixtures/testdata-core.json
-
-install:
- pip install -r requirements.txt
- yarn
-
-test:
- python manage.py test
-
-coverage:
- coverage run manage.py test
- coverage report
-
-db:
- docker run --rm --name $(DB_NAME) -p 5432:5432 postgres:9.5
-
diff --git a/backend/core/__init__.py b/core/__init__.py
similarity index 100%
rename from backend/core/__init__.py
rename to core/__init__.py
diff --git a/backend/core/admin.py b/core/admin.py
similarity index 100%
rename from backend/core/admin.py
rename to core/admin.py
diff --git a/backend/core/apps.py b/core/apps.py
similarity index 100%
rename from backend/core/apps.py
rename to core/apps.py
diff --git a/backend/core/grady_speak.py b/core/grady_speak.py
similarity index 100%
rename from backend/core/grady_speak.py
rename to core/grady_speak.py
diff --git a/backend/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
similarity index 100%
rename from backend/core/migrations/0001_initial.py
rename to core/migrations/0001_initial.py
diff --git a/backend/core/migrations/0002_auto_20171110_1612.py b/core/migrations/0002_auto_20171110_1612.py
similarity index 100%
rename from backend/core/migrations/0002_auto_20171110_1612.py
rename to core/migrations/0002_auto_20171110_1612.py
diff --git a/backend/core/migrations/0003_student_matrikel_no.py b/core/migrations/0003_student_matrikel_no.py
similarity index 100%
rename from backend/core/migrations/0003_student_matrikel_no.py
rename to core/migrations/0003_student_matrikel_no.py
diff --git a/backend/core/migrations/__init__.py b/core/migrations/__init__.py
similarity index 100%
rename from backend/core/migrations/__init__.py
rename to core/migrations/__init__.py
diff --git a/backend/core/models.py b/core/models.py
similarity index 100%
rename from backend/core/models.py
rename to core/models.py
diff --git a/backend/core/permissions.py b/core/permissions.py
similarity index 100%
rename from backend/core/permissions.py
rename to core/permissions.py
diff --git a/backend/core/serializers.py b/core/serializers.py
similarity index 100%
rename from backend/core/serializers.py
rename to core/serializers.py
diff --git a/backend/core/tests/__init__.py b/core/tests/__init__.py
similarity index 100%
rename from backend/core/tests/__init__.py
rename to core/tests/__init__.py
diff --git a/backend/core/tests/data_factories.py b/core/tests/data_factories.py
similarity index 100%
rename from backend/core/tests/data_factories.py
rename to core/tests/data_factories.py
diff --git a/backend/core/tests/test_access_rights.py b/core/tests/test_access_rights.py
similarity index 100%
rename from backend/core/tests/test_access_rights.py
rename to core/tests/test_access_rights.py
diff --git a/backend/core/tests/test_auth.py b/core/tests/test_auth.py
similarity index 100%
rename from backend/core/tests/test_auth.py
rename to core/tests/test_auth.py
diff --git a/backend/core/tests/test_examlist.py b/core/tests/test_examlist.py
similarity index 100%
rename from backend/core/tests/test_examlist.py
rename to core/tests/test_examlist.py
diff --git a/backend/core/tests/test_factory_and_feedback.py b/core/tests/test_factory_and_feedback.py
similarity index 100%
rename from backend/core/tests/test_factory_and_feedback.py
rename to core/tests/test_factory_and_feedback.py
diff --git a/backend/core/tests/test_student_page.py b/core/tests/test_student_page.py
similarity index 100%
rename from backend/core/tests/test_student_page.py
rename to core/tests/test_student_page.py
diff --git a/backend/core/tests/test_student_reviewer_viewset.py b/core/tests/test_student_reviewer_viewset.py
similarity index 100%
rename from backend/core/tests/test_student_reviewer_viewset.py
rename to core/tests/test_student_reviewer_viewset.py
diff --git a/backend/core/tests/test_submissiontypeview.py b/core/tests/test_submissiontypeview.py
similarity index 100%
rename from backend/core/tests/test_submissiontypeview.py
rename to core/tests/test_submissiontypeview.py
diff --git a/backend/core/tests/test_tutor_api_endpoints.py b/core/tests/test_tutor_api_endpoints.py
similarity index 100%
rename from backend/core/tests/test_tutor_api_endpoints.py
rename to core/tests/test_tutor_api_endpoints.py
diff --git a/backend/core/urls.py b/core/urls.py
similarity index 100%
rename from backend/core/urls.py
rename to core/urls.py
diff --git a/backend/core/views.py b/core/views.py
similarity index 100%
rename from backend/core/views.py
rename to core/views.py
diff --git a/backend/delbert.py b/delbert.py
similarity index 100%
rename from backend/delbert.py
rename to delbert.py
diff --git a/backend/docs/Database Design/Entity Relation Model.erdplus b/docs/Database Design/Entity Relation Model.erdplus
similarity index 100%
rename from backend/docs/Database Design/Entity Relation Model.erdplus
rename to docs/Database Design/Entity Relation Model.erdplus
diff --git a/backend/docs/Database Design/Relational Schema.erdplus b/docs/Database Design/Relational Schema.erdplus
similarity index 100%
rename from backend/docs/Database Design/Relational Schema.erdplus
rename to docs/Database Design/Relational Schema.erdplus
diff --git a/backend/docs/Database Design/er-model.graphml b/docs/Database Design/er-model.graphml
similarity index 100%
rename from backend/docs/Database Design/er-model.graphml
rename to docs/Database Design/er-model.graphml
diff --git a/backend/docs/Database Design/erdplus-diagram-pdf-export.pdf b/docs/Database Design/erdplus-diagram-pdf-export.pdf
similarity index 100%
rename from backend/docs/Database Design/erdplus-diagram-pdf-export.pdf
rename to docs/Database Design/erdplus-diagram-pdf-export.pdf
diff --git a/backend/docs/Database Design/erdplus-er-model-export.pdf b/docs/Database Design/erdplus-er-model-export.pdf
similarity index 100%
rename from backend/docs/Database Design/erdplus-er-model-export.pdf
rename to docs/Database Design/erdplus-er-model-export.pdf
diff --git a/backend/docs/core_uml.png b/docs/core_uml.png
similarity index 100%
rename from backend/docs/core_uml.png
rename to docs/core_uml.png
diff --git a/backend/grady/__init__.py b/grady/__init__.py
similarity index 100%
rename from backend/grady/__init__.py
rename to grady/__init__.py
diff --git a/backend/grady/settings/__init__.py b/grady/settings/__init__.py
similarity index 100%
rename from backend/grady/settings/__init__.py
rename to grady/settings/__init__.py
diff --git a/backend/grady/settings/default.py b/grady/settings/default.py
similarity index 100%
rename from backend/grady/settings/default.py
rename to grady/settings/default.py
diff --git a/backend/grady/settings/live.py b/grady/settings/live.py
similarity index 100%
rename from backend/grady/settings/live.py
rename to grady/settings/live.py
diff --git a/backend/grady/urls.py b/grady/urls.py
similarity index 100%
rename from backend/grady/urls.py
rename to grady/urls.py
diff --git a/backend/grady/wsgi.py b/grady/wsgi.py
similarity index 100%
rename from backend/grady/wsgi.py
rename to grady/wsgi.py
diff --git a/backend/manage.py b/manage.py
similarity index 100%
rename from backend/manage.py
rename to manage.py
diff --git a/backend/requirements.txt b/requirements.txt
similarity index 100%
rename from backend/requirements.txt
rename to requirements.txt
diff --git a/backend/scripts/README.rst b/scripts/README.rst
similarity index 100%
rename from backend/scripts/README.rst
rename to scripts/README.rst
diff --git a/backend/scripts/compile.py b/scripts/compile.py
similarity index 100%
rename from backend/scripts/compile.py
rename to scripts/compile.py
diff --git a/backend/util/__init__.py b/util/__init__.py
similarity index 100%
rename from backend/util/__init__.py
rename to util/__init__.py
diff --git a/backend/util/convert.py b/util/convert.py
similarity index 100%
rename from backend/util/convert.py
rename to util/convert.py
diff --git a/backend/util/factories.py b/util/factories.py
similarity index 100%
rename from backend/util/factories.py
rename to util/factories.py
diff --git a/backend/util/importer.py b/util/importer.py
similarity index 100%
rename from backend/util/importer.py
rename to util/importer.py
diff --git a/backend/util/messages.py b/util/messages.py
similarity index 100%
rename from backend/util/messages.py
rename to util/messages.py
diff --git a/backend/util/processing.py b/util/processing.py
similarity index 100%
rename from backend/util/processing.py
rename to util/processing.py
diff --git a/backend/util/testcases.py b/util/testcases.py
similarity index 100%
rename from backend/util/testcases.py
rename to util/testcases.py
--
GitLab