diff --git a/.gitignore b/.gitignore
index f9c3f4e..a7bce2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,6 @@ public/assets/css/*
!public/assets/scripts
public/assets/scripts/*
!public/assets/scripts/Start.js
-/public/assets/images/global/rikc-logo.svg
-
-
!public/assets/images
public/assets/images/*
!public/assets/images/global/
@@ -42,8 +39,4 @@ config/pages.json
config/tags.json
*.DS_Store
config.codekit3
-/config/backups
-
-src/com/*
-src/styles/*
-
+/config/backups
\ No newline at end of file
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index adf5ae8..cd8588c 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -1,6 +1,8 @@
setRiskyAllowed(true)
->setRules([
'@PSR12' => true,
'array_indentation' => true,
@@ -20,7 +22,7 @@ return (new PhpCsFixer\Config())
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
- 'single_quote' => true,
+ 'single_quote' => false,
'binary_operator_spaces' => [
'default' => 'single_space',
@@ -50,7 +52,6 @@ return (new PhpCsFixer\Config())
'extra',
'parenthesis_brace_block',
'throw',
-
]
],
'no_multiline_whitespace_around_double_arrow' => true,
@@ -68,5 +69,6 @@ return (new PhpCsFixer\Config())
'ordered_imports' => [
'sort_algorithm' => 'none',
],
+ //Other rules here...
])
->setLineEnding("\n");
diff --git a/README.md b/README.md
index 89aadd7..b554f92 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,9 @@
-
-
# 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 set up and go.
Because nobody has time for all that.
-## Check the (WIP) Docs to get you started.
+## Check the (WIP) Docs to get you started.
-[Getting Started](https://code.playvicio.us/Are0h/Fipamo/wiki/00---Start)
-[Install](https://code.playvicio.us/Are0h/Fipamo/wiki/01---Install)
-[Using Fipamo](https://code.playvicio.us/Are0h/Fipamo/wiki/02-Usage)
+[Getting Started](https://koodu.ubiqueros.com/are0h/Fipamo/wiki/00---Start)
diff --git a/brain/controller/APIControl.php b/brain/controller/APIControl.php
index dd60058..6f41555 100644
--- a/brain/controller/APIControl.php
+++ b/brain/controller/APIControl.php
@@ -225,7 +225,6 @@ class APIControl
];
break;
}
-
$response->getBody()->write(json_encode($result));
return $response->withHeader('Content-Type', 'application/json');
}
diff --git a/brain/controller/RouteControl.php b/brain/controller/RouteControl.php
index ab75386..3ceaa26 100644
--- a/brain/controller/RouteControl.php
+++ b/brain/controller/RouteControl.php
@@ -34,7 +34,6 @@ class RouteControl
switch (isset($args['first']) ? $args['first'] : 'index') {
case 'api':
//$result = APIControl::post($request, $response, $args);
- //var_dump($result);
return APIControl::post($request, $response, $args);
break;
default:
diff --git a/brain/utility/Maintenance.php b/brain/utility/Maintenance.php
index f6a4469..c3e4f40 100644
--- a/brain/utility/Maintenance.php
+++ b/brain/utility/Maintenance.php
@@ -3,7 +3,6 @@
namespace brain\utility;
use Carbon\Carbon;
-use brain\data\Settings;
class Maintenance
{
diff --git a/brain/utility/Sorting.php b/brain/utility/Sorting.php
index 8ca60a4..aa38c14 100644
--- a/brain/utility/Sorting.php
+++ b/brain/utility/Sorting.php
@@ -2,12 +2,13 @@
namespace brain\utility;
-use function _\filter;
-use function _\find;
use brain\data\Book;
use brain\data\Settings;
use Mni\FrontYAML\Parser;
+use function _\filter;
+use function _\find;
+
class Sorting
{
private static $p_tags = [];
@@ -16,6 +17,7 @@ class Sorting
public function __construct()
{
}
+
public static function tags()
{
$pages = (new Book('../content/pages'))->getContents();
@@ -36,6 +38,7 @@ class Sorting
return self::$p_tags;
}
+
private static function tagPages($tag, $pages)
{
$tagged = [];
@@ -52,6 +55,7 @@ class Sorting
return $tagged;
}
+
public static function archive()
{
$pages = (new Book('../content/pages'))->getContents();
@@ -64,10 +68,13 @@ class Sorting
if (!find($years, ['year' => trim($date[0])])) {
$findPages = filter($pages, ['createdYear' => trim($date[0])]);
// var_dump($findPages);
- array_push($years, [
- 'year' => trim($date[0]),
- 'count' => count($findPages),
- ]);
+ array_push(
+ $years,
+ [
+ 'year' => trim($date[0]),
+ 'count' => count($findPages),
+ ]
+ );
}
}
foreach ($years as $year) {
@@ -77,12 +84,15 @@ class Sorting
foreach ($filtered as $obj) {
$month = date('m', date($obj['rawCreated']));
if (!find($sorted, ['month' => $month])) {
- $perMonth = filter($pages, [
- 'path' => $year['year'] . '/' . $month,
- 'deleted' => false,
- 'published' => true,
- 'layout' => 'page',
- ]);
+ $perMonth = filter(
+ $pages,
+ [
+ 'path' => $year['year'] . '/' . $month,
+ 'deleted' => false,
+ 'published' => true,
+ 'layout' => 'page',
+ ]
+ );
array_push($sorted, [
'month' => $month,
'full_month' => date('F', date($obj['rawCreated'])),
@@ -99,6 +109,7 @@ class Sorting
return self::$p_archive;
}
+
public static function page($page)
{
$config = new Settings();
diff --git a/brain/views/dash/_frame.old.twig b/brain/views/dash/_frame.old.twig
new file mode 100644
index 0000000..4f96798
--- /dev/null
+++ b/brain/views/dash/_frame.old.twig
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+ {% block title %}
+ {{ title }}
+ {% endblock %}
+
+ {% block stylesheets %}{% endblock %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if status %}
+
+ {% endif %}
+ {% apply spaceless %}
+ {% block mainContent %}{% endblock %}
+ {% endapply %}
+
+
+
+
+
+
+
+ {% block javascripts %}{% endblock %}
+
+
diff --git a/brain/views/dash/_frame.twig b/brain/views/dash/_frame.twig
index 4f96798..f941c1e 100644
--- a/brain/views/dash/_frame.twig
+++ b/brain/views/dash/_frame.twig
@@ -30,36 +30,32 @@
-
-
-
-
-
-
+ {% endif %}
+
+
+ {% apply spaceless %}
+ {% block mainContent %}{% endblock %}
+ {% endapply %}
+
{% block javascripts %}{% endblock %}
diff --git a/brain/views/dash/forms/login.twig b/brain/views/dash/forms/login.twig
index 2a8792d..5c2b285 100644
--- a/brain/views/dash/forms/login.twig
+++ b/brain/views/dash/forms/login.twig
@@ -1,13 +1,13 @@
-
+