removal of authoring service

Makefile

@@ -6,19 +6,9 @@ PIP := $(VENV)/bin/pip
 OUTPUT_DIR ?= $(if $(SITE_OUTPUT_DIR),$(SITE_OUTPUT_DIR),output)
 PERM_DIR := /home/zaine/master-folder/projects/scripts/bash-scripts
 
-AUTHOR_PORT := 8765
-AUTHOR_URL := http://127.0.0.1:$(AUTHOR_PORT)
-AUTHOR_PAGES_CHECK := /tmp/authoring-server-pages.json
-AUTHOR_SERVICE := org-web-authoring.service
-AUTHOR_UNIT_SRC := systemd/user/$(AUTHOR_SERVICE)
-SYSTEMD_USER_DIR := $(HOME)/.config/systemd/user
-AUTHOR_UNIT_DST := $(SYSTEMD_USER_DIR)/$(AUTHOR_SERVICE)
-USER_ID := $(shell id -u)
-SYSTEMD_RUNTIME_DIR ?= /run/user/$(USER_ID)
-SYSTEMCTL_USER := env XDG_RUNTIME_DIR=$(SYSTEMD_RUNTIME_DIR) systemctl --user
-JOURNALCTL_USER := env XDG_RUNTIME_DIR=$(SYSTEMD_RUNTIME_DIR) journalctl --user
+AUTHOR_SERVICE_DIR := /home/zaine/master-folder/projects/authoring-service
 
-all: set-perms clean-output build search author-restart clean-venv 
+all: set-perms clean-output build search clean-venv 
 
 build:
 	@echo "Building project..."
@@ -32,8 +22,8 @@ search: $(VENV)
 	@echo "Generating search index"
 	$(PY) search-index-json.py
 
-test: $(VENV)
-	$(PY) -m unittest discover -s tests -p 'test_authoring_server.py' -v
+test:
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" test
 
 $(VENV):
 	@echo "Generating virtual environment"
@@ -54,63 +44,32 @@ norm:
 
 author: author-start
 
-author-install: $(VENV)
-	@echo "Installing $(AUTHOR_SERVICE) for the current user..."
-	@mkdir -p "$(SYSTEMD_USER_DIR)"
-	install -m 0644 "$(AUTHOR_UNIT_SRC)" "$(AUTHOR_UNIT_DST)"
-	$(SYSTEMCTL_USER) daemon-reload
-	$(SYSTEMCTL_USER) enable "$(AUTHOR_SERVICE)"
+author-install:
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-install
 
-author-start: author-install author-stop-legacy
-	@echo "Starting authoring UI with systemd..."
-	$(SYSTEMCTL_USER) start "$(AUTHOR_SERVICE)"
-	@$(MAKE) --no-print-directory author-health
+author-start:
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-start
 
 author-stop:
-	@echo "Stopping authoring UI with systemd..."
-	$(SYSTEMCTL_USER) stop "$(AUTHOR_SERVICE)" || true
-	@$(MAKE) --no-print-directory author-stop-legacy
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-stop
 
 author-stop-legacy:
-	@echo "Stopping any legacy process on authoring port $(AUTHOR_PORT)..."
-	@fuser -k $(AUTHOR_PORT)/tcp >/dev/null 2>&1 || true
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-stop-legacy
 
-author-restart: author-install author-stop-legacy
-	@echo "Restarting authoring UI with systemd..."
-	$(SYSTEMCTL_USER) restart "$(AUTHOR_SERVICE)"
-	@$(MAKE) --no-print-directory author-health
+author-restart:
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-restart
 
 author-health:
-	@echo "Waiting for authoring UI and page list to respond..."
-	@for i in 1 2 3 4 5 6 7 8 9 10; do \
-		if ! $(SYSTEMCTL_USER) is-active --quiet "$(AUTHOR_SERVICE)"; then \
-			echo "Authoring UI service is not active. Service status:"; \
-			$(SYSTEMCTL_USER) status --no-pager "$(AUTHOR_SERVICE)" || true; \
-			echo "Recent logs:"; \
-			$(JOURNALCTL_USER) -u "$(AUTHOR_SERVICE)" -n 80 --no-pager || true; \
-			exit 1; \
-		fi; \
-		if curl -fsS "$(AUTHOR_URL)/api/pages" -o "$(AUTHOR_PAGES_CHECK)" && $(PY) -c 'import json,sys; data=json.load(sys.stdin); sys.exit(0 if isinstance(data, list) and data else 1)' < "$(AUTHOR_PAGES_CHECK)"; then \
-			echo "Authoring UI is running on $(AUTHOR_URL)/"; \
-			exit 0; \
-		fi; \
-		sleep 1; \
-	done; \
-	echo "Authoring UI failed to respond. Service status:"; \
-	$(SYSTEMCTL_USER) status --no-pager "$(AUTHOR_SERVICE)" || true; \
-	echo "Recent logs:"; \
-	$(JOURNALCTL_USER) -u "$(AUTHOR_SERVICE)" -n 80 --no-pager || true; \
-	exit 1
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-health
 
 author-status:
-	@$(SYSTEMCTL_USER) status --no-pager "$(AUTHOR_SERVICE)" || true
-	@curl -fsS "$(AUTHOR_URL)/api/pages" -o "$(AUTHOR_PAGES_CHECK)" && $(PY) -c 'import json,sys; print(f"Pages: {len(json.load(sys.stdin))}")' < "$(AUTHOR_PAGES_CHECK)" || true
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-status
 
 author-diagnostics:
-	@curl -fsS "$(AUTHOR_URL)/api/diagnostics" || true
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-diagnostics
 
 author-logs:
-	$(JOURNALCTL_USER) -u "$(AUTHOR_SERVICE)" -n 100 --no-pager
+	$(MAKE) -C "$(AUTHOR_SERVICE_DIR)" author-logs
 
 help:
 	@echo "Available targets:"