From cca1cc875152b8efd8f23426512e7fa8064b705b Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Thu, 1 Jun 2023 08:20:10 -0700
Subject: [PATCH] still not working

---
 bin/component_parts/admin_controller.sh      | 16 ---------
 bin/component_parts/admin_controller_base.sh | 16 ---------
 bin/component_parts/defaultview.sh           | 14 ++++++++
 bin/component_parts/displaycontroller.sh     | 29 ++++++++++++++++
 bin/component_parts/manifest.sh              | 17 ++++++----
 bin/component_parts/provider.sh              | 35 ++++++++++++++++++++
 bin/component_parts/site_controller.sh       | 16 ---------
 bin/component_parts/site_controller_base.sh  | 16 ---------
 bin/component_parts/view.sh                  | 26 +++++++++++++++
 bin/create_component.sh                      | 12 +++----
 docker-compose.yml                           |  2 +-
 11 files changed, 122 insertions(+), 77 deletions(-)
 delete mode 100644 bin/component_parts/admin_controller.sh
 delete mode 100644 bin/component_parts/admin_controller_base.sh
 create mode 100644 bin/component_parts/defaultview.sh
 create mode 100644 bin/component_parts/displaycontroller.sh
 create mode 100644 bin/component_parts/provider.sh
 delete mode 100644 bin/component_parts/site_controller.sh
 delete mode 100644 bin/component_parts/site_controller_base.sh
 create mode 100644 bin/component_parts/view.sh

diff --git a/bin/component_parts/admin_controller.sh b/bin/component_parts/admin_controller.sh
deleted file mode 100644
index 44ccdbd..0000000
--- a/bin/component_parts/admin_controller.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cat <<EOM
-<?php
-defined('_JEXEC') or die;
-
-use Joomla\CMS\MVC\Controller\AdminController;
-
-class ${name^}Controller extends AdminController
-{
-    public function __construct(\$config = array())
-    {
-        parent::__construct(\$config);
-    }
-}
-EOM
diff --git a/bin/component_parts/admin_controller_base.sh b/bin/component_parts/admin_controller_base.sh
deleted file mode 100644
index b6e8062..0000000
--- a/bin/component_parts/admin_controller_base.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cat <<EOM > admin_controller_base.php
-<?php
-defined('_JEXEC') or die;
-
-use Joomla\CMS\MVC\Controller\Controller;
-
-class ${name^}Controller extends Controller
-{
-    public function __construct(\$config = array())
-    {
-        parent::__construct(\$config);
-    }
-}
-EOM
diff --git a/bin/component_parts/defaultview.sh b/bin/component_parts/defaultview.sh
new file mode 100644
index 0000000..977728b
--- /dev/null
+++ b/bin/component_parts/defaultview.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Check if $name is set
+if [[ -z "${name}" ]]; then
+  echo "Error: Variable \$name is not set. Exiting (displaycontroller.sh)."
+  exit 1
+fi
+
+cat <<EOM > admin/src/View/${name}/html/default.php
+<?php defined('_JEXEC') or die('Restricted Access'); ?>
+
+<h2>Hello ${name}!</h2>
+
+EOM
diff --git a/bin/component_parts/displaycontroller.sh b/bin/component_parts/displaycontroller.sh
new file mode 100644
index 0000000..21899fa
--- /dev/null
+++ b/bin/component_parts/displaycontroller.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Check if $name is set
+if [[ -z "${name}" ]]; then
+  echo "Error: Variable \$name is not set. Exiting (displaycontroller.sh)."
+  exit 1
+fi
+
+cat <<EOM > admin/src/Controller/DisplayController.php
+<?php
+namespace harvst\\Component\\${name}\\Administrator\\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\BaseController;
+
+class DisplayController extends BaseController {
+    
+    protected \$default_view = '${name}';
+    
+    public function display(\$cachable = false, \$urlparams = array()) {
+        parent::display();
+    }
+    
+}
+
+EOM
+
+ 
\ No newline at end of file
diff --git a/bin/component_parts/manifest.sh b/bin/component_parts/manifest.sh
index a5800fc..8031e08 100644
--- a/bin/component_parts/manifest.sh
+++ b/bin/component_parts/manifest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 current_date=$(date +'%B %Y')
-
+current_year=$(date +'%Y')
 # Check if JOOMLA_USER is set, otherwise prompt for it
 if [ -z "$JOOMLA_USER" ]; then
     read -p "Enter the Joomla user: " JOOMLA_USER
@@ -15,29 +15,34 @@ fi
 cat <<EOM > ${name}.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="component" method="upgrade">
-	<name>com_${name}</name>
+	<name>${name}</name>
 	<creationDate>${current_date}</creationDate>
 	<author>${JOOMLA_USER}</author>
 	<authorEmail>${EMAIL}</authorEmail>
 	<authorUrl>https://www.example.com/</authorUrl>
-	<copyright>Copyright (C) 2023 ${JOOMLA_USER}, All rights reserved.</copyright>
+	<copyright>Copyright (C) ${current_year} ${JOOMLA_USER}, All rights reserved.</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
 
