projects/fipamo
1
0
Fork 1
Code Issues 8 Pull requests Projects 1 Releases 23 Wiki Activity

formatting changes

Browse source
This commit is contained in:
Are0h 2022-04-16 13:21:57 -07:00
parent 2e30d6eb26
commit 9baaed6d50
8 changed files with 355 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brain/controller/DashControl.php
View file

@ -158,9 +158,9 @@ class DashControl
$page = $book->findPageById($uuid); $page = $book->findPageById($uuid);
$pageOptions = Sorting::page($page); $pageOptions = Sorting::page($page);
$preview = $preview =
$settings['global']['theme']. $settings['global']['theme'] .
'/'. '/' .
$page['layout']. $page['layout'] .
'.twig'; '.twig';
$html = $display->render($preview, $pageOptions); $html = $display->render($preview, $pageOptions);
$response->getBody()->write($html); $response->getBody()->write($html);

1
brain/init/App.php
View file

@ -5,7 +5,6 @@ namespace brain\init;
use brain\utility\HandleCors; use brain\utility\HandleCors;
use Slim\Factory\AppFactory; use Slim\Factory\AppFactory;
use Slim\Views\Twig; use Slim\Views\Twig;
// Fipamo Core Classes
use Slim\Views\TwigMiddleware; use Slim\Views\TwigMiddleware;
class App class App

20
brain/utility/Sorting.php
View file

@ -129,22 +129,22 @@ class Sorting
} }
$meta = [ $meta = [
'who' => $page['author'], 'who' => $page['author'],
'when' => $page['created'], 'when' => $page['created'],
'tags' => $tags, 'tags' => $tags,
]; ];
// render markdown content and clean it // render markdown content and clean it
$parser = new Parser(); $parser = new Parser();
$rendered = $parser->parse($page['content']); $rendered = $parser->parse($page['content']);
$sanitizer = \HtmlSanitizer\Sanitizer::create([ $sanitizer = \HtmlSanitizer\Sanitizer::create([
'extensions' => ['basic', 'image', 'list', 'code'], 'extensions' => ['basic', 'image', 'list', 'code'],
'tags' => [ 'tags' => [
'img' => [ 'img' => [
'allowed_attributes' => ['src', 'alt', 'title', 'class'], 'allowed_attributes' => ['src', 'alt', 'title', 'class'],
'allowed_hosts' => null, 'allowed_hosts' => null,
], ],
], ],
]); ]);
$preclean = $sanitizer->sanitize($rendered->getContent()); $preclean = $sanitizer->sanitize($rendered->getContent());

121
brain/views/dash/_frame.twig
View file

@ -1,65 +1,66 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title> <meta name="theme-color" content="#FFFFFF"/>
{% block title %} <title>
{{ title }} {% block title %}
{% endblock %} {{ title }}
</title> {% endblock %}
{% block stylesheets %}{% endblock %} </title>
</head> {% block stylesheets %}{% endblock %}
<body> </head>
<div id="notifications" class="notifications"> <body>
<div id="notifyMessage" class="notifyMessage"> <div id="notifications" class="notifications">
<div id="notify-good" class="notify-icon"> <div id="notifyMessage" class="notifyMessage">
<svg viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-emoji-flirt"/></svg> <div id="notify-good" class="notify-icon">
</div> <svg viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-emoji-flirt"/></svg>
<div id="notify-lame" class="notify-icon"> </div>
<svg viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-emoji-sad"/></svg> <div id="notify-lame" class="notify-icon">
</div> <svg viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-emoji-sad"/></svg>
<div id="notify-working" class="notify-icon"> </div>
<svg id="notify-working-icon" viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-cog"/></svg> <div id="notify-working" class="notify-icon">
</div> <svg id="notify-working-icon" viewbox="0 0 20 20" class="icons"><use xlink:href="/assets/images/global/sprite.svg#entypo-cog"/></svg>
</div>
<div id="notify-text">
<div id="notify-progress"></div> <div id="notify-text">
<p id="message-text">MESSAGE TEXT</p> <div id="notify-progress"></div>
</div> <p id="message-text">MESSAGE TEXT</p>
</div>
</div>
</div> </div>
<div id="main-content" class="main-container"> </div>
<section id="dash-index-content"> <div id="main-content" class="main-container">
{% if status %} <section id="dash-index-content">
<header id="header"> {% if status %}
<div id="wrapper"> <header id="header">
{% apply spaceless %} <div id="wrapper">
<div id="left"> {% apply spaceless %}
<a href="/dashboard"><img id="the-logo" src="/assets/images/global/fipamo-logo.svg"/></a> <div id="left">
</div> <a href="/dashboard"><img id="the-logo" src="/assets/images/global/fipamo-logo.svg"/></a>
<div id="right"> </div>
{% if status %} <div id="right">
{% apply spaceless %} {% if status %}
{{ include("dash/partials/navigation.twig") }} {% apply spaceless %}
{% endapply %} {{ include("dash/partials/navigation.twig") }}
{% endif %} {% endapply %}
</div> {% endif %}
{% endapply %} </div>
</div> {% endapply %}
</div>
</header>
{% endif %} </header>
{% apply spaceless %} {% endif %}
{% block mainContent %}{% endblock %} {% apply spaceless %}
{% endapply %} {% block mainContent %}{% endblock %}
{% endapply %}
</section>
</section>
</div> </div>
<footer></footer> <footer></footer>
{% block javascripts %}{% endblock %} {% block javascripts %}{% endblock %}
</body> </body>
</html> </html>

