From f3dcd7b37ccb32bd28e58a463566902fa2d061b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melaine=20G=C3=A9rard?= Date: Wed, 5 Feb 2025 23:08:55 +0100 Subject: [PATCH] =?UTF-8?q?sparkles:=20Correctifs=20divers=20:=20-=20Renom?= =?UTF-8?q?mage=20"r=C3=B4le=20de=20dossier"=20-=20Ajout=20illustation=20h?= =?UTF-8?q?omepage=20-=20Ajout=20footer=20-=20Francisation=20Cloud=20et=20?= =?UTF-8?q?Uploader=20-=20Ajout=20"S"=20manquant=20Action=20-=20Ajout=20li?= =?UTF-8?q?en=20utiles=20homepage=20-=20Fix=20title=20bouton=20permission?= =?UTF-8?q?=20-=20Fix=20redirection=20admin=20-=20Fix=20Rename=20Parent=20?= =?UTF-8?q?Directory=20-=20Remplacement=20Dropzone=20par=20Input=20file=20?= =?UTF-8?q?standard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 9 +++++++-- src/Controller/FilesController.php | 12 ++++++++--- src/Form/UploadType.php | 4 ++-- src/Twig/Extension/EnvironmentExtension.php | 20 +++++++++++++++++++ .../Runtime/EnvironmentExtensionRuntime.php | 15 ++++++++++++++ templates/admin/index.html.twig | 4 ++-- templates/admin/user_index.html.twig | 2 +- templates/base.html.twig | 7 +++++-- templates/files/index.html.twig | 4 ++-- templates/home/index.html.twig | 8 +++++++- templates/partials/footer.html.twig | 9 +++++++++ templates/profile/index.html.twig | 2 +- 12 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 src/Twig/Extension/EnvironmentExtension.php create mode 100644 src/Twig/Runtime/EnvironmentExtensionRuntime.php create mode 100644 templates/partials/footer.html.twig diff --git a/.env b/.env index 142902e..bad5514 100755 --- a/.env +++ b/.env @@ -40,5 +40,10 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 MAILER_DSN=null://null ###< symfony/mailer ### -BASE_PREFIX=kumora -DEFAULT_IMAGE=https://camelia-studio.org/v5/images/camelia_studio.png \ No newline at end of file +BASE_PREFIX= +DEFAULT_IMAGE=https://camelia-studio.org/v5/images/camelia_studio.png +APP_VERSION=1.0.0 +GIT_URL=https://git.crystalyx.net/camelia-studio/Kumora +CAMELIA_URL=https://camelia-studio.org/ +TSUBAKIMONO_URL=https://tsubakimono.camelia-studio.org/ +DISCORD_URL=https://discord.gg/nBuZ9vJ diff --git a/src/Controller/FilesController.php b/src/Controller/FilesController.php index 66744f0..ef79649 100755 --- a/src/Controller/FilesController.php +++ b/src/Controller/FilesController.php @@ -360,7 +360,6 @@ class FilesController extends AbstractController public function renameDirectory(#[MapQueryParameter('path')] string $filepath, Request $request, Filesystem $defaultAdapter): Response { $filepath = $this->normalizePath($filepath); - $this->getUser(); $realPath = explode('/', $filepath); $parentDir = $this->parentDirectoryRepository->findOneBy(['name' => $realPath[0]]); @@ -387,6 +386,13 @@ class FilesController extends AbstractController $newPath = dirname($filepath) . '/' . $newName; + // Si c'est un parent directory, on renomme le parent directory dans la base de données + if ($parentDir->getName() === $filepath) { + $parentDir->setName($newName); + $this->entityManager->persist($parentDir); + $this->entityManager->flush(); + } + $defaultAdapter->move($filepath, $newPath); $this->addFlash('success', 'Le dossier a bien été renommé.'); @@ -415,14 +421,14 @@ class FilesController extends AbstractController $this->getUser(); if ('' === $path) { - throw $this->createNotFoundException("Vous ne pouvez pas uploader de fichier à la racine !"); + throw $this->createNotFoundException("Vous ne pouvez pas téléverser de fichier à la racine !"); } $realPath = explode('/', $path); $parentDir = $this->parentDirectoryRepository->findOneBy(['name' => $realPath[0]]); if (null === $parentDir || !$this->isGranted('file_write', $parentDir)) { - throw $this->createNotFoundException("Vous n'avez pas le droit d'uploader des fichiers dans ce dossier !"); + throw $this->createNotFoundException("Vous n'avez pas le droit de téléverser des fichiers dans ce dossier !"); } $form = $this->createForm(UploadType::class); diff --git a/src/Form/UploadType.php b/src/Form/UploadType.php index 5802597..115e0d4 100644 --- a/src/Form/UploadType.php +++ b/src/Form/UploadType.php @@ -16,7 +16,7 @@ class UploadType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options): void { $builder - ->add('files', DropzoneType::class, [ + ->add('files', FileType::class, [ 'label' => 'Fichiers à envoyer', 'attr' => [ 'placeholder' => 'Déposez vos fichiers ici', @@ -24,7 +24,7 @@ class UploadType extends AbstractType 'multiple' => true, ]) ->add('submit', SubmitType::class, [ - 'label' => 'Uploader', + 'label' => 'Téléverser', ]) ; } diff --git a/src/Twig/Extension/EnvironmentExtension.php b/src/Twig/Extension/EnvironmentExtension.php new file mode 100644 index 0000000..5b1a7f4 --- /dev/null +++ b/src/Twig/Extension/EnvironmentExtension.php @@ -0,0 +1,20 @@ +

