diff --git a/api/__init__.py b/winget/__init__.py similarity index 100% rename from api/__init__.py rename to winget/__init__.py diff --git a/api/admin.py b/winget/admin.py similarity index 100% rename from api/admin.py rename to winget/admin.py diff --git a/api/apps.py b/winget/apps.py similarity index 73% rename from api/apps.py rename to winget/apps.py index 3306e53..5f4caef 100644 --- a/api/apps.py +++ b/winget/apps.py @@ -3,5 +3,4 @@ from django.apps import AppConfig class ApiConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'api' - verbose_name = 'Winget' \ No newline at end of file + name = 'winget' \ No newline at end of file diff --git a/api/migrations/0001_initial.py b/winget/migrations/0001_initial.py similarity index 96% rename from api/migrations/0001_initial.py rename to winget/migrations/0001_initial.py index 456403e..2e39870 100644 --- a/api/migrations/0001_initial.py +++ b/winget/migrations/0001_initial.py @@ -32,7 +32,7 @@ class Migration(migrations.Migration): ('version', models.CharField(blank=True, help_text="The package's version (eg. 1.2.3.4).", max_length=128)), ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField(auto_now=True)), - ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.package')), + ('package', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='winget.package')), ], options={ 'unique_together': {('package', 'version')}, @@ -48,7 +48,7 @@ class Migration(migrations.Migration): ('sha256', models.CharField(max_length=64, validators=[django.core.validators.RegexValidator('^[a-fA-F0-9]{64}$')])), ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField(auto_now=True)), - ('version', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.version')), + ('version', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='winget.version')), ], options={ 'unique_together': {('version', 'architecture', 'type')}, diff --git a/api/migrations/__init__.py b/winget/migrations/__init__.py similarity index 100% rename from api/migrations/__init__.py rename to winget/migrations/__init__.py diff --git a/api/models.py b/winget/models.py similarity index 97% rename from api/models.py rename to winget/models.py index 67255df..c3fcd34 100644 --- a/api/models.py +++ b/winget/models.py @@ -2,7 +2,7 @@ from django.core.validators import MinLengthValidator, RegexValidator from django.db.models import Model, CharField, DateTimeField, ForeignKey, \ URLField, CASCADE, TextField -from api.util import CharFieldFromChoices +from winget.util import CharFieldFromChoices class Package(Model): diff --git a/api/tests/__init__.py b/winget/tests/__init__.py similarity index 100% rename from api/tests/__init__.py rename to winget/tests/__init__.py diff --git a/api/tests/test_views.py b/winget/tests/test_views.py similarity index 97% rename from api/tests/test_views.py rename to winget/tests/test_views.py index 94ca551..45206e5 100644 --- a/api/tests/test_views.py +++ b/winget/tests/test_views.py @@ -1,7 +1,7 @@ from django.test import TestCase, Client from django.urls import reverse -from api.models import Package, Version, Installer +from winget.models import Package, Version, Installer class APITest(TestCase): @@ -146,12 +146,12 @@ class APITest(TestCase): self.assertEqual(installer.sha256, installer_json['InstallerSha256']) def _get(self, url_name, expect_status=200, **kwargs): - response = self.client.get(reverse(f'api:{url_name}', kwargs=kwargs)) + response = self.client.get(reverse(f'winget:{url_name}', kwargs=kwargs)) self.assertEqual(expect_status, response.status_code) return response.json() def _post(self, url_name, data, expect_status=200): - path = reverse(f'api:{url_name}') + path = reverse(f'winget:{url_name}') response = self.client.post(path, data, content_type='application/json') self.assertEqual(expect_status, response.status_code) return response.json() diff --git a/api/urls.py b/winget/urls.py similarity index 94% rename from api/urls.py rename to winget/urls.py index a545877..670e92d 100644 --- a/api/urls.py +++ b/winget/urls.py @@ -2,7 +2,7 @@ from django.urls import path from . import views -app_name = 'api' +app_name = 'winget' urlpatterns = [ path('information', views.information, name='information'), diff --git a/api/util.py b/winget/util.py similarity index 100% rename from api/util.py rename to winget/util.py diff --git a/api/views.py b/winget/views.py similarity index 96% rename from api/views.py rename to winget/views.py index f14bf1e..c9c5761 100644 --- a/api/views.py +++ b/winget/views.py @@ -1,8 +1,8 @@ from django.db.models import Q from django.shortcuts import get_object_or_404 -from api.models import Package -from api.util import json_get, json_post +from .models import Package +from .util import json_get, json_post @json_get diff --git a/wpr/settings.py b/wpr/settings.py index fdf5c2a..dc86147 100644 --- a/wpr/settings.py +++ b/wpr/settings.py @@ -38,7 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'api' + 'winget' ] MIDDLEWARE = [ @@ -133,7 +133,7 @@ SUIT_CONFIG = { 'ADMIN_NAME': 'winget Admin', 'MENU': ( 'sites', - {'app': 'api', 'icon': 'icon-refresh'}, + {'app': 'winget', 'icon': 'icon-refresh'}, ), 'CONFIRM_UNSAVED_CHANGES': False } \ No newline at end of file diff --git a/wpr/urls.py b/wpr/urls.py index c3857e4..67f9b9d 100644 --- a/wpr/urls.py +++ b/wpr/urls.py @@ -2,6 +2,6 @@ from django.contrib import admin from django.urls import include, path urlpatterns = [ - path('api/', include('api.urls')), + path('api/', include('winget.urls')), path('admin/', admin.site.urls), ] \ No newline at end of file