diff --git a/Makefile b/Makefile index c619ab05..c9c92e38 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin MANAGE = $(COMPOSE_RUN_APP) python manage.py MAIL_YARN = $(COMPOSE_RUN) -w /app/src/mail node yarn +# -- Frontend +PATH_FRONT = ./src/frontend +PATH_FRONT_DRIVE = $(PATH_FRONT)/apps/drive # ============================================================================== # RULES @@ -174,13 +177,13 @@ test-back-parallel: ## run all back-end tests in parallel bin/pytest -n auto $${args:-${1}} .PHONY: test-back-parallel -makemigrations: ## run django makemigrations for the impress project. +makemigrations: ## run django makemigrations for the drive project. @echo "$(BOLD)Running makemigrations$(RESET)" @$(COMPOSE) up -d postgresql @$(MANAGE) makemigrations .PHONY: makemigrations -migrate: ## run django migrations for the impress project. +migrate: ## run django migrations for the drive project. @echo "$(BOLD)Running migrations$(RESET)" @$(COMPOSE) up -d postgresql @$(MANAGE) migrate @@ -295,14 +298,14 @@ clean-media: ## remove all media files .PHONY: clean-media help: - @echo "$(BOLD)impress Makefile" + @echo "$(BOLD)drive Makefile" @echo "Please use 'make $(BOLD)target$(RESET)' where $(BOLD)target$(RESET) is one of:" @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(GREEN)%-30s$(RESET) %s\n", $$1, $$2}' .PHONY: help # Front frontend-install: ## install the frontend locally - cd $(PATH_FRONT_IMPRESS) && yarn + cd $(PATH_FRONT_DRIVE) && yarn .PHONY: frontend-install frontend-lint: ## run the frontend linter @@ -311,7 +314,7 @@ frontend-lint: ## run the frontend linter run-frontend-development: ## Run the frontend in development mode @$(COMPOSE) stop frontend-dev - cd $(PATH_FRONT_IMPRESS) && yarn dev + cd $(PATH_FRONT_DRIVE) && yarn dev .PHONY: run-frontend-development frontend-i18n-extract: ## Extract the frontend translation inside a json to be used for crowdin diff --git a/bin/update_openapi_schema b/bin/update_openapi_schema index 23514907..c94e8f21 100755 --- a/bin/update_openapi_schema +++ b/bin/update_openapi_schema @@ -7,6 +7,6 @@ _dc_run \ app-dev \ python manage.py spectacular \ --api-version 'v1.0' \ - --urlconf 'impress.api_urls' \ + --urlconf 'drive.api_urls' \ --format openapi-json \ --file /app/core/tests/swagger/swagger.json diff --git a/src/backend/drive/celery_app.py b/src/backend/drive/celery_app.py index f46802f1..2e1e8a1a 100644 --- a/src/backend/drive/celery_app.py +++ b/src/backend/drive/celery_app.py @@ -1,4 +1,4 @@ -"""Impress celery configuration file.""" +"""Drive celery configuration file.""" import os diff --git a/src/mail/package.json b/src/mail/package.json index 36d9d099..ba4be756 100644 --- a/src/mail/package.json +++ b/src/mail/package.json @@ -16,7 +16,7 @@ "volta": { "node": "16.15.1" }, - "repository": "https://github.com/numerique-gouv/impress", + "repository": "https://github.com/suitenumerique/drive", "author": "DINUM", "license": "MIT" }