Bienvenue sur l'administration

Gérez facilement les accès des membres de Camélia-Studio à l'espace de stockage partagé Kumora. Ajoutez, modifiez ou retirez les utilisateurs en quelques clics.

- + Gérer les utilisateurs
diff --git a/templates/admin/user_index.html.twig b/templates/admin/user_index.html.twig index b5eed15..3f502d3 100755 --- a/templates/admin/user_index.html.twig +++ b/templates/admin/user_index.html.twig @@ -24,7 +24,7 @@ Rôle - Action + Actions diff --git a/templates/base.html.twig b/templates/base.html.twig index 512ce89..40a5ffd 100755 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -11,9 +11,12 @@ {% block importmap %}{{ importmap('app') }}{% endblock %} {% endblock %} - + {% include "partials/navbar.html.twig" %} - {% include "partials/alerts.html.twig" %} +
+ {% include "partials/alerts.html.twig" %} {% block body %}{% endblock %} +
+ {% include "partials/footer.html.twig" %} diff --git a/templates/files/index.html.twig b/templates/files/index.html.twig index b40222d..f6fb0c5 100755 --- a/templates/files/index.html.twig +++ b/templates/files/index.html.twig @@ -38,7 +38,7 @@ Modifié le - Action + Actions @@ -84,7 +84,7 @@ {% if parentDir == null and (parentDirectory.userCreated == app.user or (parentDirectory.isPublic and app.user.folderRole == enum('App\\Enum\\RoleEnum').CONSEIL_ADMINISTRATION)) %} + }) }}" class="hover:text-blue-700 duration-300" title="Permet de modifier les permissions du dossier"> {% endif %} {% if is_granted('file_write', parentDirectory) %} + Mascotte Camélia Studio

Bienvenue sur Kumora

Notre espace de stockage en ligne, dédié aux membres de Camélia Studio, pour faciliter le partage de tous les fichiers et ressources de l'association.

@@ -11,5 +12,10 @@ Accéder à mon espace
+
+ Camélia Studio + Tsubakimono + Discord +
{% endblock %} \ No newline at end of file diff --git a/templates/partials/footer.html.twig b/templates/partials/footer.html.twig new file mode 100644 index 0000000..7ef9bbd --- /dev/null +++ b/templates/partials/footer.html.twig @@ -0,0 +1,9 @@ + +
+
+ Site propulsé grâce à Kumora + + Version {{ get_env('APP_VERSION', '0.0.1') }} + +
+
diff --git a/templates/profile/index.html.twig b/templates/profile/index.html.twig index b8616f1..3b36a53 100644 --- a/templates/profile/index.html.twig +++ b/templates/profile/index.html.twig @@ -1,6 +1,6 @@ {% extends 'base.html.twig' %} -{% block title %}Le cloud de Camélia-Studio{% endblock %} +{% block title %}Le disque nuagique de Camélia-Studio{% endblock %} {% block body %}