Added ajax bridge, fixed all

src/ajax/save_day_entries.php

@@ -6,12 +6,9 @@ public function saveDayEntries( $request ) {
 
     // we use no backup here, just start from scratch if error
 
-    // $data = file_get_contents('php://input');
-    $data = json_decode( file_get_contents('php://input'), true);
+    // $data = json_decode( file_get_contents('php://input'), true);
 
-    // file_put_contents( $fil, $data);
-
-    if( ! file_put_contents('data/days/' . date('Y-m-d') . '.tsv', $data['data']))
+    if( ! file_put_contents('data/days/' . date('Y-m-d') . '.tsv', $request['data']))
       echo json_encode(['result' => 'error', 'message' => 'Error saving']);
 
     echo json_encode(['result' => 'success']);

src/ajax/save_foods.php

@@ -1,17 +1,17 @@
 <?php
 
+// require_once 'lib/backup_230924.php';
+
 trait SaveFoodsAjaxController
 {
   public function saveFoods( $request ) {
 
-    // require_once 'lib/backup_230924.php';
-
-    $data = json_decode( file_get_contents('php://input'), true);
+    // $data = json_decode( file_get_contents('php://input'), true);
 
     // if( ! backup_fil( $groupsFil ))  // prefer cause we have on backup form for all dools
     //   echo json_encode(['result' => 'error', 'message' => 'Error making backup']);  // TASK: add in js
 
-    if( ! file_put_contents('data/foods.yml', $data['data']))
+    if( ! file_put_contents('data/foods.yml', $request['data']))
       echo json_encode(['result' => 'error', 'message' => 'Error saving']);
 
     echo json_encode(['result' => 'success']);

src/ajax_bridge.php

@@ -0,0 +1,22 @@
+<?php
+
+use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Exception\ParseException;
+
+require_once 'vendor/autoload.php';
+require_once 'lib/SimpleData_240317/SimpleData.php';
+require_once 'lib/ConfigStatic_240323/config.php';
+require_once 'controller.php';
+
+
+// Currently used as a bridge for dashbard integration
+
+// $this->config = new SimpleData( Yaml::parse( file_get_contents('config.yml')));
+config::setData( new SimpleData( Yaml::parse( file_get_contents('config.yml'))));
+
+$args = json_decode( file_get_contents('php://input'), true);
+
+$controller = new FoodsController();
+echo $controller->dispatch($args);
+
+?>

src/controller.js

@@ -69,8 +69,8 @@ class FoodsEventController
 
   saveFoodsBtnClick(event)
   {
-    send('ajax/save_foods.php', query('#foods').value, function( result, data) {
-    // send('index.php', { identifier: 'saveFoods', data: query('#foods').value ]}, function( result, data ) {
+    // send('ajax/save_foods.php', query('#foods').value, function( result, data) {
+    send('ajax_bridge.php', { identifier: 'saveFoods', data: query('#foods').value }, function( result, data ) {
 
       if( result === 'success')
         query('#foodsUIMsg').innerHTML = 'Saved'
@@ -120,8 +120,8 @@ class FoodsEventController
 
   #saveDayEntries()
   {
-    send('ajax/save_day_entries.php', query('#dayEntries').value, function( result, data) {
-    // send('index.php', { identifier: 'saveDayEntries', data: query('#dayEntries').value ]}, function( result, data ) {
+    // send('ajax/save_day_entries.php', query('#dayEntries').value, function( result, data) {
+    send('ajax_bridge.php', { identifier: 'saveDayEntries', data: query('#dayEntries').value }, function( result, data ) {
 
       if( result === 'success')
         query('#foodsUIMsg').innerHTML = 'Saved'

src/controller.php

@@ -18,7 +18,7 @@ class FoodsController extends ControllerBase
   public SimpleData $data;
 
 
-  public function __construct()
+  public function __construct(/*$model = null, $view = null*/)
   {
     parent::__construct();
 
@@ -116,7 +116,7 @@ public function __construct()
   }
 
 
-  public function view() {
+  public function render(/*$request*/) {
 
     // we currently use no Engine cause the app is tooooooooooo small
 

src/index.php

@@ -1,7 +1,5 @@
 <?php
 
-// page wrapper for standalone use
-
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Exception\ParseException;
 
@@ -33,6 +31,9 @@
 //
 // $router->run();
 
+
+// Page wrapper for standalone use
+
 ?><!DOCTYPE html>
 <html>
 <head>
@@ -82,7 +83,7 @@
       config::setData( new SimpleData( Yaml::parse( file_get_contents('config.yml'))));
 
       $controller = new FoodsController();
-      echo $controller->view();
+      echo $controller->render();
 
     ?>
 

src/lib/Controller_240323/ControllerBase.php

@@ -31,12 +31,12 @@ public function dispatch( $request )
 
     if( ! count($identifier) )  // ins of methods like index() as done in laravel
     {
-      return $this->render();
+      return $this->render( $request );
     }
-    elseif( count($identifier) == 1 && method_exists($this, $identifier[1]))
+    elseif( count($identifier) == 1 && method_exists($this, $identifier[0]))
     {
-      $method = $identifier[1];
-      return $this->$method();
+      $method = $identifier[0];
+      return $this->$method( $request );
     }
     elseif( count($identifier) > 1 )
     {

src/lib/Controller_240323/README.md

@@ -38,11 +38,11 @@ class SampleController extends ControllerBase
 {
   use SomeAjaxController;  // trait (partial class if long)
 
-  // public function __constuct()
   public function __constuct( $model = null, $view = null )
+  // public function __constuct()  // or
   {
-    // parent::__construct();  // or
     parent::__construct( $model, $view );
+    // parent::__construct();
 
     // Register sub and ajax controllers
 
@@ -58,6 +58,7 @@ class SampleController extends ControllerBase
   // dispatch() may be used by Routing just like any method here (which handles sub controllers)
 
   public function getData( $request )
+  // public function getData()  // or
   {
     // ajax ...
   }

src/lib/send_230808.js

@@ -5,10 +5,10 @@ function send( url, data, callback )
     headers: {
       'Content-Type': 'application/json'
     },
-    body: JSON.stringify({ data: data })
+    body: JSON.stringify( data )
   })
   .then( response => response.text())
-.then( result => {
+  .then( result => {
     result = JSON.parse(result)
     if( typeof callback === 'function' )
       callback( result.result, result.data  || null )