From 6be483dcf741be9a0c282e6c58be1e45ca5b9e9f Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Thu, 12 Oct 2023 13:05:45 -0400 Subject: [PATCH 1/6] - small quick css patch --- view/lean-console/page/update/index.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lean-console/page/update/index.phtml b/view/lean-console/page/update/index.phtml index c48bcdf..be70a47 100644 --- a/view/lean-console/page/update/index.phtml +++ b/view/lean-console/page/update/index.phtml @@ -18,7 +18,7 @@
'git status' output - + {% foreach $status as $line %}
{% if $line %} From 406694ce5177f42bae72c1632138584aa7638237 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 17 Oct 2023 17:21:03 +0000 Subject: [PATCH 2/6] - WIP on Lean's definitions autoload --- composer.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/composer.json b/composer.json index 8909bda..7ba3b52 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,14 @@ "psr-4": { "Lean\\Console\\": "src/" } + }, + "extra" : { + "lean" : { + "autoload": { + "definition" : [ + { "\\Lean\\Console\\Lean" : "definitions" } + ] + } + } } } From 74d88dc8bf73858a81e35581c5a3ccdb2bb04731 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 17 Oct 2023 17:27:17 +0000 Subject: [PATCH 3/6] - Fixed typo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7ba3b52..e7a6916 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "extra" : { "lean" : { "autoload": { - "definition" : [ + "definitions" : [ { "\\Lean\\Console\\Lean" : "definitions" } ] } From 58a96c4b5c4478ac0f737c3ae83e10d87f40506f Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 17 Oct 2023 18:04:13 +0000 Subject: [PATCH 4/6] - WIP on Lean's autoload component --- .../lean-console/lean-console-bw.css | 0 meta/definitions/software.php | 13 ++++++++++++- view/lean-console/base/layout.phtml | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) rename view/lean-console/base/asset/lean.css => asset/lean-console/lean-console-bw.css (100%) diff --git a/view/lean-console/base/asset/lean.css b/asset/lean-console/lean-console-bw.css similarity index 100% rename from view/lean-console/base/asset/lean.css rename to asset/lean-console/lean-console-bw.css diff --git a/meta/definitions/software.php b/meta/definitions/software.php index 34ba1ff..d954ed1 100644 --- a/meta/definitions/software.php +++ b/meta/definitions/software.php @@ -2,6 +2,8 @@ use Lean\Console\Lib\DatabaseMigrations; +$path = dirname(__DIR__, 2); + return [ 'lean.console' => [ 'picea' => [ @@ -9,10 +11,19 @@ return [ 'view' => [ [ - 'path' => getenv("PROJECT_PATH") . implode(DIRECTORY_SEPARATOR, [ "", "vendor", "mcnd" , "lean-console" , "view" ]), + 'path' => implode(DIRECTORY_SEPARATOR, [ $path , "view", '' ]), 'order' => 99, ], ], + + 'asset' => [ + 'source' => [ + [ + 'path' => implode(DIRECTORY_SEPARATOR, [ $path, "asset", '' ]), + 'order' => 10 + ] + ], + ], ], 'ulmus' => [], diff --git a/view/lean-console/base/layout.phtml b/view/lean-console/base/layout.phtml index f2423b5..8630a1a 100644 --- a/view/lean-console/base/layout.phtml +++ b/view/lean-console/base/layout.phtml @@ -14,7 +14,9 @@ {{ title() }} {% section "head" %}{% endsection %} From e3de6146ec48e6224b3aee4c22e372f20b869ad6 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 17 Oct 2023 20:13:44 -0400 Subject: [PATCH 5/6] - WIP on picea's asset. --- meta/definitions/software.php | 6 +++--- view/lean-console/base/layout.phtml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/definitions/software.php b/meta/definitions/software.php index d954ed1..74e5343 100644 --- a/meta/definitions/software.php +++ b/meta/definitions/software.php @@ -7,7 +7,7 @@ $path = dirname(__DIR__, 2); return [ 'lean.console' => [ 'picea' => [ - 'context' => "Lean\\Console\\View", + 'context' => Lean\Console\View::class, 'view' => [ [ @@ -31,14 +31,14 @@ return [ 'tell' => [ 'json' => [ [ - 'path' => getenv("PROJECT_PATH") . "/vendor/mcnd/lean-console/meta/i18n", + 'path' => implode(DIRECTORY_SEPARATOR, [ $path, "meta", "i18n", "" ]), 'order' => 99, ], ] ], 'routes' => [ - 'Lean\\Console\\Controller' => getenv("PROJECT_PATH") . "/vendor/mcnd/lean-console/src/Controller/", + 'Lean\\Console\\Controller' => implode(DIRECTORY_SEPARATOR, [ $path, "src", "Controller", "" ]), ], ], diff --git a/view/lean-console/base/layout.phtml b/view/lean-console/base/layout.phtml index 8630a1a..68bb98b 100644 --- a/view/lean-console/base/layout.phtml +++ b/view/lean-console/base/layout.phtml @@ -13,8 +13,9 @@ {{ title() }} + + From b64f416fc0ea56d195f5b26eba389c255b21c0fd Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 17 Oct 2023 21:59:41 -0400 Subject: [PATCH 6/6] - WIP on asset --- meta/definitions/software.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/definitions/software.php b/meta/definitions/software.php index 74e5343..d6fcc5d 100644 --- a/meta/definitions/software.php +++ b/meta/definitions/software.php @@ -17,11 +17,9 @@ return [ ], 'asset' => [ - 'source' => [ - [ - 'path' => implode(DIRECTORY_SEPARATOR, [ $path, "asset", '' ]), - 'order' => 10 - ] + [ + 'path' => implode(DIRECTORY_SEPARATOR, [ $path, "asset", '' ]), + 'order' => 10 ], ], ],