Create one directory for api to separate api files and admin files

.gitignore

@@ -1,44 +1,17 @@
+/.env
+/helm/api-platform/charts/*
+!/helm/api-platform/charts/.gitignore
+/docker-compose.override.yml
+!/docker-compose.override.yml.dist
+
+###> phpstorm ###
+/.idea
+###< phpstorm ###
 
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php
 /.env.*.local
-/config/secrets/prod/prod.decrypt.private.php
-/public/bundles/
 /var/
 /vendor/
 ###< symfony/framework-bundle ###
-
-###> phpunit/phpunit ###
-/phpunit.xml
-.phpunit.result.cache
-###< phpunit/phpunit ###
-
-###> symfony/phpunit-bridge ###
-.phpunit.result.cache
-/phpunit.xml
-###< symfony/phpunit-bridge ###
-
-###> symfony/webpack-encore-bundle ###
-/node_modules/
-/public/build/
-npm-debug.log
-yarn-error.log
-###< symfony/webpack-encore-bundle ###
-
-###> phpstorm ###
-/.idea
-###< phpstorm ###
-
-###> lexik/jwt-authentication-bundle ###
-/config/jwt/*.pem
-###< lexik/jwt-authentication-bundle ###
-
-###> public/media ###
-/public/media/
-###< public/media ###
-
-###> controller/testcontroller ###
-/src/Controller/TestController.php
-/templates/test
-###< controller/testcontroller ###

Makefile

@@ -8,17 +8,17 @@ start-all:
 	docker-compose exec php bin/console doctrine:migrations:migrate --no-interaction
 	docker-compose exec php bin/console doctrine:fixtures:load --no-interaction
 	sleep 5
-	cd my-admin/ && yarn start
+	cd admin/ && yarn start
 
 stop-all:
 	docker-compose down
 
 install:
-	mkdir -p public/media
+	mkdir -p api/public/media
 	sudo chown -R $(user):docker .
 	chmod -R g+w .
 	docker-compose build --pull --no-cache
-	cd my-admin/ && yarn install
+	cd admin/ && yarn install
 
 kill-docker-builds:
 	docker-compose stop && docker-compose kill && docker-compose down --volumes --remove-orphans

README.md

@@ -5,7 +5,7 @@
 
   or
 - Build docker with `docker-compose build --pull --no-cache`
-- Go to the directory `my-admin/` and install the admin panel dependencies with `yarn install`
+- Go to the directory `admin/` and install the admin panel dependencies with `yarn install`
 #### Generate JWT keypair :
 - Generate JWT keypair with this command : `php bin/console lexik:jwt:generate-keypair`
 
@@ -18,7 +18,7 @@
 or
 - Open a terminal in the root and launch this command : `docker-compose up -d`
 - Initialize the database with : `docker-compose exec php bin/console doctrine:fixtures:load`
-- And go to the `my-admin/` directory and launch this command : `yarn start`
+- And go to the `admin/` directory and launch this command : `yarn start`
 
 ### Project Stop :
 - Terminate the command `make`/`make start`/`yarn start`

my-admin/package.json → admin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "my-admin",
+  "name": "admin",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

api/.gitignore

@@ -0,0 +1,44 @@
+
+###> symfony/framework-bundle ###
+/.env.local
+/.env.local.php
+/.env.*.local
+/config/secrets/prod/prod.decrypt.private.php
+/public/bundles/
+/var/
+/vendor/
+###< symfony/framework-bundle ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###
+
+###> symfony/phpunit-bridge ###
+.phpunit.result.cache
+/phpunit.xml
+###< symfony/phpunit-bridge ###
+
+###> symfony/webpack-encore-bundle ###
+/node_modules/
+/public/build/
+npm-debug.log
+yarn-error.log
+###< symfony/webpack-encore-bundle ###
+
+###> phpstorm ###
+/.idea
+###< phpstorm ###
+
+###> lexik/jwt-authentication-bundle ###
+/config/jwt/*.pem
+###< lexik/jwt-authentication-bundle ###
+
+###> public/media ###
+/public/media/
+###< public/media ###
+
+###> controller/testcontroller ###
+/src/Controller/TestController.php
+/templates/test
+###< controller/testcontroller ###

Dockerfile → api/Dockerfile

@@ -75,7 +75,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
 
 ENV PATH="${PATH}:/root/.composer/vendor/bin"
 
-WORKDIR /srv/app
+WORKDIR /srv/api
 
 # Allow to choose skeleton
 ARG SKELETON="symfony/skeleton"
@@ -111,7 +111,8 @@ RUN set -eux; \
 	composer symfony:dump-env prod; \
 	composer run-script --no-dev post-install-cmd; \
 	chmod +x bin/console; sync
-VOLUME /srv/app/var
+VOLUME /srv/api/var
+VOLUME /srv/api/config/jwt
 
 ENTRYPOINT ["docker-entrypoint"]
 CMD ["php-fpm"]
@@ -126,9 +127,9 @@ RUN xcaddy build \
 
 FROM caddy:${CADDY_VERSION} AS symfony_caddy
 
-WORKDIR /srv/app
+WORKDIR /srv/api
 
 COPY --from=dunglas/mercure:v0.11 /srv/public /srv/mercure-assets/
 COPY --from=symfony_caddy_builder /usr/bin/caddy /usr/bin/caddy
-COPY --from=symfony_php /srv/app/public public/
+COPY --from=symfony_php /srv/api/public public/
 COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile

bin/console → api/bin/console

@@ -4,11 +4,11 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
-if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
+if (!is_file(dirname(__DIR__) . '/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }
 
-require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
 
 return function (array $context) {
     $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

api/bin/phpunit

@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'UTC');
+}
+
+if (is_file(dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit')) {
+    define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
+    require PHPUNIT_COMPOSER_INSTALL;
+    PHPUnit\TextUI\Command::main();
+} else {
+    if (!is_file(dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+        echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+        exit(1);
+    }
+
+    require dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+}

docker/caddy/Caddyfile → api/docker/caddy/Caddyfile

@@ -14,7 +14,7 @@
 log
 
 route {
-    root * /srv/app/public
+    root * /srv/api/public
     mercure {
         # Transport to use (default to Bolt)
         transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}

docker/php/conf.d/symfony.prod.ini → api/docker/php/conf.d/symfony.prod.ini

@@ -12,4 +12,4 @@ opcache.validate_timestamps = 0
 realpath_cache_size = 4096K
 realpath_cache_ttl = 600
 opcache.preload_user = www-data
-opcache.preload = /srv/app/config/preload.php
+opcache.preload = /srv/api/config/preload.php

docs/makefile.md → api/docs/makefile.md

@@ -16,7 +16,7 @@ you will probably want to add some targets like running your tests as described
 in [the Symfony book](https://symfony.com/doc/current/the-fast-track/en/17-tests.html#automating-your-workflow-with-a-makefile).
 You can also find a more complete example in this [snippet](https://www.strangebuzz.com/en/snippets/the-perfect-makefile-for-symfony).
 
-If you want to run make from within the `php` container, in the [Dockerfile](/Dockerfile),
+If you want to run make from within the `php` container, in the [Dockerfile](/api/Dockerfile),
 add:
 
 ```diff

docs/xdebug.md → api/docs/xdebug.md

@@ -80,7 +80,7 @@ Otherwise, you can create a [PHP Remote Debug](https://www.jetbrains.com/help/ph
   * Host: `https://localhost` (or the one defined with `SERVER_NAME`)
   * Port: `443`
   * Debugger: `Xdebug`
-  * Absolute path on the server: `/srv/app`
+  * Absolute path on the server: `/srv/api`
 * IDE key: `PHPSTORM`
 
 You can now use the debugger.

phpunit.xml.dist → api/phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/bootstrap.php"

public/index.php → api/public/index.php

@@ -2,7 +2,7 @@
 
 use App\Kernel;
 
-require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
 
 return function (array $context) {
     return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

templates/create_media_object_action/index.html.twig → api/templates/create_media_object_action/index.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends '../base.html.twig' %}
 
 {% block title %}Hello CreateMediaObjectActionController!{% endblock %}
 

api/tests/bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if (file_exists(dirname(__DIR__) . '/config/bootstrap.php')) {
+    require dirname(__DIR__) . '/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
+}

docker-compose.override.yml

@@ -5,18 +5,18 @@ services:
   php:
     volumes:
       # The "cached" option has no effect on Linux but improves performance on Mac
-      - ./:/srv/app:rw,cached
-      - ./docker/php/conf.d/symfony.dev.ini:/usr/local/etc/php/conf.d/symfony.ini
+      - ./api:/srv/api:rw,cached
+      - ./api/docker/php/conf.d/symfony.dev.ini:/usr/local/etc/php/conf.d/symfony.ini
       # If you develop on Mac you can remove the var/ directory from the bind-mount
       # for better performance by enabling the next line 
-      # - /srv/app/var
+      # - /srv/api/var
     environment:
       APP_ENV: dev
 
   caddy:
     volumes:
-      - ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
-      - ./public:/srv/app/public:ro
+      - ./api/docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
+      - ./api/public:/srv/api/public:ro
 
 ###> symfony/mercure-bundle ###
 ###< symfony/mercure-bundle ###

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
   php:
     build:
-      context: .
+      context: ./api
       target: symfony_php
       args:
         SYMFONY_VERSION: ${SYMFONY_VERSION:-}
@@ -12,6 +12,8 @@ services:
     restart: unless-stopped
     volumes:
       - php_socket:/var/run/php
+      - ./api:/srv/api:rw,cached
+      - ./api/var:/srv/api/var:rw
     healthcheck:
       interval: 10s
       timeout: 3s
@@ -28,7 +30,7 @@ services:
 
   caddy:
     build:
-      context: .
+      context: api/
       target: symfony_caddy
     depends_on:
       - php
@@ -41,6 +43,8 @@ services:
       - php_socket:/var/run/php
       - caddy_data:/data
       - caddy_config:/config
+      - ./api/docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
+      - ./api/public:/srv/api/public:ro
     ports:
       # HTTP
       - target: 80