Skip to content

Commit 2c9f56a

Browse files
committed
update scaffold, fix missing ts type declarations
1 parent 65baed6 commit 2c9f56a

36 files changed

Lines changed: 402 additions & 495 deletions

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ acceptance-test:
207207
.PHONY: acceptance-frontend-image-build
208208
acceptance-frontend-image-build:
209209
@echo "Build acceptance frontend image"
210-
@docker build frontend -t $(IMAGE_NAME_PREFIX)-frontend:acceptance -f frontend/Dockerfile --build-arg VOLTO_VERSION=$(VOLTO_VERSION)
210+
@docker build frontend -t $(IMAGE_NAME_PREFIX)frontend:acceptance -f frontend/Dockerfile --build-arg VOLTO_VERSION=$(VOLTO_VERSION)
211211

212212
.PHONY: acceptance-backend-image-build
213213
acceptance-backend-image-build:
214214
@echo "Build acceptance backend image"
215-
@docker build backend -t $(IMAGE_NAME_PREFIX)-backend:acceptance -f backend/Dockerfile.acceptance --build-arg PLONE_VERSION=$(PLONE_VERSION)
215+
@docker build backend -t $(IMAGE_NAME_PREFIX)backend:acceptance -f backend/Dockerfile.acceptance --build-arg PLONE_VERSION=$(PLONE_VERSION)
216216

217217
.PHONY: acceptance-images-build
218218
acceptance-images-build: ## Build Acceptance frontend/backend images
@@ -222,12 +222,12 @@ acceptance-images-build: ## Build Acceptance frontend/backend images
222222
.PHONY: acceptance-frontend-container-start
223223
acceptance-frontend-container-start:
224224
@echo "Start acceptance frontend"
225-
@docker run --rm -p 3000:3000 --name $(IMAGE_NAME_PREFIX)-frontend-acceptance --link $(IMAGE_NAME_PREFIX)-backend-acceptance:backend -e RAZZLE_API_PATH=http://localhost:55001/plone -e RAZZLE_INTERNAL_API_PATH=http://backend:55001/plone -d $(IMAGE_NAME_PREFIX)-frontend:acceptance
225+
@docker run --rm -p 3000:3000 --name $(IMAGE_NAME_PREFIX)frontend-acceptance --link $(IMAGE_NAME_PREFIX)backend-acceptance:backend -e RAZZLE_API_PATH=http://localhost:55001/plone -e RAZZLE_INTERNAL_API_PATH=http://backend:55001/plone -d $(IMAGE_NAME_PREFIX)frontend:acceptance
226226

227227
.PHONY: acceptance-backend-container-start
228228
acceptance-backend-container-start:
229229
@echo "Start acceptance backend"
230-
@docker run --rm -p 55001:55001 --name $(IMAGE_NAME_PREFIX)-backend-acceptance -d $(IMAGE_NAME_PREFIX)-backend:acceptance
230+
@docker run --rm -p 55001:55001 --name $(IMAGE_NAME_PREFIX)backend-acceptance -d $(IMAGE_NAME_PREFIX)backend:acceptance
231231

232232
.PHONY: acceptance-containers-start
233233
acceptance-containers-start: ## Start Acceptance containers
@@ -237,8 +237,8 @@ acceptance-containers-start: ## Start Acceptance containers
237237
.PHONY: acceptance-containers-stop
238238
acceptance-containers-stop: ## Stop Acceptance containers
239239
@echo "Stop acceptance containers"
240-
@docker stop $(IMAGE_NAME_PREFIX)-frontend-acceptance
241-
@docker stop $(IMAGE_NAME_PREFIX)-backend-acceptance
240+
@docker stop $(IMAGE_NAME_PREFIX)frontend-acceptance
241+
@docker stop $(IMAGE_NAME_PREFIX)backend-acceptance
242242

243243
.PHONY: ci-acceptance-test
244244
ci-acceptance-test:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Keyword Manager 🚀
1+
# kitconcept-keywordmanager 🚀
22

