diff --git a/.gitignore b/.gitignore index 4d9aa5d..6eb7afe 100644 --- a/.gitignore +++ b/.gitignore @@ -129,5 +129,5 @@ dmypy.json .pyre/ *.swp -dcc/storage +ram/storage arduino/CommandStation-EX/build/ diff --git a/dcc/consist/__init__.py b/ram/consist/__init__.py similarity index 100% rename from dcc/consist/__init__.py rename to ram/consist/__init__.py diff --git a/dcc/consist/admin.py b/ram/consist/admin.py similarity index 100% rename from dcc/consist/admin.py rename to ram/consist/admin.py diff --git a/dcc/consist/apps.py b/ram/consist/apps.py similarity index 100% rename from dcc/consist/apps.py rename to ram/consist/apps.py diff --git a/dcc/consist/migrations/0001_initial.py b/ram/consist/migrations/0001_initial.py similarity index 100% rename from dcc/consist/migrations/0001_initial.py rename to ram/consist/migrations/0001_initial.py diff --git a/dcc/consist/migrations/__init__.py b/ram/consist/migrations/__init__.py similarity index 100% rename from dcc/consist/migrations/__init__.py rename to ram/consist/migrations/__init__.py diff --git a/dcc/consist/models.py b/ram/consist/models.py similarity index 100% rename from dcc/consist/models.py rename to ram/consist/models.py diff --git a/dcc/consist/serializers.py b/ram/consist/serializers.py similarity index 100% rename from dcc/consist/serializers.py rename to ram/consist/serializers.py diff --git a/dcc/consist/tests.py b/ram/consist/tests.py similarity index 100% rename from dcc/consist/tests.py rename to ram/consist/tests.py diff --git a/dcc/consist/urls.py b/ram/consist/urls.py similarity index 100% rename from dcc/consist/urls.py rename to ram/consist/urls.py diff --git a/dcc/consist/views.py b/ram/consist/views.py similarity index 100% rename from dcc/consist/views.py rename to ram/consist/views.py diff --git a/dcc/driver/__init__.py b/ram/driver/__init__.py similarity index 100% rename from dcc/driver/__init__.py rename to ram/driver/__init__.py diff --git a/dcc/driver/admin.py b/ram/driver/admin.py similarity index 100% rename from dcc/driver/admin.py rename to ram/driver/admin.py diff --git a/dcc/driver/apps.py b/ram/driver/apps.py similarity index 100% rename from dcc/driver/apps.py rename to ram/driver/apps.py diff --git a/dcc/driver/connector.py b/ram/driver/connector.py similarity index 100% rename from dcc/driver/connector.py rename to ram/driver/connector.py diff --git a/dcc/driver/health.py b/ram/driver/health.py similarity index 100% rename from dcc/driver/health.py rename to ram/driver/health.py diff --git a/dcc/driver/migrations/0001_initial.py b/ram/driver/migrations/0001_initial.py similarity index 100% rename from dcc/driver/migrations/0001_initial.py rename to ram/driver/migrations/0001_initial.py diff --git a/dcc/driver/migrations/0002_driverconfiguration_network_and_more.py b/ram/driver/migrations/0002_driverconfiguration_network_and_more.py similarity index 100% rename from dcc/driver/migrations/0002_driverconfiguration_network_and_more.py rename to ram/driver/migrations/0002_driverconfiguration_network_and_more.py diff --git a/dcc/driver/migrations/0003_alter_driverconfiguration_network_and_more.py b/ram/driver/migrations/0003_alter_driverconfiguration_network_and_more.py similarity index 100% rename from dcc/driver/migrations/0003_alter_driverconfiguration_network_and_more.py rename to ram/driver/migrations/0003_alter_driverconfiguration_network_and_more.py diff --git a/dcc/driver/migrations/0004_alter_driverconfiguration_remote_host.py b/ram/driver/migrations/0004_alter_driverconfiguration_remote_host.py similarity index 100% rename from dcc/driver/migrations/0004_alter_driverconfiguration_remote_host.py rename to ram/driver/migrations/0004_alter_driverconfiguration_remote_host.py diff --git a/dcc/driver/migrations/__init__.py b/ram/driver/migrations/__init__.py similarity index 100% rename from dcc/driver/migrations/__init__.py rename to ram/driver/migrations/__init__.py diff --git a/dcc/driver/models.py b/ram/driver/models.py similarity index 100% rename from dcc/driver/models.py rename to ram/driver/models.py diff --git a/dcc/driver/serializers.py b/ram/driver/serializers.py similarity index 100% rename from dcc/driver/serializers.py rename to ram/driver/serializers.py diff --git a/dcc/driver/tests.py b/ram/driver/tests.py similarity index 100% rename from dcc/driver/tests.py rename to ram/driver/tests.py diff --git a/dcc/driver/urls.py b/ram/driver/urls.py similarity index 100% rename from dcc/driver/urls.py rename to ram/driver/urls.py diff --git a/dcc/driver/views.py b/ram/driver/views.py similarity index 99% rename from dcc/driver/views.py rename to ram/driver/views.py index 4a50b9d..1e8cfdc 100644 --- a/dcc/driver/views.py +++ b/ram/driver/views.py @@ -10,7 +10,7 @@ from rest_framework.permissions import ( SAFE_METHODS ) -from dcc.parsers import PlainTextParser +from ram.parsers import PlainTextParser from driver.models import DriverConfiguration from driver.connector import Connector from driver.serializers import ( diff --git a/dcc/manage.py b/ram/manage.py similarity index 90% rename from dcc/manage.py rename to ram/manage.py index 20ea1dc..62e15eb 100755 --- a/dcc/manage.py +++ b/ram/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcc.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ram.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/dcc/metadata/__init__.py b/ram/metadata/__init__.py similarity index 100% rename from dcc/metadata/__init__.py rename to ram/metadata/__init__.py diff --git a/dcc/metadata/admin.py b/ram/metadata/admin.py similarity index 100% rename from dcc/metadata/admin.py rename to ram/metadata/admin.py diff --git a/dcc/metadata/apps.py b/ram/metadata/apps.py similarity index 100% rename from dcc/metadata/apps.py rename to ram/metadata/apps.py diff --git a/dcc/metadata/migrations/0001_initial.py b/ram/metadata/migrations/0001_initial.py similarity index 100% rename from dcc/metadata/migrations/0001_initial.py rename to ram/metadata/migrations/0001_initial.py diff --git a/dcc/metadata/migrations/__init__.py b/ram/metadata/migrations/__init__.py similarity index 100% rename from dcc/metadata/migrations/__init__.py rename to ram/metadata/migrations/__init__.py diff --git a/dcc/metadata/models.py b/ram/metadata/models.py similarity index 98% rename from dcc/metadata/models.py rename to ram/metadata/models.py index 7ffa75b..899dbb5 100644 --- a/dcc/metadata/models.py +++ b/ram/metadata/models.py @@ -3,7 +3,7 @@ from django.conf import settings from django.dispatch.dispatcher import receiver from django_countries.fields import CountryField -from dcc.utils import get_image_preview, slugify +from ram.utils import get_image_preview, slugify class Property(models.Model): diff --git a/dcc/metadata/serializers.py b/ram/metadata/serializers.py similarity index 100% rename from dcc/metadata/serializers.py rename to ram/metadata/serializers.py diff --git a/dcc/metadata/tests.py b/ram/metadata/tests.py similarity index 100% rename from dcc/metadata/tests.py rename to ram/metadata/tests.py diff --git a/dcc/metadata/views.py b/ram/metadata/views.py similarity index 100% rename from dcc/metadata/views.py rename to ram/metadata/views.py diff --git a/dcc/portal/__init__.py b/ram/portal/__init__.py similarity index 100% rename from dcc/portal/__init__.py rename to ram/portal/__init__.py diff --git a/dcc/portal/admin.py b/ram/portal/admin.py similarity index 100% rename from dcc/portal/admin.py rename to ram/portal/admin.py diff --git a/dcc/portal/apps.py b/ram/portal/apps.py similarity index 100% rename from dcc/portal/apps.py rename to ram/portal/apps.py diff --git a/dcc/portal/migrations/0001_initial.py b/ram/portal/migrations/0001_initial.py similarity index 100% rename from dcc/portal/migrations/0001_initial.py rename to ram/portal/migrations/0001_initial.py diff --git a/dcc/portal/migrations/0002_alter_siteconfiguration_site_name.py b/ram/portal/migrations/0002_alter_siteconfiguration_site_name.py similarity index 100% rename from dcc/portal/migrations/0002_alter_siteconfiguration_site_name.py rename to ram/portal/migrations/0002_alter_siteconfiguration_site_name.py diff --git a/dcc/portal/migrations/0003_rename_maps_per_page_siteconfiguration_items_per_page.py b/ram/portal/migrations/0003_rename_maps_per_page_siteconfiguration_items_per_page.py similarity index 100% rename from dcc/portal/migrations/0003_rename_maps_per_page_siteconfiguration_items_per_page.py rename to ram/portal/migrations/0003_rename_maps_per_page_siteconfiguration_items_per_page.py diff --git a/dcc/portal/migrations/0004_rename_footer_short_siteconfiguration_footer_extended_and_more.py b/ram/portal/migrations/0004_rename_footer_short_siteconfiguration_footer_extended_and_more.py similarity index 100% rename from dcc/portal/migrations/0004_rename_footer_short_siteconfiguration_footer_extended_and_more.py rename to ram/portal/migrations/0004_rename_footer_short_siteconfiguration_footer_extended_and_more.py diff --git a/dcc/portal/migrations/0005_remove_siteconfiguration_homepage_content.py b/ram/portal/migrations/0005_remove_siteconfiguration_homepage_content.py similarity index 100% rename from dcc/portal/migrations/0005_remove_siteconfiguration_homepage_content.py rename to ram/portal/migrations/0005_remove_siteconfiguration_homepage_content.py diff --git a/dcc/portal/migrations/0006_alter_siteconfiguration_site_name.py b/ram/portal/migrations/0006_alter_siteconfiguration_site_name.py similarity index 100% rename from dcc/portal/migrations/0006_alter_siteconfiguration_site_name.py rename to ram/portal/migrations/0006_alter_siteconfiguration_site_name.py diff --git a/dcc/portal/migrations/__init__.py b/ram/portal/migrations/__init__.py similarity index 100% rename from dcc/portal/migrations/__init__.py rename to ram/portal/migrations/__init__.py diff --git a/dcc/portal/models.py b/ram/portal/models.py similarity index 95% rename from dcc/portal/models.py rename to ram/portal/models.py index 6a018ad..583e911 100644 --- a/dcc/portal/models.py +++ b/ram/portal/models.py @@ -1,7 +1,7 @@ import django from django.db import models -from dcc import __version__ as app_version +from ram import __version__ as app_version from solo.models import SingletonModel diff --git a/dcc/portal/static/css/main.css b/ram/portal/static/css/main.css similarity index 100% rename from dcc/portal/static/css/main.css rename to ram/portal/static/css/main.css diff --git a/dcc/portal/templates/flatpage.html b/ram/portal/templates/flatpage.html similarity index 100% rename from dcc/portal/templates/flatpage.html rename to ram/portal/templates/flatpage.html diff --git a/dcc/portal/templates/footer.html b/ram/portal/templates/footer.html similarity index 100% rename from dcc/portal/templates/footer.html rename to ram/portal/templates/footer.html diff --git a/dcc/portal/templates/home.html b/ram/portal/templates/home.html similarity index 100% rename from dcc/portal/templates/home.html rename to ram/portal/templates/home.html diff --git a/dcc/portal/templates/login.html b/ram/portal/templates/login.html similarity index 100% rename from dcc/portal/templates/login.html rename to ram/portal/templates/login.html diff --git a/dcc/portal/templatetags/__init__.py b/ram/portal/templatetags/__init__.py similarity index 100% rename from dcc/portal/templatetags/__init__.py rename to ram/portal/templatetags/__init__.py diff --git a/dcc/portal/templatetags/markdown.py b/ram/portal/templatetags/markdown.py similarity index 100% rename from dcc/portal/templatetags/markdown.py rename to ram/portal/templatetags/markdown.py diff --git a/dcc/portal/tests.py b/ram/portal/tests.py similarity index 100% rename from dcc/portal/tests.py rename to ram/portal/tests.py diff --git a/dcc/portal/urls.py b/ram/portal/urls.py similarity index 100% rename from dcc/portal/urls.py rename to ram/portal/urls.py diff --git a/dcc/portal/utils.py b/ram/portal/utils.py similarity index 100% rename from dcc/portal/utils.py rename to ram/portal/utils.py diff --git a/dcc/portal/views.py b/ram/portal/views.py similarity index 100% rename from dcc/portal/views.py rename to ram/portal/views.py diff --git a/dcc/dcc/__init__.py b/ram/ram/__init__.py similarity index 64% rename from dcc/dcc/__init__.py rename to ram/ram/__init__.py index 70c2159..9db4f2e 100644 --- a/dcc/dcc/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ -from dcc.utils import git_suffix +from ram.utils import git_suffix __version__ = '0.0.1' __version__ += git_suffix(__file__) diff --git a/dcc/dcc/asgi.py b/ram/ram/asgi.py similarity index 75% rename from dcc/dcc/asgi.py rename to ram/ram/asgi.py index b25b7d7..f621686 100644 --- a/dcc/dcc/asgi.py +++ b/ram/ram/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for dcc project. +ASGI config for ram 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", "dcc.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ram.settings") application = get_asgi_application() diff --git a/dcc/dcc/parsers.py b/ram/ram/parsers.py similarity index 100% rename from dcc/dcc/parsers.py rename to ram/ram/parsers.py diff --git a/dcc/dcc/settings.py b/ram/ram/settings.py similarity index 97% rename from dcc/dcc/settings.py rename to ram/ram/settings.py index 95083b4..47988f6 100644 --- a/dcc/dcc/settings.py +++ b/ram/ram/settings.py @@ -1,5 +1,5 @@ """ -Django settings for dcc project. +Django settings for ram project. Generated by 'django-admin startproject' using Django 4.0. @@ -46,7 +46,7 @@ INSTALLED_APPS = [ "solo", "rest_framework", "adminsortable2", - "dcc", + "ram", "portal", "driver", "metadata", @@ -64,7 +64,7 @@ MIDDLEWARE = [ "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = "dcc.urls" +ROOT_URLCONF = "ram.urls" TEMPLATES = [ { @@ -82,7 +82,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = "dcc.wsgi.application" +WSGI_APPLICATION = "ram.wsgi.application" # Database diff --git a/dcc/dcc/urls.py b/ram/ram/urls.py similarity index 98% rename from dcc/dcc/urls.py rename to ram/ram/urls.py index 5e1471c..457ccbd 100644 --- a/dcc/dcc/urls.py +++ b/ram/ram/urls.py @@ -1,4 +1,4 @@ -"""dcc URL Configuration +"""ram 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/dcc/dcc/utils.py b/ram/ram/utils.py similarity index 100% rename from dcc/dcc/utils.py rename to ram/ram/utils.py diff --git a/dcc/dcc/wsgi.py b/ram/ram/wsgi.py similarity index 75% rename from dcc/dcc/wsgi.py rename to ram/ram/wsgi.py index 4b7e8c5..bbfd0ea 100644 --- a/dcc/dcc/wsgi.py +++ b/ram/ram/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for dcc project. +WSGI config for ram 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", "dcc.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ram.settings") application = get_wsgi_application() diff --git a/dcc/roster/__init__.py b/ram/roster/__init__.py similarity index 100% rename from dcc/roster/__init__.py rename to ram/roster/__init__.py diff --git a/dcc/roster/admin.py b/ram/roster/admin.py similarity index 100% rename from dcc/roster/admin.py rename to ram/roster/admin.py diff --git a/dcc/roster/apps.py b/ram/roster/apps.py similarity index 100% rename from dcc/roster/apps.py rename to ram/roster/apps.py diff --git a/dcc/roster/migrations/0001_initial.py b/ram/roster/migrations/0001_initial.py similarity index 100% rename from dcc/roster/migrations/0001_initial.py rename to ram/roster/migrations/0001_initial.py diff --git a/dcc/roster/migrations/0002_alter_rollingstockimage_unique_together_and_more.py b/ram/roster/migrations/0002_alter_rollingstockimage_unique_together_and_more.py similarity index 100% rename from dcc/roster/migrations/0002_alter_rollingstockimage_unique_together_and_more.py rename to ram/roster/migrations/0002_alter_rollingstockimage_unique_together_and_more.py diff --git a/dcc/roster/migrations/0003_alter_rollingstockimage_rolling_stock.py b/ram/roster/migrations/0003_alter_rollingstockimage_rolling_stock.py similarity index 100% rename from dcc/roster/migrations/0003_alter_rollingstockimage_rolling_stock.py rename to ram/roster/migrations/0003_alter_rollingstockimage_rolling_stock.py diff --git a/dcc/roster/migrations/__init__.py b/ram/roster/migrations/__init__.py similarity index 100% rename from dcc/roster/migrations/__init__.py rename to ram/roster/migrations/__init__.py diff --git a/dcc/roster/models.py b/ram/roster/models.py similarity index 99% rename from dcc/roster/models.py rename to ram/roster/models.py index 755a3e6..ab086d4 100644 --- a/dcc/roster/models.py +++ b/ram/roster/models.py @@ -5,7 +5,7 @@ from django.db import models # from django.core.files.storage import FileSystemStorage # from django.dispatch import receiver -from dcc.utils import get_image_preview +from ram.utils import get_image_preview from metadata.models import ( Property, Scale, diff --git a/dcc/roster/serializers.py b/ram/roster/serializers.py similarity index 100% rename from dcc/roster/serializers.py rename to ram/roster/serializers.py diff --git a/dcc/roster/tests.py b/ram/roster/tests.py similarity index 100% rename from dcc/roster/tests.py rename to ram/roster/tests.py diff --git a/dcc/roster/urls.py b/ram/roster/urls.py similarity index 100% rename from dcc/roster/urls.py rename to ram/roster/urls.py diff --git a/dcc/roster/views.py b/ram/roster/views.py similarity index 100% rename from dcc/roster/views.py rename to ram/roster/views.py