Create docker image

bookmarks/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import Bookmark
+from bookmarks.models import Bookmark
 
 admin.site.register(Bookmark)

bookmarks/management/commands/ensure_superuser.py

@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from django.contrib.auth import get_user_model
+
+
+class Command(BaseCommand):
+    help = "Creates an admin user non-interactively if it doesn't exist"
+
+    def add_arguments(self, parser):
+        parser.add_argument('--username', help="Admin's username")
+        parser.add_argument('--email', help="Admin's email")
+        parser.add_argument('--password', help="Admin's password")
+
+    def handle(self, *args, **options):
+        User = get_user_model()
+        if not User.objects.filter(username=options['username']).exists():
+            User.objects.create_superuser(username=options['username'],
+                                          email=options['email'],
+                                          password=options['password'])

bookmarks/services/bookmarks.py

@@ -2,8 +2,8 @@ from django.contrib.auth.models import User
 from django.utils import timezone
 
 from bookmarks.models import Bookmark, BookmarkForm, parse_tag_string
-from services.tags import get_or_create_tags
-from services.website_loader import load_website_metadata
+from bookmarks.services.tags import get_or_create_tags
+from bookmarks.services.website_loader import load_website_metadata
 
 
 def create_bookmark(form: BookmarkForm, current_user: User):

bookmarks/services/importer.py

@@ -5,7 +5,7 @@ from bs4 import BeautifulSoup
 from django.contrib.auth.models import User
 
 from bookmarks.models import Bookmark, parse_tag_string
-from services.tags import get_or_create_tags
+from bookmarks.services.tags import get_or_create_tags
 
 
 def import_netscape_html(html: str, user: User):

bookmarks/urls.py

@@ -2,8 +2,7 @@ from django.conf.urls import url
 from django.urls import path
 from django.views.generic import RedirectView
 
-from . import views
-from .views import api
+from bookmarks import views
 
 app_name = 'bookmarks'
 urlpatterns = [
@@ -15,5 +14,5 @@ urlpatterns = [
     path('bookmarks/<int:bookmark_id>/edit', views.edit, name='edit'),
     path('bookmarks/<int:bookmark_id>/remove', views.remove, name='remove'),
     # API
-    path('api/website_metadata', api.website_metadata, name='api.website_metadata'),
+    path('api/website_metadata', views.api.website_metadata, name='api.website_metadata'),
 ]

bookmarks/views/__init__.py

@@ -1 +1,2 @@
 from .bookmarks import *
+from .api import *

bookmarks/views/api.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
 
-from services.website_loader import load_website_metadata
+from bookmarks.services.website_loader import load_website_metadata
 
 
 @login_required