0.0.0-rc.16

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,11 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, P3
+assignees: oyeaussie
+type: Bug
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement, P3
+assignees: oyeaussie
+type: Feature
+
+---
+
+

.gitignore

@@ -1,6 +1,7 @@
 public/1/*
 public/2/*
 public/*
+!public/ping.ico
 !public/core/
 private/*
 *.sublime-project

README.md

@@ -1,3 +1,5 @@
 # SP Framework - Core
 
 Caution!!! - Do not use in production. A man from downunder is still working on it...
+
+![Alt](https://repobeats.axiom.co/api/embed/adfc9873368b036fb044bd21afb3cfae6cc5a11b.svg "Repository Analytics")

apps/Core/Components/Apps/AppsComponent.php

@@ -26,34 +26,44 @@ public function viewAction()
                     return $this->throwIdNotFound();
                 }
 
-                if (!isset($app['default_component']) ||
-                    isset($app['default_component']) && $app['default_component'] == '0'
+                $dashboard = $this->modules->components->getComponentByNameForAppType('dashboards', $app['app_type']);
+                $home = $this->modules->components->getComponentByNameForAppType('home', $app['app_type']);
+                $errors = $this->modules->components->getComponentByNameForAppType('errors', $app['app_type']);
+
+                if (!isset($app['default_component_guests']) ||
+                    isset($app['default_component_guests']) && $app['default_component_guests'] == '0'
                 ) {
                     if ($app['app_type'] === 'core' || $app['app_type'] === 'dash') {
-                        $dashboard = $this->modules->components->getComponentByNameForAppType('dashboards', $app['app_type']);
-
                         if ($dashboard) {
-                            $app['default_component'] = $dashboard['id'];
+                            $app['default_component_guests'] = $dashboard['id'];
                         }
                     } else {
-                        $home = $this->modules->components->getComponentByNameForAppType('home', $app['app_type']);
+                        if ($home) {
+                            $app['default_component_guests'] = $home['id'];
+                        }
+                    }
+                }
 
+                if (!isset($app['default_component_users']) ||
+                    isset($app['default_component_users']) && $app['default_component_users'] == '0'
+                ) {
+                    if ($app['app_type'] === 'core' || $app['app_type'] === 'dash') {
+                        if ($dashboard) {
+                            $app['default_component_users'] = $dashboard['id'];
+                        }
+                    } else {
                         if ($home) {
-                            $app['default_component'] = $home['id'];
+                            $app['default_component_users'] = $home['id'];
                         }
                     }
                 }
 
                 if (!isset($app['errors_component']) ||
                     isset($app['errors_component']) && $app['errors_component'] == '0'
                 ) {
-                    $errors = $this->modules->components->getComponentByNameForAppType('errors', $app['app_type']);
-
                     if ($errors) {
                         $app['errors_component'] = $errors['id'];
                     } else {
-                        $home = $this->modules->components->getComponentByNameForAppType('home', $app['app_type']);
-
                         if ($home) {
                             $app['errors_component'] = $home['id'];
                         }
@@ -121,7 +131,27 @@ public function viewAction()
                     $this->view->menuBaseStructure = $this->view->modulesMenus = [];
                 }
 
+                $selectGuestComponents = [];
+                $selectUserComponents = [];
+                $this->view->dashboardComponentId = 0;
+                $this->view->pageComponentId = 0;
                 foreach ($componentsArr as $key => &$componentValue) {
+                    if ($app['app_type'] === 'core' || $app['app_type'] === 'dash') {
+                        if ($componentValue['route'] !== 'home') {
+                            $selectUserComponents[$key] = $componentValue;
+                        }
+                        $selectGuestComponents[$key] = $componentValue;
+                    } else {
+                        $selectUserComponents[$key] = $componentValue;
+                        $selectGuestComponents[$key] = $componentValue;
+                    }
+
+                    if ($componentValue['route'] === 'dashboards') {
+                        $this->view->dashboardComponentId = $componentValue['id'];
+                    }
+                    if ($componentValue['route'] === 'pages') {
+                        $this->view->pageComponentId = $componentValue['id'];
+                    }
                     if ($componentValue['apps']) {
                         if (is_string($componentValue['apps'])) {
                             $componentValue['apps'] = $this->helper->decode($componentValue['apps'], true);
@@ -132,10 +162,10 @@ public function viewAction()
                         }
                     }
 
-                    if (isset($dashboard) && $dashboard) {
-                        if ($dashboard['id'] == $componentValue['id']) {
-                            $componentValue['apps'][$app['id']]['enabled'] = true;
-                        }
+                    if ($dashboard &&
+                        $dashboard['id'] == $componentValue['id']
+                    ) {
+                        $componentValue['apps'][$app['id']]['enabled'] = true;
                     }
 
                     if ($componentValue['settings']) {
@@ -164,7 +194,7 @@ public function viewAction()
                         }
                     }
 
-                    $components[$key] = $componentValue;
+                    $components[$componentValue['id']] = $componentValue;
                 }
 
                 //Middlewares
@@ -245,7 +275,9 @@ public function viewAction()
                     }
                 }
 
-                $this->view->components = msort($components, 'name');
+                $this->view->components = msort(array: $components, key: 'name', preserveKey: true);
+                $this->view->selectUserComponents = $selectUserComponents;
+                $this->view->selectGuestComponents = $selectGuestComponents;
                 $this->view->middlewares = msort($middlewares, 'sequence');
                 $this->view->views = msort($views, 'name');
                 $this->view->mandatoryComponents = $mandatoryComponents;
@@ -266,6 +298,7 @@ public function viewAction()
                 $this->view->acceptableUsernames = $this->apps->getAcceptableUsernamesForAppId();
 
                 $this->view->dashboards = $this->basepackages->dashboards->init()->getDashboardsByAppType($app['app_type']);
+                $this->view->pages = $this->basepackages->pages->init()->pages;
             } else {
                 $this->view->app = null;
                 $domains = $this->domains->domains;
@@ -367,7 +400,9 @@ public function addAction()
             $this->apps->packagesData->responseData
         );
 
-        $this->addToNotification('add', 'Added new app ' . $this->postData()['name'], null, $this->apps->packagesData->last);
+        if ($this->apps->packagesData->responseCode === 0) {
+            $this->addToNotification('add', 'Added new app ' . $this->postData()['name'], null, $this->apps->packagesData->last);
+        }
     }
 
     /**
@@ -386,7 +421,9 @@ public function updateAction()
             $this->apps->packagesData->responseCode
         );
 
-        $this->addToNotification('update', 'Updated app', null, $this->apps->packagesData->last ?? []);
+        if ($this->apps->packagesData->responseCode === 0) {
+            $this->addToNotification('update', 'Updated app', null, $this->apps->packagesData->last ?? []);
+        }
     }
 
     /**
@@ -405,7 +442,9 @@ public function removeAction()
             $this->apps->packagesData->responseCode
         );
 
-        $this->addToNotification('remove', 'Removed app with ID ' . $this->postData()['id']);
+        if ($this->apps->packagesData->responseCode === 0) {
+            $this->addToNotification('remove', 'Removed app with ID ' . $this->postData()['id']);
+        }
     }
 
     public function getFiltersAction()

apps/Core/Components/Auth/AuthComponent.php

@@ -88,7 +88,7 @@ public function loginAction()
     {
         $this->requestIsPost();
 
-        $auth = $this->access->auth->attempt($this->postData());
+        $auth = $this->access->auth->login($this->postData());
 
         $this->addResponse(
             $this->access->auth->packagesData->responseMessage,

apps/Core/Components/Dashboards/DashboardsComponent.php

@@ -12,16 +12,25 @@ class DashboardsComponent extends BaseComponent
     public function viewAction()
     {
         if (isset($this->getData()['widgets'])) {
-            $this->getNewToken();
-
             if ($this->getData()['widgets'] == 'info') {
                 return $this->basepackages->widgets->getWidget($this->getData()['id'], 'info')['info'];
             } else if ($this->getData()['widgets'] == 'content') {//This is when we add the widget via list of widgets in dashboard.
                 $dashboardWidget = $this->basepackages->dashboards->getDashboardWidgetById($this->getData()['id'], $this->getData()['did']);
 
-                $dashboardWidget['getWidgetData'] = true;
+                if ($dashboardWidget) {
+                    $dashboardWidget['getWidgetData'] = true;
+
+                    $dashboardWidgetContent = $this->basepackages->widgets->getWidget($this->getData()['wid'], 'content', $dashboardWidget);
 
-                return $this->basepackages->widgets->getWidget($this->getData()['wid'], 'content', $dashboardWidget)['content'];
+                    if (isset($dashboardWidgetContent['content'])) {
+                        return $dashboardWidgetContent['content'];
+                    }
+                }
+
+                //Remove Widget as it might be stale as the source content would have been deleted.
+                $this->basepackages->dashboards->removeWidgetFromDashboard(['dashboard_id' => $this->getData()['did'], 'id' => $this->getData()['id']]);
+
+                return false;
             }
         } else {
             if (is_string($this->app['settings'])) {
@@ -34,7 +43,7 @@ public function viewAction()
                 if ($this->getData()['id'] != 0) {
                     $dashboardId = $this->getData()['id'];
 
-                    $dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+                    $dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true);
 
                     if (isset($this->app['settings']['defaultDashboard'])) {
                         if ($this->app['settings']['defaultDashboard'] == $dashboard['id']) {
@@ -134,9 +143,11 @@ public function viewAction()
 
                 $this->view->dashboards = $dashboards;
 
-                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true);
+
+                $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree('dashboards');
 
-                $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree();
+                $this->getNewToken();//We need this token as we initiate a getDashboardWidgets();
             }
         }
     }

apps/Core/Components/Devtools/Extractgeodata/ExtractgeodataComponent.php

@@ -41,8 +41,9 @@ public function processAction()
             $success = false;
 
             if (isset($this->postData()['geo']) && $this->postData()['geo'] == 'true') {
-                $success = $this->geoExtractDataPackage->downloadGeoData();
-                $success = $this->geoExtractDataPackage->processGeoData();
+                $success = $this->geoExtractDataPackage->downloadGeoCountriesData();
+                $success = $this->geoExtractDataPackage->downloadGeoPostcodeData();
+                $success = $this->geoExtractDataPackage->processGeoCountriesData();
             }
 
             if (isset($this->postData()['timezone']) && $this->postData()['timezone'] == 'true') {
@@ -85,13 +86,18 @@ protected function registerProgressMethods()
             $methods = array_merge($methods,
                 [
                     [
-                        'method'    => 'downloadGeoData',
-                        'text'      => 'Download Geo Location Data...',
+                        'method'    => 'downloadGeoCountriesData',
+                        'text'      => 'Download Geo Location Countries Data...',
                         'remoteWeb' => true
                     ],
                     [
-                        'method'    => 'processGeoData',
-                        'text'      => 'Process Geo Location Data...'
+                        'method'    => 'downloadGeoPostcodeData',
+                        'text'      => 'Download Geo Location Postcode Data...',
+                        'remoteWeb' => true
+                    ],
+                    [
+                        'method'    => 'processGeoCountriesData',
+                        'text'      => 'Process Geo Location Countries Data...'
                     ]
                 ]
             );

apps/Core/Components/Devtools/Migrator/MigratorComponent.php

@@ -13,7 +13,7 @@ public function initialize()
     {
         $this->migratorPackage = $this->usePackage(DevtoolsMigrator::class);
 
-        $this->setModuleSettings(true);
+        $this->setModuleSettings();
 
         $this->setModuleSettingsData([
                 'apis' => $this->migratorPackage->getAvailableApis(true, false),