Beta 2.6.1 update

All the issues in milestone 2.6.1 have been completed, so now it's time for an update

.babelrc

@@ -1 +1,13 @@
-{ "presets": ["env"] }
+{
+  "presets": [],
+  "plugins": [
+    [
+      "prismjs",
+      {
+        "languages": ["html", "markdown", "markup"],
+        "theme": "okaidia",
+        "css": false
+      }
+    ]
+  ]
+}

.eslintrc

@@ -1,70 +1,70 @@
 {
-    "parserOptions": {
-        "ecmaVersion": 7,
-        "sourceType": "module",
-        "ecmaFeatures": {}
-    },
-    "rules": {
-        "constructor-super": 2,
-        "for-direction": 2,
-        "getter-return": 2,
-        "no-case-declarations": 2,
-        "no-class-assign": 2,
-        "no-compare-neg-zero": 2,
-        "no-cond-assign": 2,
-        "no-console": 1,
-        "no-const-assign": 2,
-        "no-constant-condition": 2,
-        "no-control-regex": 1,
-        "no-debugger": 2,
-        "no-delete-var": 2,
-        "no-dupe-args": 2,
-        "no-dupe-class-members": 2,
-        "no-dupe-keys": 2,
-        "no-duplicate-case": 2,
-        "no-empty": 2,
-        "no-empty-character-class": 2,
-        "no-empty-pattern": 2,
-        "no-ex-assign": 2,
-        "no-extra-boolean-cast": 2,
-        "no-extra-semi": 2,
-        "no-fallthrough": 2,
-        "no-func-assign": 2,
-        "no-global-assign": 2,
-        "no-inner-declarations": 2,
-        "no-invalid-regexp": 2,
-        "no-irregular-whitespace": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-new-symbol": 2,
-        "no-obj-calls": 2,
-        "no-octal": 2,
-        "no-redeclare": 2,
-        "no-regex-spaces": 2,
-        "no-self-assign": 2,
-        "no-sparse-arrays": 2,
-        "no-this-before-super": 2,
-        "no-undef": 2,
-        "no-unexpected-multiline": 2,
-        "no-unreachable": 2,
-        "no-unsafe-finally": 2,
-        "no-unsafe-negation": 2,
-        "no-unused-labels": 2,
-        "no-unused-vars": 2,
-        "no-useless-escape": 1,
-        "require-yield": 2,
-        "use-isnan": 2,
-        "valid-typeof": 2,
-        "no-duplicate-imports": 2
-    },
-    "env": {
-        "node": true,
-        "browser": true,
-        "es6": true
-    },
-    "globals": {
-        "_": false,
-        "hljs": false,
-        "Sortable": false,
-        "Prism": false
-    }
-}
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module",
+    "ecmaFeatures": {}
+  },
+  "rules": {
+    "constructor-super": 2,
+    "for-direction": 2,
+    "getter-return": 2,
+    "no-case-declarations": 2,
+    "no-class-assign": 2,
+    "no-compare-neg-zero": 2,
+    "no-cond-assign": 2,
+    "no-console": 1,
+    "no-const-assign": 2,
+    "no-constant-condition": 2,
+    "no-control-regex": 1,
+    "no-debugger": 2,
+    "no-delete-var": 2,
+    "no-dupe-args": 2,
+    "no-dupe-class-members": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-empty": 2,
+    "no-empty-character-class": 2,
+    "no-empty-pattern": 2,
+    "no-ex-assign": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-semi": 2,
+    "no-fallthrough": 2,
+    "no-func-assign": 2,
+    "no-global-assign": 2,
+    "no-inner-declarations": 2,
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-new-symbol": 2,
+    "no-obj-calls": 2,
+    "no-octal": 2,
+    "no-redeclare": 2,
+    "no-regex-spaces": 2,
+    "no-self-assign": 2,
+    "no-sparse-arrays": 2,
+    "no-this-before-super": 2,
+    "no-undef": 2,
+    "no-unexpected-multiline": 2,
+    "no-unreachable": 2,
+    "no-unsafe-finally": 2,
+    "no-unsafe-negation": 2,
+    "no-unused-labels": 2,
+    "no-unused-vars": 1,
+    "no-useless-escape": 1,
+    "require-yield": 2,
+    "use-isnan": 2,
+    "valid-typeof": 2,
+    "no-duplicate-imports": 2
+  },
+  "env": {
+    "node": true,
+    "browser": true,
+    "es6": true
+  },
+  "globals": {
+    "_": false,
+    "hljs": false,
+    "Sortable": false,
+    "Prism": false
+  }
+}

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 src/node_modules/
+.parcel-cache/
 .sass-cache/
 .cache/
 .nova/
