From 224948e577b6a23450f465dbfc6ed213974ac30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?= Date: Sat, 11 Mar 2023 10:30:04 +0100 Subject: [PATCH] feat(SeacmsAuth): use it --- composer.json | 7 ++++- composer.lock | 58 +++++++++++++++++++++++++++++++++---- templates/head-scripts.twig | 2 ++ templates/head-styles.twig | 1 + 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 0caa26e..111c3be 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "require": { "php": "^8.0", "pixel418/markdownify": "^2.3", - "seacms/seacms-api": "dev-master" + "seacms/seacms-api": "dev-master", + "seacms/seacms-auth": "dev-master" }, "autoload": { "psr-4": { "PicoContentEditor\\": "src/" }, @@ -49,6 +50,10 @@ { "type": "vcs", "url": "https://git.defis.info/SeaCMS/seacms-api" + }, + { + "type": "vcs", + "url": "https://git.defis.info/SeaCMS/seacms-auth" } ] } diff --git a/composer.lock b/composer.lock index aeb1a60..a2d3a89 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "82c53a6abfa77e0e4ebc19be1ab74bf2", + "content-hash": "95bb0922037b6b12ad0ddb34f25857b3", "packages": [ { "name": "pixel418/markdownify", @@ -69,7 +69,7 @@ "source": { "type": "git", "url": "https://git.defis.info/SeaCMS/seacms-api", - "reference": "53ec5ea39c229332ca841c3e786dfbe3c9ffce61" + "reference": "f5b81d351454f2b7fe4c09d462f7802241ca94d1" }, "require": { "php": "^8.0" @@ -77,8 +77,11 @@ "default-branch": true, "type": "pico-plugin", "autoload": { + "psr-4": { + "SeaCMS\\Api\\": "src" + }, "classmap": [ - "PicoAPI.php" + "SeacmsApi.php" ] }, "license": [ @@ -104,14 +107,59 @@ "issues": "https://git.defis.info/SeaCMS/seacms-api/issues", "source": "https://git.defis.info/SeaCMS/seacms-api" }, - "time": "2023-02-24T21:39:15+00:00" + "time": "2023-03-02T17:19:44+00:00" + }, + { + "name": "seacms/seacms-auth", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://git.defis.info/SeaCMS/seacms-auth", + "reference": "245487ad7ffab6643360f0f87a72ca3710c4a7e8" + }, + "require": { + "php": "^8.0", + "seacms/seacms-api": "dev-master" + }, + "default-branch": true, + "type": "pico-plugin", + "autoload": { + "classmap": [ + "SeacmsAuth.php" + ] + }, + "license": [ + "EUPL-1.2" + ], + "authors": [ + { + "name": "Jérémy Dufraisse", + "homepage": "https://github.com/J9rem", + "role": "SeaCMS developer" + } + ], + "description": "API route for SeaCMS", + "homepage": "https://git.defis.info/SeaCMS/seacms-auth", + "keywords": [ + "auth", + "pico", + "picocms", + "picocms-plugin" + ], + "support": { + "docs": "https://git.defis.info/SeaCMS/seacms-auth/src/branch/master/README.md", + "issues": "https://git.defis.info/SeaCMS/seacms-auth/issues", + "source": "https://git.defis.info/SeaCMS/seacms-auth" + }, + "time": "2023-02-28T00:59:38+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "seacms/seacms-api": 20 + "seacms/seacms-api": 20, + "seacms/seacms-auth": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/templates/head-scripts.twig b/templates/head-scripts.twig index fab1bba..300bebb 100644 --- a/templates/head-scripts.twig +++ b/templates/head-scripts.twig @@ -1,5 +1,7 @@ {# SPDX-License-Identifier: EUPL-1.2 #} {# Authors: see README.md #} + +{{ include('@SeacmsAuth/head-scripts.twig') }} {% if canEdit %} diff --git a/templates/head-styles.twig b/templates/head-styles.twig index 5545904..c322842 100644 --- a/templates/head-styles.twig +++ b/templates/head-styles.twig @@ -1,5 +1,6 @@ {# SPDX-License-Identifier: EUPL-1.2 #} {# Authors: see README.md #} +{{ include('@SeacmsAuth/head-styles.twig') }} {% if canEdit %}