33
[![Built with Cookieplone](https://img.shields.io/badge/built%20with-Cookieplone-0083be.svg?logo=cookiecutter)](https://github.com/plone/cookieplone-templates/)
44
[![Black code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
5-
[![CI](https://github.com/kitconcept/kitconcept.keywordmanager/actions/workflows/main.yml/badge.svg)](https://github.com/kitconcept/kitconcept.keywordmanager/actions/workflows/main.yml)
5+
[![CI](https://github.com/kitconcept/kitconcept-keywordmanager/actions/workflows/main.yml/badge.svg)](https://github.com/kitconcept/kitconcept-keywordmanager/actions/workflows/main.yml)
66

77
Change, merge and delete keywords (subjects) in Plone.
88

@@ -13,7 +13,7 @@ Change, merge and delete keywords (subjects) in Plone.
1313
- An [operating system](https://6.docs.plone.org/install/create-project-cookieplone.html#prerequisites-for-installation) that runs all the requirements mentioned.
1414
- [uv](https://6.docs.plone.org/install/create-project-cookieplone.html#uv)
1515
- [nvm](https://6.docs.plone.org/install/create-project-cookieplone.html#nvm)
16-
- [Node.js and pnpm](https://6.docs.plone.org/install/create-project.html#node-js) 22
16+
- [Node.js and pnpm](https://6.docs.plone.org/install/create-project.html#node-js) 24
1717
- [Make](https://6.docs.plone.org/install/create-project-cookieplone.html#make)
1818
- [Git](https://6.docs.plone.org/install/create-project-cookieplone.html#git)
1919
- [Docker](https://docs.docker.com/get-started/get-docker/) (optional)
@@ -24,8 +24,8 @@ Change, merge and delete keywords (subjects) in Plone.
2424
1. Clone this repository, then change your working directory.
2525

2626
```shell
27-
git clone git@github.com:kitconcept/kitconcept.keywordmanager.git
28-
cd kitconcept.keywordmanager
27+
git clone git@github.com:kitconcept/kitconcept-keywordmanager.git
28+
cd kitconcept-keywordmanager
2929
```
3030

3131
2. Install this code base.
@@ -63,7 +63,7 @@ Deploy a local Docker Compose environment that includes the following.
6363

6464
- Docker images for Backend and Frontend 🖼️
6565
- A stack with a Traefik router and a PostgreSQL database 🗃️
66-
- Accessible at [http://kitconcept.keywordmanager.localhost](http://kitconcept.keywordmanager.localhost) 🌐
66+
- Accessible at [http://kitconcept-keywordmanager.localhost](http://kitconcept-keywordmanager.localhost) 🌐
6767

6868
Run the following commands in a shell session.
6969

@@ -145,4 +145,4 @@ make i18n
145145
146146
## Credits and acknowledgements 🙏
147147
148-
Generated using [Cookieplone (0.9.10)](https://github.com/plone/cookieplone) and [cookieplone-templates (ca9ba9f)](https://github.com/plone/cookieplone-templates/commit/ca9ba9fa67bc9a824eab13962a63db230c93679e) on 2026-03-19 16:49:15.524832. A special thanks to all contributors and supporters!
148+
Generated using [Cookieplone (2.0.0a3)](https://github.com/plone/cookieplone) and [cookieplone-templates (cda10db)](https://github.com/plone/cookieplone-templates/commit/cda10db886223a9aa9be1b1368484296418bb880) on 2026-05-29 11:44:37.855709. A special thanks to all contributors and supporters!

backend/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG PLONE_VERSION=6.1.4
2+
ARG PLONE_VERSION=6.2.0
33
FROM plone/server-builder:${PLONE_VERSION} AS builder
44

55
WORKDIR /app
@@ -25,8 +25,8 @@ EOT
2525
FROM plone/server-prod-config:${PLONE_VERSION}
2626

2727
LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
28-
org.label-schema.name="kitconcept.keywordmanager-backend" \
29-
org.label-schema.description="Keyword Manager backend image." \
28+
org.label-schema.name="kitconcept-keywordmanager-backend" \
29+
org.label-schema.description="kitconcept-keywordmanager backend image." \
3030
org.label-schema.vendor="kitconcept GmbH"
3131

3232
# Copy /app from builder

backend/Dockerfile.acceptance

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG PLONE_VERSION=6.1.4
2+
ARG PLONE_VERSION=6.2.0
33
FROM plone/server-builder:${PLONE_VERSION} AS builder
44

55
WORKDIR /app
@@ -25,8 +25,8 @@ EOT
2525
FROM plone/server-acceptance:${PLONE_VERSION}
2626

2727
LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
28-
org.label-schema.name="kitconcept.keywordmanager-acceptance" \
29-
org.label-schema.description="Keyword Manager backend acceptance image." \
28+
org.label-schema.name="kitconcept-keywordmanager-acceptance" \
29+
org.label-schema.description="kitconcept-keywordmanager backend acceptance image." \
3030
org.label-schema.vendor="kitconcept GmbH"
3131

3232
ENV CONFIGURE_PACKAGES="plone.restapi,plone.volto,plone.volto.cors,kitconcept.keywordmanager"

backend/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ endif
2626
REPOSITORY_SETTINGS := $(shell uvx repoplone settings dump)
2727
IMAGE_NAME_PREFIX := $(shell echo '$(REPOSITORY_SETTINGS)' | jq -r '.container_images_prefix')
2828
IMAGE_TAG=latest
29-
IMAGE_NAME=$(IMAGE_NAME_PREFIX)-backend:$(IMAGE_TAG)
29+
IMAGE_NAME=$(IMAGE_NAME_PREFIX)backend:$(IMAGE_TAG)
3030

3131
PLONE_SITE_ID=Plone
3232
BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
@@ -84,7 +84,7 @@ sync: $(VENV_FOLDER) ## Sync project dependencies
8484

8585
instance/etc/zope.ini instance/etc/zope.conf: instance.yaml ## Create instance configuration
8686
@echo "$(GREEN)==> Create instance configuration$(RESET)"
87-
@uvx cookiecutter -f --no-input -c 2.1.1 --config-file instance.yaml gh:plone/cookiecutter-zope-instance
87+
@uvx cookiecutter -f --no-input -c 2.4.1 --config-file instance.yaml gh:plone/cookiecutter-zope-instance
8888

8989
.PHONY: config
9090
config: instance/etc/zope.ini
@@ -164,7 +164,7 @@ acceptance-backend-start: ## Start backend acceptance server
164164

165165
.PHONY: acceptance-image-build
166166
acceptance-image-build: ## Build Docker Images
167-
@docker build . -t $(IMAGE_NAME_PREFIX)-backend-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --build-arg PLONE_VERSION=$(PLONE_VERSION)
167+
@docker build . -t $(IMAGE_NAME_PREFIX)backend-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --build-arg PLONE_VERSION=$(PLONE_VERSION)
168168

169169
## Add bobtemplates features (check bobtemplates.plone's documentation to get the list of available features)
170170
add: $(VENV_FOLDER)

backend/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ make create-site
2222

2323
## Contribute
2424

25-
- [Issue tracker](https://github.com/kitconcept/kitconcept.keywordmanager/issues)
26-
- [Source code](https://github.com/kitconcept/kitconcept.keywordmanager/)
25+
- [Issue tracker](https://github.com/kitconcept/kitconcept-keywordmanager/issues)
26+
- [Source code](https://github.com/kitconcept/kitconcept-keywordmanager/)
2727

2828
### Prerequisites ✅
2929

@@ -38,8 +38,8 @@ make create-site
3838
1. Clone this repository.
3939

4040
```shell
41-
git clone git@github.com:kitconcept/kitconcept.keywordmanager.git
42-
cd kitconcept.keywordmanager/backend
41+
git clone git@github.com:kitconcept/kitconcept-keywordmanager.git
42+
cd kitconcept-keywordmanager/backend
4343
```
4444

4545
2. Install this code base.
@@ -84,4 +84,4 @@ The project is licensed under GPLv2.
8484

8585
## Credits and acknowledgements 🙏
8686

87-
Generated from the [`cookieplone-templates` template](https://github.com/plone/cookieplone-templates/tree/main/) on 2026-03-19 15:50:11.. A special thanks to all contributors and supporters!
87+
Generated using [Cookieplone (2.0.0a3)](https://github.com/plone/cookieplone) and [cookieplone-templates (cda10db)](https://github.com/plone/cookieplone-templates/commit/cda10db886223a9aa9be1b1368484296418bb880) on 2026-05-29 11:44:37.855709. A special thanks to all contributors and supporters!

backend/pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies = [
3131
"plone.api",
3232
"plone.restapi",
3333
"plone.volto",
34-
"Levenshtein"
3534
]
3635

3736
[project.optional-dependencies]
@@ -45,10 +44,10 @@ test = [
4544
]
4645

4746
[project.urls]
48-
Homepage = "https://github.com/kitconcept/kitconcept.keywordmanager"
47+
Homepage = "https://github.com/kitconcept/kitconcept-keywordmanager"
4948
PyPI = "https://pypi.org/project/kitconcept.keywordmanager"
50-
Source = "https://github.com/kitconcept/kitconcept.keywordmanager"
51-
Tracker = "https://github.com/kitconcept/kitconcept.keywordmanager/issues"
49+
Source = "https://github.com/kitconcept/kitconcept-keywordmanager"
50+
Tracker = "https://github.com/kitconcept/kitconcept-keywordmanager/issues"
5251

5352

5453
[project.entry-points."plone.autoinclude.plugin"]
@@ -81,7 +80,7 @@ filename = "CHANGELOG.md"
8180
start_string = "<!-- towncrier release notes start -->\n"
8281
title_format = "## {version} ({project_date})"
8382
template = "news/.changelog_template.jinja"
84-
issue_format = "[#{issue}](https://github.com/kitconcept/kitconcept.keywordmanager/issues/{issue})"
83+
issue_format = "[#{issue}](https://github.com/kitconcept/kitconcept-keywordmanager/issues/{issue})"
8584
underlines = ["", "", ""]
8685

8786
[[tool.towncrier.type]]

backend/scripts/create_site.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def asbool(s):
4545

4646
site_id = "Plone"
4747
payload = {
48-
"title": "Keyword Manager",
48+
"title": "kitconcept-keywordmanager",
4949
"profile_id": _DEFAULT_PROFILE,
5050
"distribution_name": "volto",
5151
"setup_content": False,

backend/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.4
1+
6.2.0

docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: kitconcept.keywordmanager
2+
name: kitconcept-keywordmanager
33

44
services:
55
traefik:
@@ -44,7 +44,7 @@ services:
4444
- traefik.http.services.svc-frontend.loadbalancer.server.port=3000
4545
# Routers
4646
## /
47-
- traefik.http.routers.rt-frontend.rule=Host(`kitconcept.keywordmanager.localhost`)
47+
- traefik.http.routers.rt-frontend.rule=Host(`kitconcept-keywordmanager.localhost`)
4848
- traefik.http.routers.rt-frontend.entrypoints=http
4949
- traefik.http.routers.rt-frontend.service=svc-frontend
5050
- traefik.http.routers.rt-frontend.middlewares=gzip
@@ -67,11 +67,11 @@ services:
6767
# Middlewares
6868
## VHM rewrite /++api++/
6969
- "traefik.http.middlewares.mw-backend-vhm-api.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
70-
- "traefik.http.middlewares.mw-backend-vhm-api.replacepathregex.replacement=/VirtualHostBase/http/kitconcept.keywordmanager.localhost/Plone/++api++/VirtualHostRoot$$1"
70+
- "traefik.http.middlewares.mw-backend-vhm-api.replacepathregex.replacement=/VirtualHostBase/http/kitconcept-keywordmanager.localhost/Plone/++api++/VirtualHostRoot$$1"
7171

7272
## VHM rewrite /ClassicUI/
7373
- "traefik.http.middlewares.mw-backend-vhm-classic.replacepathregex.regex=^/ClassicUI($$|/.*)"
74-
- "traefik.http.middlewares.mw-backend-vhm-classic.replacepathregex.replacement=/VirtualHostBase/http/kitconcept.keywordmanager.localhost/Plone/VirtualHostRoot/_vh_ClassicUI$$1"
74+
- "traefik.http.middlewares.mw-backend-vhm-classic.replacepathregex.replacement=/VirtualHostBase/http/kitconcept-keywordmanager.localhost/Plone/VirtualHostRoot/_vh_ClassicUI$$1"
7575

7676
## Basic Authentication
7777
### Note: all dollar signs in the hash need to be doubled for escaping.
@@ -81,12 +81,12 @@ services:
8181
- traefik.http.middlewares.mw-backend-auth.basicauth.headerField=X-Auth-ClassicUI
8282
- traefik.http.middlewares.mw-backend-auth.basicauth.users=admin:$$apr1$$uZPT5Fgu$$AmlIdamxT5ipBvPlsdfD70
8383
# Routers
84-
- traefik.http.routers.rt-backend-api.rule=Host(`kitconcept.keywordmanager.localhost`) && (PathPrefix(`/++api++`))
84+
- traefik.http.routers.rt-backend-api.rule=Host(`kitconcept-keywordmanager.localhost`) && (PathPrefix(`/++api++`))
8585
- traefik.http.routers.rt-backend-api.entrypoints=http
8686
- traefik.http.routers.rt-backend-api.service=svc-backend
8787
- traefik.http.routers.rt-backend-api.middlewares=gzip,mw-backend-vhm-api
8888
## /ClassicUI
89-
- traefik.http.routers.rt-backend-classic.rule=Host(`kitconcept.keywordmanager.localhost`) && PathPrefix(`/ClassicUI`)
89+
- traefik.http.routers.rt-backend-classic.rule=Host(`kitconcept-keywordmanager.localhost`) && PathPrefix(`/ClassicUI`)
9090
- traefik.http.routers.rt-backend-classic.entrypoints=http
9191
- traefik.http.routers.rt-backend-classic.service=svc-backend
9292
- traefik.http.routers.rt-backend-classic.middlewares=gzip,mw-backend-auth,mw-backend-vhm-classic

0 commit comments

Comments
 (0)