-	<!--  The version string is recorded in the components table -->
 	<version>0.0.1</version>
 
 	<!-- The description is optional and defaults to the name -->
 	<description>COM_${name^^}_DESCRIPTION</description>
 
-	<namespace path="src">harvst\Component\com_${name}</namespace>
+	<namespace path="src/">harvst\Component\\${name}</namespace>
 	
 	<administration>
 		<!-- The link that will appear in the Admin panel's "Components" menu -->
         <menu link="index.php?option=com_${name}">${name}</menu>
 		<files folder="admin">
 			<folder>language</folder>
+			<folder>services</folder>
+			<folder>src</folder>
+			<folder>tmpl</folder>
 		</files>
-		
+		<languages folder="admin">
+		<!-- TODO: It's there but not working -->
+			<language tag="en-GB">language/en-GB/en-GB.com_${name}.ini</language>
+		</languages>
 	</administration>
 </extension>
 EOM
diff --git a/bin/component_parts/provider.sh b/bin/component_parts/provider.sh
new file mode 100644
index 0000000..3c4de10
--- /dev/null
+++ b/bin/component_parts/provider.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+cat <<EOM > admin/services/provider.php
+
+<?php defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+return new class implements ServiceProviderInterface {
+    
+    public function register(Container \$container): void {
+        \$container->registerServiceProvider(new MVCFactory('\\harvst\\Component\\${name}'));
+        \$container->registerServiceProvider(new ComponentDispatcherFactory('\\harvst\\Component\\${name}'));
+        \$container->set(
+            ComponentInterface::class,
+            function (Container \$container) {
+                \$component = new MVCComponent(\$container->get(ComponentDispatcherFactoryInterface::class));
+                \$component->setMVCFactory(\$container->get(MVCFactoryInterface::class));
+
+                return \$component;
+            }
+        );
+    }
+};
+
+EOM
+
+ 
\ No newline at end of file
diff --git a/bin/component_parts/site_controller.sh b/bin/component_parts/site_controller.sh
deleted file mode 100644
index 9bfbc5b..0000000
--- a/bin/component_parts/site_controller.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cat <<EOM
-<?php
-defined('_JEXEC') or die;
-
-use Joomla\CMS\MVC\Controller\BaseController;
-
-class ${name^}Controller extends BaseController
-{
-    public function __construct(\$config = array())
-    {
-        parent::__construct(\$config);
-    }
-}
-EOM
diff --git a/bin/component_parts/site_controller_base.sh b/bin/component_parts/site_controller_base.sh
deleted file mode 100644
index ce1016a..0000000
--- a/bin/component_parts/site_controller_base.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cat <<EOM
-<?php
-defined('_JEXEC') or die;
-
-use Joomla\CMS\MVC\Controller\Controller;
-
-class ${name^}Controller extends Controller
-{
-    public function __construct(\$config = array())
-    {
-        parent::__construct(\$config);
-    }
-}
-EOM
diff --git a/bin/component_parts/view.sh b/bin/component_parts/view.sh
new file mode 100644
index 0000000..08741d0
--- /dev/null
+++ b/bin/component_parts/view.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Check if $name is set
+if [[ -z "${name}" ]]; then
+  echo "Error: Variable \$name is not set. Exiting (displaycontroller.sh)."
+  exit 1
+fi
+
+cat <<EOM > admin/src/View/${name}/HtmlView.php
+<?php
+
+namespace harvst\\Component\\${name}\\Administrator\\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView {
+    
+    function display(\$tpl = null) {
+        parent::display(\$tpl);
+    }
+
+}
+
+EOM
diff --git a/bin/create_component.sh b/bin/create_component.sh
index 7d0bf7a..7673dc4 100644
--- a/bin/create_component.sh
+++ b/bin/create_component.sh
@@ -56,17 +56,17 @@ mkdir -p "$component_dir"
 # Create the main component files
 cd "$component_dir" || exit
 mkdir -p site
-mkdir -p admin/language/en-GB
+mkdir -p admin/language/en-GB admin/services 
+mkdir -p admin/src/View/${name} admin/tmpl/${name}
 
 # Source the files for generating component files
 source "$script_dir/component_parts/manifest.sh"
 source "$script_dir/component_parts/language.sh"
-# source "$script_dir/component_parts/admin_controller.sh"
-# source "$script_dir/component_parts/site_controller.sh"
-# source "$script_dir/component_parts/site_controller_base.sh"
-# source "$script_dir/component_parts/admin_controller_base.sh"
+source "$script_dir/component_parts/provider.sh"
+source "$script_dir/component_parts/displaycontroller.sh"
+source "$script_dir/component_parts/view.sh"
+source "$script_dir/component_parts/defaultview.sh"
 
 
 echo "Component framework generated successfully!"
 echo "You should manually edit the manifest file before checkin"
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f7bc72..4005235 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - joomla-db:/var/lib/mysql
 
   joomla:
-    image: joomla:4.3.1 # https://hub.docker.com/_/joomla
+    image: joomla:4.3.2 # https://hub.docker.com/_/joomla
     restart: always
     environment:
       JOOMLA_DB_HOST: mariadb