38
brain/views/dash/start.twig
View file

@ -1,27 +1,27 @@
{% extends "dash/_frame.twig" %} {% extends "dash/_frame.twig" %}
{% block title %} {% block title %}
{{ title }} {{ title }}
{% endblock %} {% endblock %}
{% block stylesheets %} {% block stylesheets %}
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=adfdff"> <link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=adfdff">
{% endblock %} {% endblock %}
{% block mainContent %} {% block mainContent %}
<div id="dash-index"> <div id="dash-index">
<div id="dash-index-wrapper"> <div id="dash-index-wrapper">
{% if status %} {% if status %}
{% apply spaceless %} {% apply spaceless %}
{{ include("dash/partials/index.twig") }} {{ include("dash/partials/index.twig") }}
{% endapply %} {% endapply %}
{% else %} {% else %}
{{ include("dash/forms/login.twig") }} {{ include("dash/forms/login.twig") }}
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block javascripts %} {% block javascripts %}
<script src="/assets/scripts/Start.js?=dfdfsdf" type="text/javascript"></script> <script src="/assets/scripts/Start.js?=dfdfsdf" type="text/javascript"></script>
{% endblock %} {% endblock %}

120
content/themes/fipamo-default/frame.twig
View file

@ -13,100 +13,100 @@
{{ title }} {{ title }}
{% endblock %} {% endblock %}
</title> </title>
<meta charset="UTF-8" /> <meta charset="UTF-8"/>
<meta name='viewport' content='width=device-width, initial-scale=1.0' /> <meta name='viewport' content='width=device-width, initial-scale=1.0'/>
<meta name="keywords" content="{{ info['keywords'] }}" /> <meta name="keywords" content="{{ info['keywords'] }}"/>
<meta name="description" content="{{info['description']}} " /> <meta name="description" content="{{info['description']}} "/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta property="og:image" content="{{info["image"]}}" /> <meta property="og:image" content="{{info["image"]}}"/>
<meta name="twitter:image" content="{{info["image"]}}" /> <meta name="twitter:image" content="{{info["image"]}}"/>
<link rel="stylesheet" type="text/css" href="{{ assetPath~"css/base.css?=dfvbghh" }}"> <link rel="stylesheet" type="text/css" href="{{ assetPath~"css/base.css?=dfvbghh" }}">
</head> </head>
<body> <body>
<!-- <!--
<header style="background: url({{ background }}) no-repeat center center; background-size: cover"> <header style="background: url({{ background }}) no-repeat center center; background-size: cover">
--> -->
<header> <header>
<div id="media"> <div id="media">
{% if media|length > 1 %} {% if media|length > 1 %}
{% for item in media %} {% for item in media %}
{% if item.type == "mp4"%} {% if item.type == "mp4"%}
<div id="{{loop.index0}}" class="slide"> <div id="{{loop.index0}}" class="slide">
<video controls autoplay muted> <video controls autoplay muted>
<source src="{{item.file}}" type="video/mp4"> <source src="{{item.file}}" type="video/mp4">
Please get a better browser. They're free. Please get a better browser. They're free.
</video> </video>
</div> </div>
{% else %} {% else %}
<div id="{{loop.index0}}" class="slide hide" style="background: url({{ item.file }}) no-repeat center center / cover"></div> <div id="{{loop.index0}}" class="slide hide" style="background: url({{ item.file }}) no-repeat center center / cover"></div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% if media[0] != '' %} {% if media[0] != '' %}
{% if media[0].type == "mp4"%} {% if media[0].type == "mp4"%}
<div id="0" class="slide"> <div id="0" class="slide">
<video controls autoplay muted> <video controls autoplay muted>
<source src="{{media[0].file}}" type="video/mp4"> <source src="{{media[0].file}}" type="video/mp4">
Please get a better browser. They're free. Please get a better browser. They're free.
</video> </video>
</div> </div>
{% else %} {% else %}
<div id="0" class="slide" style="background: url({{ media[0].file }}) no-repeat center center / cover"></div> <div id="0" class="slide" style="background: url({{ media[0].file }}) no-repeat center center / cover"></div>
{% endif %} {% endif %}
{% else %} {% else %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
<nav> <nav>
{% apply spaceless %} {% apply spaceless %}
<div class="left"> <div class="left">
<a href="/" class="logo-link"> <a href="/" class="logo-link">
<img id="logo" src="{{ assetPath~"/images/global/the-logo.svg" }}" /> <img id="logo" src="{{ assetPath~"/images/global/the-logo.svg" }}"/>
</a> </a>
</div> </div>
<div class="right"> <div class="right">
{% if menu is defined %} {% if menu is defined %}
{% for link in menu %} {% for link in menu %}
{% if dynamicRender is defined %} {% if dynamicRender is defined %}
{% if dynamicRender == 'true' %} {% if dynamicRender == 'true' %}
<a href="{{"/"~link.slug}}" class="menu-link">{{link.title}}</a><br /> <a href="{{"/"~link.slug}}" class="menu-link">{{link.title}}</a><br/>
{% else %}
<a href="{{"/"~link.slug~".html"}}" class="menu-link">{{link.title}}</a><br />
{% endif %}
{% else %} {% else %}
<a href="{{"/"~link.slug~".html"}}" class="menu-link">{{link.title}}</a><br /> <a href="{{"/"~link.slug~".html"}}" class="menu-link">{{link.title}}</a><br/>
{% endif %} {% endif %}
{% endfor %} {% else %}
{% endif %} <a href="{{"/"~link.slug~".html"}}" class="menu-link">{{link.title}}</a><br/>
</div> {% endif %}
{% endfor %}
{% endif %}
</div>
{% endapply %} {% endapply %}
</nav> </nav>
</header> </header>
<div id="main-content" class="container"> <div id="main-content" class="container">
{% apply spaceless %} {% apply spaceless %}
{% block mainContent %}{% endblock %} {% block mainContent %}{% endblock %}
{% endapply %} {% endapply %}
</div> </div>
<footer> <footer>
<div class="inner"> <div class="inner">
{% if dynamicRender is defined %} {% if dynamicRender is defined %}
{% if dynamicRender == 'true' %} {% if dynamicRender == 'true' %}
<a href="/archives">Archives</a><br /> <a href="/archives">Archives</a><br/>
{% else %} {% else %}
<a href="/archives.html">Archives</a><br /> <a href="/archives.html">Archives</a><br/>
{% endif %} {% endif %}
{% else %} {% else %}
<a href="/archives.html">Archives</a><br /> <a href="/archives.html">Archives</a><br/>
{% endif %} {% endif %}
© 2020 By Fipamo © 2020 By Fipamo
</div> </div>
</footer> </footer>
<script src="{{ assetPath~"scripts/ThemeStart.js" }}" type="text/javascript"></script> <script src="{{ assetPath~"scripts/ThemeStart.js" }}" type="text/javascript"></script>
</body> </body>
</html> </html>

89
content/themes/fipamo-default/page.twig
View file

@ -4,56 +4,59 @@
{{ title }} {{ title }}
{% endblock %} {% endblock %}
{% block mainContent %} {% block mainContent %}
<section> <section>
<div class="page-title"> <div class="page-title">
<span>{{title}}</span> <span>{{title}}</span>
</div> </div>
</section> </section>
<article> <article>
<div class="page"> <div class="page">
<p>{{content | raw}}</p> <p>{{content | raw}}</p>
<div> <div>
<div class="page_files"> <div class="page_files">
<div class="page_doc"> <div class="page_doc">
<strong>Files</strong><br/> <strong>Files</strong><br/>
{% for doc in files %} {% for doc in files %}
{% if doc.type != "mp3" %} {% if doc.type != "mp3" %}
{% set path = doc.file|split('/') %} {% set path = doc.file|split('/') %}
<a href="{{doc.file}}">{{path[6]}}</a> <a href="{{doc.file}}">{{path[6]}}</a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<div class="page_sounds"> <div class="page_sounds">
<strong>Sounds</strong><br/> <strong>Sounds</strong><br/>
{% for doc in files %} {% for doc in files %}
{% if doc.type == "mp3" %} {% if doc.type == "mp3" %}
<audio controls> <audio controls>
<source src="{{doc.file}}" type="audio/mpeg"> <source src="{{doc.file}}" type="audio/mpeg">
Your browser does not support the audio element. Your browser does not support the audio element.
</audio> </audio>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div>
</div> </div>
<br/>
{{meta['who']}} dropped this {{ meta['when'] }}<br />
<strong>tags: </strong>
{% for tag in meta['tags'] %}
{% if dynamicRender is defined %}
{% if dynamicRender == 'true' %}
<a href="{{ "/tags/"~tag.slug }}">{{ tag.label }}</a>
{% else %}
<a href="{{ "/tags/"~tag.slug~".html" }}">{{ tag.label }}</a>
{% endif %}
{% else %}
<a href="{{ "/tags/"~tag.slug~".html" }}">{{ tag.label }}</a>
{% endif %}
{% endfor %}
</div> </div>
<br/>
{{meta['who']}}
dropped this
{{ meta['when'] }}<br/>
<strong>tags:
</strong>
{% for tag in meta['tags'] %}
{% if dynamicRender is defined %}
{% if dynamicRender == 'true' %}
<a href="{{ "/tags/"~tag.slug }}">{{ tag.label }}</a>
{% else %}
<a href="{{ "/tags/"~tag.slug~".html" }}">{{ tag.label }}</a>
{% endif %}
{% else %}
<a href="{{ "/tags/"~tag.slug~".html" }}">{{ tag.label }}</a>
{% endif %}
{% endfor %}
</div> </div>
</article> </div>
{% endblock %} </article>
{% endblock %}

156
phpcs.xml Normal file
View file

@ -0,0 +1,156 @@
<?xml version="1.0"?>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
<description>The coding standard for PHP_CodeSniffer itself.</description>
<file>autoload.php</file>
<file>bin</file>
<file>scripts</file>
<file>src</file>
<file>tests</file>
<exclude-pattern>*/src/Standards/*/Tests/*\.(inc|css|js)$</exclude-pattern>
<exclude-pattern>*/tests/Core/*/*\.(inc|css|js)$</exclude-pattern>
<arg name="basepath" value="."/>
<arg name="colors"/>
<arg name="parallel" value="75"/>
<arg value="np"/>
<!-- Don't hide tokenizer exceptions -->
<rule ref="Internal.Tokenizer.Exception">
<type>error</type>
</rule>
<!-- Include the whole PEAR standard -->
<rule ref="PEAR">
<exclude name="PEAR.NamingConventions.ValidFunctionName"/>
<exclude name="PEAR.NamingConventions.ValidVariableName"/>
<exclude name="PEAR.Commenting.ClassComment"/>
<exclude name="PEAR.Commenting.FileComment.MissingCategoryTag"/>
<exclude name="PEAR.Commenting.FileComment.MissingPackageTag"/>
<exclude name="PEAR.Commenting.FileComment.MissingLinkTag"/>
<exclude name="PEAR.Commenting.FileComment.MissingVersion"/>
<exclude name="PEAR.Commenting.InlineComment"/>
</rule>
<!-- Include some sniffs from other standards that don't conflict with PEAR -->
<rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
<rule ref="Squiz.Arrays.ArrayDeclaration"/>
<rule ref="Squiz.Commenting.ClosingDeclarationComment"/>
<rule ref="Squiz.ControlStructures.ControlSignature"/>
<rule ref="Squiz.ControlStructures.ElseIfDeclaration"/>
<rule ref="Squiz.Commenting.BlockComment"/>
<rule ref="Squiz.Commenting.DocCommentAlignment"/>
<rule ref="Squiz.Commenting.EmptyCatchComment"/>
<rule ref="Squiz.Commenting.InlineComment"/>
<rule ref="Squiz.Commenting.LongConditionClosingComment"/>
<rule ref="Squiz.Commenting.PostStatementComment"/>
<rule ref="Squiz.Commenting.VariableComment"/>
<rule ref="Squiz.Formatting.OperatorBracket"/>
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing"/>
<rule ref="Squiz.Operators.ComparisonOperatorUsage"/>
<rule ref="Squiz.PHP.DisallowInlineIf"/>
<rule ref="Squiz.Scope.MethodScope"/>
<rule ref="Squiz.Strings.ConcatenationSpacing">
<severity>0</severity>
</rule>
<rule ref="Squiz.WhiteSpace.ControlStructureSpacing"/>
<rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace"/>
<rule ref="Squiz.WhiteSpace.FunctionSpacing"/>
<rule ref="Squiz.WhiteSpace.MemberVarSpacing"/>
<rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
<rule ref="Generic.Commenting.Todo"/>
<rule ref="Generic.ControlStructures.DisallowYodaConditions"/>
<rule ref="Generic.ControlStructures.InlineControlStructure"/>
<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
<rule ref="Generic.Formatting.SpaceAfterCast"/>
<rule ref="Generic.NamingConventions.ConstructorName"/>
<rule ref="Generic.PHP.DeprecatedFunctions"/>
<rule ref="Generic.PHP.LowerCaseKeyword"/>
<rule ref="Generic.Strings.UnnecessaryStringConcat"/>
<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
<rule ref="PSR2.Classes.PropertyDeclaration"/>
<rule ref="PSR2.Methods.MethodDeclaration"/>
<rule ref="PSR2.Files.EndFileNewline"/>
<rule ref="PSR12.Files.OpenTag"/>
<rule ref="Zend.Files.ClosingTag"/>
<!-- PEAR uses warnings for inline control structures, so switch back to errors -->
<rule ref="Generic.ControlStructures.InlineControlStructure">
<properties>
<property name="error" value="true"/>
</properties>
</rule>
<!-- We use custom indent rules for arrays -->
<rule ref="Generic.Arrays.ArrayIndent"/>
<rule ref="Squiz.Arrays.ArrayDeclaration.KeyNotAligned">
<severity>0</severity>
</rule>
<rule ref="Squiz.Arrays.ArrayDeclaration.ValueNotAligned">
<severity>0</severity>
</rule>
<rule ref="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned">
<severity>0</severity>
</rule>
<rule ref="Squiz.Arrays.ArrayDeclaration.CloseBraceNewLine">
<severity>0</severity>
</rule>
<!-- Check var names, but we don't want leading underscores for private vars -->
<rule ref="Squiz.NamingConventions.ValidVariableName"/>
<rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore">
<severity>0</severity>
</rule>
<!-- Only one argument per line in multi-line function calls -->
<rule ref="PEAR.Functions.FunctionCallSignature">
<properties>
<property name="allowMultipleArguments" value="false"/>
</properties>
</rule>
<!-- Have 12 chars padding maximum and always show as errors -->
<rule ref="Generic.Formatting.MultipleStatementAlignment">
<properties>
<property name="maxPadding" value="12"/>
<property name="error" value="true"/>
</properties>
</rule>
<!-- Ban some functions -->
<rule ref="Generic.PHP.ForbiddenFunctions">
<properties>
<property name="forbiddenFunctions" type="array">
<element key="sizeof" value="count"/>
<element key="delete" value="unset"/>
<element key="print" value="echo"/>
<element key="is_null" value="null"/>
<element key="create_function" value="null"/>
</property>
</properties>
</rule>
<!-- Private methods MUST not be prefixed with an underscore -->
<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
<type>error</type>
</rule>
<!-- Private properties MUST not be prefixed with an underscore -->
<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
<type>error</type>
</rule>
<!-- The testing bootstrap file uses string concats to stop IDEs seeing the class aliases -->
<rule ref="Generic.Strings.UnnecessaryStringConcat">
<exclude-pattern>tests/bootstrap\.php</exclude-pattern>
</rule>
<!-- This test file specifically *needs* Windows line endings for testing purposes. -->
<rule ref="Generic.Files.LineEndings.InvalidEOLChar">
<exclude-pattern>tests/Core/Tokenizer/StableCommentWhitespaceWinTest\.php</exclude-pattern>
</rule>
</ruleset>