From 829efffce71faa399558dea05aa3536c943bd537 Mon Sep 17 00:00:00 2001 From: prance Date: Thu, 27 Jan 2022 19:17:26 +0100 Subject: [PATCH] Cleanup --- .gitignore | 2 +- .../OpenRefineAuth => MUOR/MUOR}/__init__.py | 0 {Serwer_django/Serwer_django => MUOR/MUOR}/asgi.py | 4 ++-- .../Serwer_django => MUOR/MUOR}/settings.py | 9 ++++----- {Serwer_django/Serwer_django => MUOR/MUOR}/urls.py | 2 +- {Serwer_django/Serwer_django => MUOR/MUOR}/views.py | 0 {Serwer_django/Serwer_django => MUOR/MUOR}/wsgi.py | 4 ++-- .../migrations => MUOR/OpenRefineAuth}/__init__.py | 0 {Serwer_django => MUOR}/OpenRefineAuth/admin.py | 0 {Serwer_django => MUOR}/OpenRefineAuth/apps.py | 0 .../OpenRefineAuth/migrations}/__init__.py | 0 {Serwer_django => MUOR}/OpenRefineAuth/models.py | 0 {Serwer_django => MUOR}/OpenRefineAuth/tests.py | 0 {Serwer_django => MUOR}/OpenRefineAuth/views.py | 0 {Serwer_django => MUOR}/db.sqlite3 | Bin {Serwer_django => MUOR}/manage.py | 2 +- MUOR/requirements.txt | 2 ++ {Serwer_django => MUOR}/static/images/favicon.ico | Bin {Serwer_django => MUOR}/static/images/logo.png | Bin {Serwer_django => MUOR}/static/images/logo.svg | 0 {Serwer_django => MUOR}/templates/base.html | 0 {Serwer_django => MUOR}/templates/home.html | 0 .../templates/registration/login.html | 0 .../templates/registration/signup.html | 0 README.md | 8 ++++---- 25 files changed, 17 insertions(+), 16 deletions(-) rename {Serwer_django/OpenRefineAuth => MUOR/MUOR}/__init__.py (100%) rename {Serwer_django/Serwer_django => MUOR/MUOR}/asgi.py (71%) rename {Serwer_django/Serwer_django => MUOR/MUOR}/settings.py (95%) rename {Serwer_django/Serwer_django => MUOR/MUOR}/urls.py (97%) rename {Serwer_django/Serwer_django => MUOR/MUOR}/views.py (100%) rename {Serwer_django/Serwer_django => MUOR/MUOR}/wsgi.py (71%) rename {Serwer_django/OpenRefineAuth/migrations => MUOR/OpenRefineAuth}/__init__.py (100%) rename {Serwer_django => MUOR}/OpenRefineAuth/admin.py (100%) rename {Serwer_django => MUOR}/OpenRefineAuth/apps.py (100%) rename {Serwer_django/Serwer_django => MUOR/OpenRefineAuth/migrations}/__init__.py (100%) rename {Serwer_django => MUOR}/OpenRefineAuth/models.py (100%) rename {Serwer_django => MUOR}/OpenRefineAuth/tests.py (100%) rename {Serwer_django => MUOR}/OpenRefineAuth/views.py (100%) rename {Serwer_django => MUOR}/db.sqlite3 (100%) rename {Serwer_django => MUOR}/manage.py (88%) create mode 100644 MUOR/requirements.txt rename {Serwer_django => MUOR}/static/images/favicon.ico (100%) rename {Serwer_django => MUOR}/static/images/logo.png (100%) rename {Serwer_django => MUOR}/static/images/logo.svg (100%) rename {Serwer_django => MUOR}/templates/base.html (100%) rename {Serwer_django => MUOR}/templates/home.html (100%) rename {Serwer_django => MUOR}/templates/registration/login.html (100%) rename {Serwer_django => MUOR}/templates/registration/signup.html (100%) diff --git a/.gitignore b/.gitignore index a952aef68..cf5aa23b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/Serwer_django/.idea/* +/MUOR/.idea/* diff --git a/Serwer_django/OpenRefineAuth/__init__.py b/MUOR/MUOR/__init__.py similarity index 100% rename from Serwer_django/OpenRefineAuth/__init__.py rename to MUOR/MUOR/__init__.py diff --git a/Serwer_django/Serwer_django/asgi.py b/MUOR/MUOR/asgi.py similarity index 71% rename from Serwer_django/Serwer_django/asgi.py rename to MUOR/MUOR/asgi.py index fed472541..2cd99fc67 100644 --- a/Serwer_django/Serwer_django/asgi.py +++ b/MUOR/MUOR/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for Serwer_django project. +ASGI config for MUOR project. It exposes the ASGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Serwer_django.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'MUOR.settings') application = get_asgi_application() diff --git a/Serwer_django/Serwer_django/settings.py b/MUOR/MUOR/settings.py similarity index 95% rename from Serwer_django/Serwer_django/settings.py rename to MUOR/MUOR/settings.py index 18c94182a..b7c21faa4 100644 --- a/Serwer_django/Serwer_django/settings.py +++ b/MUOR/MUOR/settings.py @@ -1,5 +1,5 @@ """ -Django settings for Serwer_django project. +Django settings for MUOR project. Generated by 'django-admin startproject' using Django 4.0.1. @@ -25,8 +25,7 @@ SECRET_KEY = 'django-insecure-t52#vo-k9ty*$@u9bf75hrkd#^o_)gadrz9$7w%xnkb-0#y!bi # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] - +ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] # Application definition @@ -50,7 +49,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'Serwer_django.urls' +ROOT_URLCONF = 'MUOR.urls' TEMPLATES = [ { @@ -69,7 +68,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'Serwer_django.wsgi.application' +WSGI_APPLICATION = 'MUOR.wsgi.application' # Database diff --git a/Serwer_django/Serwer_django/urls.py b/MUOR/MUOR/urls.py similarity index 97% rename from Serwer_django/Serwer_django/urls.py rename to MUOR/MUOR/urls.py index cb2245fac..409392b1d 100644 --- a/Serwer_django/Serwer_django/urls.py +++ b/MUOR/MUOR/urls.py @@ -1,4 +1,4 @@ -"""Serwer_django URL Configuration +"""MUOR URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/4.0/topics/http/urls/ diff --git a/Serwer_django/Serwer_django/views.py b/MUOR/MUOR/views.py similarity index 100% rename from Serwer_django/Serwer_django/views.py rename to MUOR/MUOR/views.py diff --git a/Serwer_django/Serwer_django/wsgi.py b/MUOR/MUOR/wsgi.py similarity index 71% rename from Serwer_django/Serwer_django/wsgi.py rename to MUOR/MUOR/wsgi.py index 538ef2af3..bedb6d79f 100644 --- a/Serwer_django/Serwer_django/wsgi.py +++ b/MUOR/MUOR/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for Serwer_django project. +WSGI config for MUOR project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Serwer_django.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'MUOR.settings') application = get_wsgi_application() diff --git a/Serwer_django/OpenRefineAuth/migrations/__init__.py b/MUOR/OpenRefineAuth/__init__.py similarity index 100% rename from Serwer_django/OpenRefineAuth/migrations/__init__.py rename to MUOR/OpenRefineAuth/__init__.py diff --git a/Serwer_django/OpenRefineAuth/admin.py b/MUOR/OpenRefineAuth/admin.py similarity index 100% rename from Serwer_django/OpenRefineAuth/admin.py rename to MUOR/OpenRefineAuth/admin.py diff --git a/Serwer_django/OpenRefineAuth/apps.py b/MUOR/OpenRefineAuth/apps.py similarity index 100% rename from Serwer_django/OpenRefineAuth/apps.py rename to MUOR/OpenRefineAuth/apps.py diff --git a/Serwer_django/Serwer_django/__init__.py b/MUOR/OpenRefineAuth/migrations/__init__.py similarity index 100% rename from Serwer_django/Serwer_django/__init__.py rename to MUOR/OpenRefineAuth/migrations/__init__.py diff --git a/Serwer_django/OpenRefineAuth/models.py b/MUOR/OpenRefineAuth/models.py similarity index 100% rename from Serwer_django/OpenRefineAuth/models.py rename to MUOR/OpenRefineAuth/models.py diff --git a/Serwer_django/OpenRefineAuth/tests.py b/MUOR/OpenRefineAuth/tests.py similarity index 100% rename from Serwer_django/OpenRefineAuth/tests.py rename to MUOR/OpenRefineAuth/tests.py diff --git a/Serwer_django/OpenRefineAuth/views.py b/MUOR/OpenRefineAuth/views.py similarity index 100% rename from Serwer_django/OpenRefineAuth/views.py rename to MUOR/OpenRefineAuth/views.py diff --git a/Serwer_django/db.sqlite3 b/MUOR/db.sqlite3 similarity index 100% rename from Serwer_django/db.sqlite3 rename to MUOR/db.sqlite3 diff --git a/Serwer_django/manage.py b/MUOR/manage.py similarity index 88% rename from Serwer_django/manage.py rename to MUOR/manage.py index 93b7975e0..c688875c0 100755 --- a/Serwer_django/manage.py +++ b/MUOR/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Serwer_django.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'MUOR.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/MUOR/requirements.txt b/MUOR/requirements.txt new file mode 100644 index 000000000..b21047552 --- /dev/null +++ b/MUOR/requirements.txt @@ -0,0 +1,2 @@ +Django +django-crispy-forms \ No newline at end of file diff --git a/Serwer_django/static/images/favicon.ico b/MUOR/static/images/favicon.ico similarity index 100% rename from Serwer_django/static/images/favicon.ico rename to MUOR/static/images/favicon.ico diff --git a/Serwer_django/static/images/logo.png b/MUOR/static/images/logo.png similarity index 100% rename from Serwer_django/static/images/logo.png rename to MUOR/static/images/logo.png diff --git a/Serwer_django/static/images/logo.svg b/MUOR/static/images/logo.svg similarity index 100% rename from Serwer_django/static/images/logo.svg rename to MUOR/static/images/logo.svg diff --git a/Serwer_django/templates/base.html b/MUOR/templates/base.html similarity index 100% rename from Serwer_django/templates/base.html rename to MUOR/templates/base.html diff --git a/Serwer_django/templates/home.html b/MUOR/templates/home.html similarity index 100% rename from Serwer_django/templates/home.html rename to MUOR/templates/home.html diff --git a/Serwer_django/templates/registration/login.html b/MUOR/templates/registration/login.html similarity index 100% rename from Serwer_django/templates/registration/login.html rename to MUOR/templates/registration/login.html diff --git a/Serwer_django/templates/registration/signup.html b/MUOR/templates/registration/signup.html similarity index 100% rename from Serwer_django/templates/registration/signup.html rename to MUOR/templates/registration/signup.html diff --git a/README.md b/README.md index 18cc68fb0..202853344 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # MultiUserOpenRefine -![MultiUserOpenRefine](Serwer_django/static/images/logo.svg) +![MultiUserOpenRefine](MUOR/static/images/logo.svg) -MultiUserOpenRefine is an extension to open-source tool that, in addition to -all the features described below, allows creating user accounts, each providing -private workspace and leaving the convenience of running the basic OpenRefine +MultiUserOpenRefine is an extension to open-source tool that, in addition to all +the features described below, allows creating user accounts, each providing +private workspace and leaving the convenience of running the basic OpenRefine tool on a remote server. Project is being developed at Adam Mickiewicz University in Poznań by students.