@@ -11,11 +12,21 @@ public/*
 public/assets/*
 !public/assets/css
 public/assets/css/*
-!public/assets/css/dash.css
+!public/assets/css/dash
 !public/assets/scripts
 public/assets/scripts/*
-!public/assets/scripts/dash.min.js
+<<<<<<< HEAD
+!public/assets/scripts/Start.js
+/public/assets/images/global/rikc-logo.svg
 
+
+=======
+!public/assets/scripts/dash.js
+<<<<<<< HEAD
+>>>>>>> develop
+=======
+!public/assets/scripts/dash.js.map
+>>>>>>> develop
 !public/assets/images
 public/assets/images/*
 !public/assets/images/global/
@@ -41,13 +52,7 @@ config/tags.json
 config.codekit3
 /config/backups
 
-/src/com
-/src/style
-/src/node_modules
-/src/com/Base.js
-/src/com/controllers/NavIndex.js
-/src/com/controllers/PageEditor.js
-/src/com/controllers/SettingsIndex.js
-/src/libraries/FipamoAPI.js
-/src/package-lock.json
-/src/package.json
+src/com/*
+src/styles/*
+
+src/com/ui/TextEditor.js

.php-cs-fixer.php

@@ -0,0 +1,74 @@
+<?php
+
+$config = new PhpCsFixer\Config();
+return $config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR12'            => true,
+        'array_indentation' => true,
+        'array_syntax'      => [
+            'syntax' => 'short',
+        ],
+        'combine_consecutive_unsets'  => true,
+        'method_chaining_indentation' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'const'        => 'none',
+                'method'       => 'one',
+                'property'     => 'none',
+                'trait_import' => 'none',
+            ],
+        ],
+        'multiline_whitespace_before_semicolons' => [
+            'strategy' => 'no_multi_line',
+        ],
+        'single_quote' => false,
+
+        'binary_operator_spaces' => [
+            'default'   => 'single_space',
+            'operators' => [
+                '='  => 'align_single_space_minimal',
+                '=>' => 'align_single_space_minimal',
+            ],
+        ],
+        'braces' => [
+            'allow_single_line_closure' => true,
+        ],
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'declare_equal_normalize'   => true,
+        'function_typehint_space'   => true,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
+        'include'              => true,
+        'lowercase_cast'       => true,
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'curly_brace_block',
+                'extra',
+                'parenthesis_brace_block',
+                'throw',
+            ]
+        ],
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_spaces_around_offset'                     => true,
+        'no_unused_imports'                           => true,
+        'no_whitespace_before_comma_in_array'         => true,
+        'no_whitespace_in_blank_line'                 => true,
+        'object_operator_without_whitespace'          => true,
+        'single_blank_line_before_namespace'          => true,
+        'ternary_operator_spaces'                     => true,
+        'trim_array_spaces'                           => true,
+        'unary_operator_spaces'                       => true,
+        'whitespace_after_comma_in_array'             => true,
+        'single_line_after_imports'                   => true,
+        'ordered_imports'                             => [
+            'sort_algorithm' => 'none',
+        ],
+        //Other rules here...
+    ])
+    ->setLineEnding("\n");

.prettierignore

@@ -0,0 +1,7 @@
+.babelrc
+README.md
+*.twig
+*.sass
+*.json
+*.php
+*.md

.prettierrc

@@ -0,0 +1,36 @@
+{
+  "overrides": [
+    {
+      "files": ".prettierrc",
+      "options": { "parser": "json" }
+    },
+    {
+      "files": "*.scss",
+      "options": {
+        "tabWidth": 4,
+        "semi": false,
+        "singleQuote": true,
+        "printWidth": 90
+      }
+    },
+    {
+      "files": "*.js",
+      "options": {
+        "arrowParens": "avoid",
+        "bracketSpacing": true,
+        "htmlWhitespaceSensitivity": "css",
+        "insertPragma": false,
+        "bracketSameLine": false,
+        "jsxSingleQuote": true,
+        "proseWrap": "preserve",
+        "requirePragma": false,
+        "semi": true,
+        "singleQuote": true,
+        "trailingComma": "none",
+        "useTabs": true,
+        "tabWidth": 4,
+        "printWidth": 90
+      }
+    }
+  ]
+}

.stylelintrc

@@ -0,0 +1,3 @@
+{
+  "extends": ["stylelint-config-standard"]
+}

README.md

@@ -1,13 +1,9 @@
-![This is Fipamo](https://playvicio.us/base-assets/images/fipamo-brand.png)
-
 # Fipamo means to save
 
-The Fipamo project was born from a need for a simple, easy to use no data blog platform that doesn't require much effort to set up and maintain. Fipamo uses Markdown to handle posts and renders them to flat html so you can serve them from anywhere. No complicated set ups. No long list of dependencies. Just write and publish.
+The Fipamo project was born from a need for a simple, easy to use no data blog platform that doesn't require much effort to set up and maintain. Fipamo uses Markdown to handle posts and renders them to flat html so you can serve them from anywhere. No complicated set ups. No long list of dependencies. Just set up and go. 
 
 Because nobody has time for all that.
 
-## Check the (WIP) Docs to get you started. <br>
+## Check the (WIP) Docs to get you started.  <br>
 
-[Getting Started](https://code.playvicio.us/Are0h/Fipamo/wiki/00---Start) <br>
-[Install](https://code.playvicio.us/Are0h/Fipamo/wiki/01---Install) <br>
-[Using Fipamo](https://code.playvicio.us/Are0h/Fipamo/wiki/02-Usage) <br>
+[Getting Started](https://koodu.ubiqueros.com/are0h/Fipamo/wiki/00---Start) <br>

brain/App.inc.php

@@ -1,46 +0,0 @@
-<?php
-
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Factory\AppFactory;
-use Slim\Views\Twig;
-use Slim\Views\TwigMiddleware;
-
-include "../brain/controller/RouteControl.inc.php";
-include "../brain/data/Settings.inc.php";
-include "../brain/data/Session.inc.php";
-include "../brain/data/Member.inc.php";
-include "../brain/data/Auth.inc.php";
-include "../brain/data/Render.inc.php";
-include "../brain/utility/StringTools.inc.php";
-include "../brain/utility/FileUploader.inc.php";
-include "../brain/utility/DocTools.inc.php";
-include "../brain/utility/Sorting.inc.php";
-include "../brain/utility/Setup.inc.php";
-include "../brain/utility/Maintenance.inc.php";
-include "../brain/utility/Mailer.inc.php";
-include "../brain/utility/HandleCors.inc.php";
-
-class App
-{
-  public function __construct()
-  {
-    // set up cors
-    new HandleCors();
-    $app = AppFactory::create();
-    $twig = Twig::create("../brain/views/");
-    $app->add(TwigMiddleware::create($app, $twig));
-    //set up routing
-    $app->get(
-      "/[{first}[/{second}[/{third}[/{fourth}[/{fifth}]]]]]",
-      "\RouteControl:get"
-    );
-    $app->post(
-      "/[{first}[/{second}[/{third}[/{fourth}]]]]",
-      "\RouteControl:post"
-    );
-    //start the app
-
-    $app->run();
-  }
-}

brain/_loader.php

@@ -0,0 +1,10 @@
+<?php
+
+spl_autoload_register(function ($className) {
+    $file = dirname(__DIR__) . '\\' . $className . '.php';
+    $file = str_replace('\\', DIRECTORY_SEPARATOR, $file);
+    //echo $file;
+    if (file_exists($file)) {
+        include $file;
+    }
+});

brain/api/v1/AuthAPI.inc.php

@@ -1,74 +0,0 @@
-<?php
-
-class AuthAPI
-{
-  public function __construct()
-  {
-  }
-
-  public static function status()
-  {
-    $result = [];
-    //internal check for admin action
-    if (Auth::status()) {
-      $result = [
-        "message" => "Authorized",
-        "type" => "apiUseAuthorized",
-        "token" => Session::get("token"),
-      ];
-    } else {
-      $result = [
-        "message" => "Not Authorized",
-        "type" => "apiUseNotAuthorized",
-      ];
-    }
-    return $result;
-  }
-
-  public static function login($body)
-  {
-    $result = [];
-    switch (Auth::login($body)) {
-      case "no_name":
-        $result = [
-          "message" => "Need to see some id, champ",
-          "type" => "requestLame",
-        ];
-        break;
-      case "bad_pass":
-        $result = [
-          "message" => "Check your password, sport",
-          "type" => "requestLame",
-        ];
-        break;
-      default:
-        $result = [
-          "message" => "Welcome back",
-          "type" => "requestGood",
-        ];
-        break;
-    }
-
-    return $result;
-  }
-
-  public static function logout($body)
-  {
-    Auth::logout($body);
-    $result = [
-      "message" => "Till next time, g.",
-      "type" => "TASK_LOGOUT",
-    ];
-    return $result;
-  }
-  public static function requestSecret($body)
-  {
-    $result = Auth::findSecret($body);
-    return $result;
-  }
-  public static function resetPassword($body)
-  {
-    $result = Auth::makeNewPassword($body);
-    return $result;
-  }
-}

brain/api/v1/AuthAPI.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\data\Auth;
+use brain\data\Session;
+
+class AuthAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function status()
+    {
+        $result = [];
+        //internal check for admin action
+        if (Auth::status()) {
+            $result = [
+                'message' => 'Authorized',
+                'type'    => 'apiUseAuthorized',
+                'token'   => Session::get('token'),
+            ];
+        } else {
+            $result = [
+                'message' => 'Not Authorized',
+                'type'    => 'apiUseNotAuthorized',
+            ];
+        }
+        return $result;
+    }
+
+    public static function login($body)
+    {
+        $result = [];
+        switch (Auth::login($body)) {
+            case 'no_name':
+                $result = [
+                    'message' => 'Need to see some id, champ',
+                    'type'    => 'requestLame',
+                ];
+                break;
+            case 'bad_pass':
+                $result = [
+                    'message' => 'Check your password, sport',
+                    'type'    => 'requestLame',
+                ];
+                break;
+            default:
+                $result = [
+                    'message' => 'Welcome back',
+                    'type'    => 'requestGood',
+                ];
+                break;
+        }
+
+        return $result;
+    }
+
+    public static function logout($body)
+    {
+        Auth::logout($body);
+        $result = [
+            'message' => 'Till next time, g.',
+            'type'    => 'TASK_LOGOUT',
+        ];
+        return $result;
+    }
+
+    public static function requestSecret($body)
+    {
+        $result = Auth::findSecret($body);
+        return $result;
+    }
+
+    public static function resetPassword($body)
+    {
+        $result = Auth::makeNewPassword($body);
+        return $result;
+    }
+}

brain/api/v1/FilesAPI.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\utility\FileUploader;
+use brain\data\Settings;
+use brain\data\Member;
+
+class FilesAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function uploadFiles($request, $type = null)
+    {
+        $upload    = $request->getUploadedFiles();  //grab uploaded files
+        $options   = $request->getParsedBody();
+        $file      = $upload['upload_files'][0];    //front end sends one by one for progress tracking, so grab first
+        $type      = $file->getClientMediaType();
+        $filesPath = '';
+        $path      = date('Y') . '/' . date('m');
+        $response  = [];
+
+        switch ($type) {
+            case 'image/jpeg':
+            case 'image/png':
+            case 'image/gif':
+            case 'image/svg':
+                if (isset($options["source"])) {
+                    if ($options["source"] == "avatar-upload") {
+                        $filesPath = '/assets/images/user/' . $path . '/';
+                        Member::updateData(
+                            'avi',
+                            $filesPath . $file->getClientFileName()
+                        );
+                    } else {
+                        $filesPath = '/assets/images/user/' . $path . '/';
+                        Settings::updateGlobalData(
+                            'background',
+                            $filesPath . '/' . $file->getClientFileName()
+                        );
+                    }
+                } else {
+                    $filesPath = '/assets/images/blog/' . $path . '/';
+                }
+
+                break;
+            case 'video/mp4':
+                $filesPath = '/assets/video/blog/' . $path . '/';
+                break;
+            case 'audio/mpeg':
+                $filesPath = '/assets/sound/blog/' . $path . '/';
+                break;
+            case 'application/pdf':
+            case 'text/plain':
+            case 'text/rtf':
+                $filesPath = '/assets/docs/blog/' . $path . '/';
+                break;
+        }
+
+        FileUploader::uploadFile('../public' . $filesPath, $file);
+
+        $response = [
+            'message'  => "File Uploaded. Great!",
+            "filePath" => $filesPath . urlencode($file->getClientFileName()),
+            "fileName" => urlencode($file->getClientFileName()),
+            'type'     => $type,
+        ];
+
+        return $response;
+    }
+}

brain/api/v1/ImagesAPI.inc.php

@@ -1,76 +0,0 @@
-<?php
-
-class ImagesAPI
-{
-  public function __construct()
-  {
-  }
-
-  public static function uploadImage($request, $type = null)
-  {
-    $file = $request->getUploadedFiles();
-    $uploadPath = "";
-    $path = date("Y") . "/" . date("m");
-    $response = [];
-    switch ($type) {
-      case "avatar":
-        $image = $file["avatar_upload"];
-        $uploadPath = "../public/assets/images/user/" . $path;
-        break;
-      case "background":
-        $image = $file["background_upload"];
-        $uploadPath = "../public/assets/images/user/" . $path;
-        break;
-      default:
-        $image = $file["post_image"];
-        $path = date("Y") . "/" . date("m");
-        $uploadPath = "../public/assets/images/blog/" . $path;
-        break;
-    }
-
-    $result = FileUploader::uploadFile($uploadPath, $image);
-
-    switch ($type) {
-      case "avatar":
-        $response = [
-          "message" => "Avatar Added. You look great!",
-          "type" => "avatarUploaded",
-          "url" =>
-            "/assets/images/user/" . $path . "/" . $image->getClientFileName(),
-        ];
-
-        //update member data
-        Member::updateData(
-          "avi",
-          "/assets/images/user/" . $path . "/" . $image->getClientFileName()
-        );
-
-        break;
-      case "background":
-        $response = [
-          "message" => "Background plugged in. That's nice!",
-          "type" => "siteBackgroundUploaded",
-          "url" =>
-            "/assets/images/user/" . $path . "/" . $image->getClientFileName(),
-        ];
-
-        //update settings file
-        Settings::updateGlobalData(
-          "background",
-          "/assets/images/user/" . $path . "/" . $image->getClientFileName()
-        );
-
-        break;
-      default:
-        $response = [
-          "message" => "Image Added. Very slick",
-          "type" => "postImageAdded",
-          "url" =>
-            "/assets/images/blog/" . $path . "/" . $image->getClientFileName(),
-        ];
-        break;
-    }
-
-    return $response;
-  }
-}

brain/api/v1/ImagesAPI.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\data\Member;
+use brain\data\Settings;
+use brain\utility\FileUploader;
+
+class ImagesAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function uploadImage($request, $type = null)
+    {
+        $file       = $request->getUploadedFiles();
+        $uploadPath = '';
+        $path       = date('Y') . '/' . date('m');
+        $response   = [];
+        switch ($type) {
+            case 'avatar':
+                $image      = $file['avatar_upload'];
+                $uploadPath = '../public/assets/images/user/' . $path;
+                break;
+            case 'background':
+                $image      = $file['background_upload'];
+                $uploadPath = '../public/assets/images/user/' . $path;
+                break;
+            default:
+                $image      = $file['post_image'];
+                $path       = date('Y') . '/' . date('m');
+                $uploadPath = '../public/assets/images/blog/' . $path;
+                break;
+        }
+
+        $result = FileUploader::uploadFile($uploadPath, $image);
+
+        switch ($type) {
+            case 'avatar':
+                $response = [
+                    'message' => 'Avatar Added. You look great!',
+                    'type'    => 'avatarUploaded',
+                    'url'     => '/assets/images/user/' . $path . '/' . $image->getClientFileName(),
+                ];
+
+              //update member data
+                Member::updateData(
+                    'avi',
+                    '/assets/images/user/' . $path . '/' . $image->getClientFileName()
+                );
+
+                break;
+            case 'background':
+                $response = [
+                    'message' => "Background plugged in. That's nice!",
+                    'type'    => 'siteBackgroundUploaded',
+                    'url'     => '/assets/images/user/' . $path . '/' . $image->getClientFileName(),
+                ];
+
+              //update settings file
+                Settings::updateGlobalData(
+                    'background',
+                    '/assets/images/user/' . $path . '/' . $image->getClientFileName()
+                );
+
+                break;
+            default:
+                $response = [
+                    'message' => 'Image Added. Very slick',
+                    'type'    => 'postImageAdded',
+                    'url'     => '/assets/images/blog/' . $path . '/' . $image->getClientFileName(),
+                ];
+                break;
+        }
+
+        return $response;
+    }
+}

brain/api/v1/InitAPI.inc.php

@@ -1,30 +0,0 @@
-<?php
-
-class InitAPI
-{
-  public function __construct()
-  {
-  }
-
-  public static function handleInitTasks($task, $request)
-  {
-    //check if a site config already exists. if it does, deny set up request
-    //restore to previous version of site while a config exists is only accessible
-    //through settings.
-
-    if (Setup::status()) {
-      $result = ["type" => "blogInitFail", "message" => "Site already set up"];
-    } else {
-      switch ($task) {
-        case "init":
-          $result = Setup::init($request);
-          break;
-        case "restore":
-          $result = Setup::restore($request);
-          break;
-      }
-    }
-
-    return $result;
-  }
-}

brain/api/v1/InitAPI.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\utility\Setup;
+
+class InitAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function handleInitTasks($task, $request)
+    {
+        //check if a site config already exists. if it does, deny set up request
+        //restore to previous version of site while a config exists is only accessible
+        //through settings.
+
+        if (Setup::status()) {
+            $result = ['type' => 'blogInitFail', 'message' => 'Site already set up'];
+        } else {
+            switch ($task) {
+                case 'init':
+                    $result = Setup::init($request);
+                    break;
+                case 'restore':
+                    $result = Setup::restore($request);
+                    break;
+            }
+        }
+
+        return $result;
+    }
+}

brain/api/v1/MailerAPI.inc.php

@@ -1,26 +0,0 @@
-<?php
-
-class MailerAPI
-{
-  public function __construct()
-  {
-  }
-
-  public static function handleMail($request, $body, $response)
-  {
-    //if testing, verify session is active
-    if ($body["mail_task"] == "TESTING") {
-      if (Session::active()) {
-        $result = Mailer::sendmail($body);
-      } else {
-        $result = [
-          "message" => "You need to be logged in for this, champ.",
-          "type" => "MAILER_ERROR",
-        ];
-      }
-    } else {
-    }
-
-    return $result;
-  }
-}

brain/api/v1/MailerAPI.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\data\Session;
+use brain\utility\Mailer;
+
+class MailerAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function handleMail($request, $body, $response)
+    {
+        // if testing, verify session is active
+        // add clean method for sending programmtic emails
+        if ($body['mail_task'] == 'TESTING') {
+            if (Session::active()) {
+                $result = Mailer::sendmail($body);
+            } else {
+                $result = [
+                    'message' => 'You need to be logged in for this, champ.',
+                    'type'    => 'MAILER_ERROR',
+                ];
+            }
+        } else {
+        }
+
+        return $result;
+    }
+}

brain/api/v1/PagesAPI.inc.php

@@ -1,173 +0,0 @@
-<?php
-use function _\filter;
-use Mni\FrontYAML\Parser;
-
-class PagesAPI
-{
-  public function __construct()
-  {
-  }
-
-  public static function getPageContent($request, $args)
-  {
-    $task = $args["fourth"];
-    $pages = (new Book("../content/pages"))->getContents();
-    $content = [];
-    foreach ($pages as $page) {
-      $entry = [
-        "id" => $page["id"],
-        "uuid" => $page["uuid"],
-        "title" => $page["title"],
-        "feature" => $page["feature"],
-        "path" => $page["path"],
-        "layout" => $page["layout"],
-        "tags" => $page["tags"],
-        "author" => $page["author"],
-        "created" => $page["created"],
-        "updated" => $page["updated"],
-        "deleted" => $page["deleted"],
-        "menu" => $page["menu"],
-        "featured" => $page["featured"],
-        "published" => $page["published"],
-        "slug" => $page["slug"],
-        "content" => StringTools::sanitizeContent($page["content"]),
-      ];
-
-      array_push($content, $entry);
-    }
-    switch ($task) {
-      case "published":
-        $published = filter($content, function ($item) {
-          return $item["published"] == true && $item["deleted"] == false;
-        });
-
-        $result = ["pages" => $published, "totalItems" => count($published)];
-        break;
-      case "featured":
-        $featured = filter($content, function ($item) {
-          return $item["featured"] == true && $item["deleted"] == false;
-        });
-
-        $result = [
-          "pages" => $featured,
-          "totalItems" => count($featured),
-        ];
-        break;
-      case "menu":
-        $menu = filter($content, function ($item) {
-          return $item["menu"] == true && $item["deleted"] == false;
-        });
-
-        $result = ["pages" => $menu, "totalItems" => count($menu)];
-        break;
-      case "single":
-        $uuid = $args["fifth"];
-        $page = (new Book("../content/pages"))->findPageById($uuid);
-
-        $entry = [
-          "id" => $page["id"],
-          "uuid" => $page["uuid"],
-          "title" => $page["title"],
-          "feature" => $page["feature"],
-          "path" => $page["path"],
-          "layout" => $page["layout"],
-          "tags" => $page["tags"],
-          "author" => $page["author"],
-          "created" => $page["created"],
-          "updated" => $page["updated"],
-          "deleted" => $page["deleted"],
-          "menu" => $page["menu"],
-          "featured" => $page["featured"],
-          "published" => $page["published"],
-          "slug" => $page["slug"],
-          "content" => StringTools::sanitizeContent($page["content"]),
-        ];
-        $result = $entry;
-        break;
-      case "tags":
-        $result = Settings::getTags();
-        break;
-      default:
-        $result = [
-          "message" => "Hm, no task. That's unfortunate",
-          "type" => "TASK_NONE",
-        ];
-        break;
-    }
-    return $result;
-  }
-
-  public static function handlePageTask($request, $args)
-  {
-    $task = $args["fourth"];
-    switch ($task) {
-      case "delete":
-      case "create":
-      case "write":
-        $body = $request->getParsedBody();
-        $passed = true;
-        if (!isset($body["form_token"])) {
-          $result = [
-            "message" => "No form token. Not good, sport.",
-            "type" => "TASK_FORM_AUTH",
-          ];
-        } else {
-          if ($body["form_token"] == Session::get("form_token")) {
-            //TODO: Verify form fields
-            $keys = [
-              "id",
-              "uuid",
-              "layout",
-              "current_title",
-              "content",
-              "title",
-              "created",
-              "slug",
-              "tags",
-              "menu",
-              "featured",
-              "published",
-              "form_token",
-              "feature_image",
-            ];
-
-            foreach ($body as $key => $item) {
-              if (!in_array($key, $keys)) {
-                //found unnecessary key, so reject submission
-                $passed = false;
-              }
-            }
-            if ($passed) {
-              $result = (new Book("../content/pages"))->editPage(
-                $task,
-                $request
-              );
-            } else {
-              $result = [
-                "message" => "Form token, auth failed. Uh oh.",
-                "type" => "TASK_FORM_AUTH",
-              ];
-            }
-          } else {
-            $result = [
-              "message" => "Form token, auth failed. Uh oh.",
-              "type" => "TASK_FORM_AUTH",
-            ];
-          }
-        }
-
-        break;
-      case "add-entry-image":
-        $result = ImagesAPI::uploadImage($request);
-        break;
-      default:
-        $result = [
-          "message" => "Hm, no task. That's unfortunate",
-          "type" => "TASK_NONE",
-        ];
-        break;
-    }
-
-    return $result;
-  }
-}

brain/api/v1/PagesAPI.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace brain\api\v1;
+
+use brain\data\Book;
+use brain\data\Settings;
+use brain\data\Session;
+use brain\utility\StringTools;
+
+use function _\filter;
+
+class PagesAPI
+{
+    public function __construct()
+    {
+    }
+
+    public static function getPageContent($request, $args)
+    {
+        $task    = $args['fourth'];
+        $pages   = (new Book('../content/pages'))->getContents();
+        $content = [];
+        foreach ($pages as $page) {
+            $entry = [
+                'id'        => $page['id'],
+                'uuid'      => $page['uuid'],
+                'title'     => $page['title'],
+                'feature'   => $page['feature'],
+                'path'      => $page['path'],
+                'layout'    => $page['layout'],
+                'tags'      => $page['tags'],
+                'author'    => $page['author'],
+                'created'   => $page['created'],
+                'updated'   => $page['updated'],
+                'deleted'   => $page['deleted'],
+                'menu'      => $page['menu'],
+                'featured'  => $page['featured'],
+                'published' => $page['published'],
+                'slug'      => $page['slug'],
+                'content'   => StringTools::sanitizeContent($page['content']),
+            ];
+
+            array_push($content, $entry);
+        }
+        switch ($task) {
+            case 'published':
+                $published = filter($content, function ($item) {
+                    return $item['published'] == true && $item['deleted'] == false;
+                });
+
+                $result = ['pages' => $published, 'totalItems' => count($published)];
+                break;
+            case 'featured':
+                $featured = filter($content, function ($item) {
+                    return $item['featured'] == true && $item['deleted'] == false;
+                });
+
+                $result = [
+                    'pages'      => $featured,
+                    'totalItems' => count($featured),
+                ];
+                break;
+            case 'menu':
+                $menu = filter($content, function ($item) {
+                    return $item['menu'] == true && $item['deleted'] == false;
+                });
+
+                $result = ['pages' => $menu, 'totalItems' => count($menu)];
+                break;
+            case 'single':
+                $uuid = $args['fifth'];
+                $page = (new Book('../content/pages'))->findPageById($uuid);
+
+                $entry = [
+                    'id'        => $page['id'],
+                    'uuid'      => $page['uuid'],
+                    'title'     => $page['title'],
+                    'feature'   => $page['feature'],
+                    'path'      => $page['path'],
+                    'layout'    => $page['layout'],
+                    'tags'      => $page['tags'],
+                    'author'    => $page['author'],
+                    'created'   => $page['created'],
+                    'updated'   => $page['updated'],
+                    'deleted'   => $page['deleted'],
+                    'menu'      => $page['menu'],
+                    'featured'  => $page['featured'],
+                    'published' => $page['published'],
+                    'slug'      => $page['slug'],
+                    'content'   => StringTools::sanitizeContent($page['content']),
+                ];
+                $result = $entry;
+                break;
+            case 'tags':
+                $result = Settings::getTags();
+                break;
+            default:
+                $result = [
+                    'message' => "Hm, no task. That's unfortunate",
+                    'type'    => 'TASK_NONE',
+                ];
+                break;
+        }
+        return $result;
+    }
+
+    public static function handlePageTask($request, $args)
+    {
+        $task = $args['fourth'];
+        switch ($task) {
+            case 'delete':
+            case 'create':
+            case 'write':
+                $body   = json_decode(file_get_contents("php://input"), true);
+                $passed = true;
+                if (!isset($body['form_token'])) {
+                    $result = [
+                        'message' => 'No form token. Not good, sport.',
+                        'type'    => 'TASK_FORM_AUTH',