Move admin etc into staff directory

bolt-cache/bolt/cache/admin.py

@@ -1,10 +1,10 @@
-from bolt.admin.views import (
+from bolt.cache.models import CachedItem
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.cache.models import CachedItem
 
 
 @register_viewset

bolt-flags/bolt/flags/admin.py

@@ -1,14 +1,14 @@
 from functools import cached_property
 
-from bolt.admin.cards import Card
-from bolt.admin.views import (
+from bolt.db.forms import ModelForm
+from bolt.staff.admin.cards import Card
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelUpdateView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db.forms import ModelForm
 
 from .models import Flag, FlagResult
 

bolt-oauth/bolt/oauth/admin.py

@@ -1,11 +1,11 @@
-from bolt.admin.cards import ChartCard
-from bolt.admin.views import (
+from bolt.db.models import Count
+from bolt.staff.admin.cards import ChartCard
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db.models import Count
 
 from .models import OAuthConnection
 

bolt-oauth/tests/urls.py

@@ -1,6 +1,6 @@
-from bolt import admin
 from bolt.auth.views import AuthViewMixin, LogoutView
 from bolt.oauth.providers import get_provider_keys
+from bolt.staff import admin
 from bolt.urls import include, path
 from bolt.views import TemplateView
 

bolt-pages/README.md

@@ -0,0 +1,3 @@
+<!-- This file is compiled from bolt-pages/bolt/pages/README.md. Do not edit this file directly. -->
+
+# Pages

bolt-pages/bolt/pages/README.md

@@ -0,0 +1 @@
+# Pages

bolt-staff/README.md

@@ -1,46 +1,3 @@
-<!-- This file is compiled from bolt-staff/bolt/impersonate/README.md. Do not edit this file directly. -->
+<!-- This file is compiled from bolt-staff/bolt/staff/README.md. Do not edit this file directly. -->
 
-# bolt-impersonate
-
-See what your users see.
-
-A key feature for providing customer support is to be able to view the site through their account.
-With `impersonate` installed, you can impersonate a user by finding them in the Django admin and clicking the "Impersonate" button.
-
-![](/docs/img/impersonate-admin.png)
-
-Then with the [staff toolbar](/docs/bolt-toolbar/) enabled, you'll get a notice of the impersonation and a button to exit:
-
-![](/docs/img/impersonate-bar.png)
-
-## Installation
-
-To impersonate users, you need the app, middleware, and URLs:
-
-```python
-# settings.py
-INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
-]
-
-MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
-]
-```
-
-```python
-# urls.py
-urlpatterns = [
-    # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
-]
-```
-
-## Settings
-
-By default, all staff users can impersonate other users.
-
-```python
-# settings.py
-IMPERSONATE_ALLOWED = lambda user: user.is_staff
-```
+# Staff

bolt-staff/bolt/staff/README.md

@@ -0,0 +1 @@
+# Staff

bolt-staff/bolt/admin/README.md → bolt-staff/bolt/staff/admin/README.md

@@ -14,7 +14,7 @@ in addition to models.
 
 ## Installation
 
-- install bolt.staff and bolt.htmx, add bolt.admin and bolt.htmx to installed packages
+- install bolt.staff and bolt.htmx, add bolt.staff.admin and bolt.htmx to installed packages
 - add url
 
 ## Models in the admin
@@ -238,19 +238,19 @@ To impersonate users, you need the app, middleware, and URLs:
 ```python
 # settings.py
 INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
+  "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
+  "bolt.staff.impersonate.ImpersonateMiddleware",
 ]
 ```
 
 ```python
 # urls.py
 urlpatterns = [
     # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
+    path("impersonate/", include("bolt.staff.impersonate.urls")),
 ]
 ```
 

bolt-staff/bolt/admin/cards/base.py → bolt-staff/bolt/staff/admin/cards/base.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
-from bolt.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.http import HttpRequest
+from bolt.staff.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.templates import Template
 from bolt.utils.text import slugify
 from bolt.views import View

bolt-staff/bolt/admin/config.py → bolt-staff/bolt/staff/admin/config.py

@@ -6,7 +6,7 @@
 
 
 class BoltAdminConfig(PackageConfig):
-    name = "bolt.admin"
+    name = "bolt.staff.admin"
     label = "boltadmin"
 
     def ready(self):

bolt-staff/bolt/admin/views/base.py → bolt-staff/bolt/staff/admin/views/base.py

@@ -1,11 +1,11 @@
 from typing import TYPE_CHECKING
 
-from bolt.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.auth.views import AuthViewMixin
 from bolt.db import models
 from bolt.htmx.views import HTMXViewMixin
 from bolt.http import Response, ResponseRedirect
 from bolt.paginator import Paginator
+from bolt.staff.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.urls import reverse
 from bolt.utils import timezone
 from bolt.utils.text import slugify

bolt-staff/bolt/admin/views/registry.py → bolt-staff/bolt/staff/admin/views/registry.py

@@ -106,8 +106,8 @@ def get_searchable_views(self):
         return views
 
     def get_model_detail_url(self, instance):
-        from bolt.admin.views.base import URL_NAMESPACE
-        from bolt.admin.views.models import AdminModelDetailView
+        from bolt.staff.admin.views.base import URL_NAMESPACE
+        from bolt.staff.admin.views.models import AdminModelDetailView
 
         if not instance.pk:
             # Has to actually be in the db

bolt-staff/bolt/impersonate/README.md → bolt-staff/bolt/staff/impersonate/README.md

@@ -18,19 +18,19 @@ To impersonate users, you need the app, middleware, and URLs:
 ```python
 # settings.py
 INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
+  "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
+  "bolt.staff.impersonate.ImpersonateMiddleware",
 ]
 ```
 
 ```python
 # urls.py
 urlpatterns = [
     # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
+    path("impersonate/", include("bolt.staff.impersonate.urls")),
 ]
 ```
 

bolt-staff/bolt/staff/toolbar/default_settings.py

@@ -0,0 +1 @@
+TOOLBAR_CLASS = "bolt.staff.toolbar.Toolbar"

bolt-staff/tests_impersonate/settings.py

@@ -9,7 +9,7 @@
 INSTALLED_PACKAGES = [
     "bolt.auth",
     "bolt.sessions",
-    "bolt.impersonate",
+    "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = [
@@ -19,7 +19,7 @@
     "bolt.csrf.middleware.CsrfViewMiddleware",
     "bolt.auth.middleware.AuthenticationMiddleware",
     "bolt.middleware.clickjacking.XFrameOptionsMiddleware",
-    "bolt.impersonate.middleware.ImpersonateMiddleware",
+    "bolt.staff.impersonate.middleware.ImpersonateMiddleware",
 ]
 
 DATABASES = {

bolt-worker/bolt/worker/admin.py

@@ -1,16 +1,16 @@
 from datetime import timedelta
 
-from bolt.admin.cards import Card
-from bolt.admin.dates import DatetimeRangeAliases
-from bolt.admin.views import (
+from bolt.db import models
+from bolt.http import ResponseRedirect
+from bolt.runtime import settings
+from bolt.staff.admin.cards import Card
+from bolt.staff.admin.dates import DatetimeRangeAliases
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db import models
-from bolt.http import ResponseRedirect
-from bolt.runtime import settings
 
 from .models import Job, JobRequest, JobResult
 

bolt/bolt/packages/config.py

@@ -15,10 +15,10 @@ class PackageConfig:
     migrations_module = "migrations"
 
     def __init__(self, package_name, package_module):
-        # Full Python path to the application e.g. 'bolt.admin.admin'.
+        # Full Python path to the application e.g. 'bolt.staff.admin.admin'.
         self.name = package_name
 
-        # Root module for the application e.g. <module 'bolt.admin.admin'
+        # Root module for the application e.g. <module 'bolt.staff.admin.admin'
         # from 'admin/__init__.py'>.
         self.module = package_module
 
@@ -43,7 +43,7 @@ def __init__(self, package_name, package_module):
         if not hasattr(self, "path"):
             self.path = self._path_from_module(package_module)
 
-        # Module containing models e.g. <module 'bolt.admin.models'
+        # Module containing models e.g. <module 'bolt.staff.admin.models'
         # from 'admin/models.py'>. Set by import_models().
         # None if the application doesn't have a models module.
         self.models_module = None

bolt/bolt/packages/registry.py

@@ -243,7 +243,7 @@ def is_installed(self, package_name):
         """
         Check whether an application with this name exists in the registry.
 
-        package_name is the full name of the app e.g. 'bolt.admin'.
+        package_name is the full name of the app e.g. 'bolt.staff.admin'.
         """
         self.check_packages_ready()
         return any(ac.name == package_name for ac in self.package_configs.values())

scripts/compile-readmes

@@ -25,12 +25,8 @@ compile_readme "bolt/README.md" "bolt/bolt/README.md"
 
 # Now do the same for every bolt-* package and the README.md found at bolt-<pkg>/bolt/*/README.md
 for package_dir in bolt-*; do
-    # if [ -d "$package_dir/bolt" ]; then
-    # Find the README.md in $package_dir/bolt/*/README.md
-    find "$package_dir/bolt" -name "README.md" | while read -r code_readme; do
-        package_readme="$package_dir/README.md"
-        compile_readme "$package_readme" "$code_readme"
-    done
-    # compile_readme "$package_dir/README.md" "$package_dir/bolt/README.md"
-    # fi
+    package_name=$(echo "$package_dir" | sed -e "s/^bolt-//")
+    package_readme="$package_dir/README.md"
+    code_readme="$package_dir/bolt/$package_name/README.md"
+    compile_readme "$package_readme" "$code_readme"
 done