.gitignore

@@ -22,10 +22,6 @@ public/assets/scripts/*
 
 =======
 !public/assets/scripts/dash.js
-<<<<<<< HEAD
->>>>>>> develop
-=======
-!public/assets/scripts/dash.js.map
 >>>>>>> develop
 !public/assets/images
 public/assets/images/*
@@ -55,4 +51,3 @@ config.codekit3
 src/com/*
 src/styles/*
 
-src/com/ui/TextEditor.js

brain/api/v1/SettingsAPI.php

@@ -38,7 +38,6 @@ class SettingsAPI
                 } else {
                     $render = new Render();
                     if (isset($themeConfig['render'])) {
-                        //rendering for one page sites
                         if (!$themeConfig['render'] || $themeConfig['render'] === 'false') {
                             $render->renderIndex();
                             $result = [

brain/controller/DashControl.php

@@ -120,14 +120,9 @@ class DashControl
                                 } else {
                                     $views = (new Themes())->getCustomViews();
                                 }
-                                $imageList = [];
+
-                                $fileList  = [];
+                                $imageList = explode(',', $page['feature']);
-                                if (isset($page['feature'])) {
+                                $fileList  = explode(',', $page['files']);
-                                    $imageList = explode(',', $page['feature']);
-                                }
-                                if (isset($page['files'])) {
-                                    $fileList = explode(',', $page['files']);
-                                }
 
                                 $images = [];
                                 $files  = [];

brain/data/Contents.php

@@ -108,14 +108,10 @@ class Contents
             ];
 
             $sanitizer = $builder->build($detergent);
-            $scrubbed  = $sanitizer->sanitize($result->getContent());
-            if (isset($meta['feature'])) {
-                $featureList = explode(',', $meta['feature']);
-            } else {
-                $featureList = "";
-            }
 
-            $docs = '';
+            $scrubbed    = $sanitizer->sanitize($result->getContent());
+            $featureList = explode(',', $meta['feature']);
+            $docs        = '';
             if (isset($meta['files'])) {
                 $fileList = explode(',', $meta['files']);
                 $docs     = $meta['files'];
@@ -126,23 +122,19 @@ class Contents
 
             $media = [];
             $files = [];
-            if ($featureList != '') {
+            foreach ($featureList as $file) {
-                foreach ($featureList as $file) {
+                $item = trim($file);
-                    $item = trim($file);
+                $ext  = pathinfo($item, PATHINFO_EXTENSION);
-                    $ext  = pathinfo($item, PATHINFO_EXTENSION);
+                if ($item != null || $item != '') {
-                    if ($item != null || $item != '') {
+                    array_push($media, ['file' => $item, 'type' => trim($ext)]);
-                        array_push($media, ['file' => $item, 'type' => trim($ext)]);
-                    }
                 }
             }
 
-            if ($fileList != "") {
+            foreach ($fileList as $file) {
-                foreach ($fileList as $file) {
+                $item = trim($file);
-                    $item = trim($file);
+                $ext  = pathinfo($item, PATHINFO_EXTENSION);
-                    $ext  = pathinfo($item, PATHINFO_EXTENSION);
+                if ($item != null || $item != '') {
-                    if ($item != null || $item != '') {
+                    array_push($files, ['file' => $item, 'type' => trim($ext)]);
-                        array_push($files, ['file' => $item, 'type' => trim($ext)]);
-                    }
                 }
             }
 

brain/data/Render.php

@@ -136,7 +136,6 @@ class Render
             'archives'   => $archive,
             'info'       => $this->pageInfo,
             'menu'       => $this->menu,
-            'media'      => [['file' => $this->pageInfo['image'], 'type' => trim(pathinfo($this->pageInfo['image'], PATHINFO_EXTENSION))]],
         ];
 
         $html     = $this->twig->render($template, $pageOptions);
@@ -155,7 +154,6 @@ class Render
                 'tag_list'   => $item['pages'],
                 'info'       => $this->pageInfo,
                 'menu'       => $this->menu,
-                'media'      => [['file' => $this->pageInfo['image'], 'type' => trim(pathinfo($this->pageInfo['image'], PATHINFO_EXTENSION))]],
             ];
 
             $html = $this->twig->render($template, $pageOptions);

brain/utility/Setup.php

@@ -57,8 +57,8 @@ class SetUp
             'id'        => 1,
             'uuid'      => StringTools::createUUID(),
             'title'     => 'FIRST!',
-            'imageList' => '/assets/images/global/default-bg.jpg',
+            'feature'   => '/assets/images/global/default-bg.jpg',
-            'fileList'  => '',
+            'files'     => '',
             'path'      => 'content/pages/start',
             'layout'    => 'index',
             'tags'      => 'start, welcome',

brain/utility/Sorting.php

@@ -23,17 +23,15 @@ class Sorting
         $pages = (new Book('../content/pages'))->getContents();
         foreach ($pages as $page) {
             $temp = [];
-            if (isset($page['tags'])) {
+            $temp = explode(',', $page['tags']);
-                $temp = explode(',', $page['tags']);
+            foreach ($temp as $tag) {
-                foreach ($temp as $tag) {
+                $label = trim($tag);
-                    $label = trim($tag);
+                if (!find(self::$p_tags, ['tag_name' => $label])) {
-                    if (!find(self::$p_tags, ['tag_name' => $label])) {
+                    array_push(self::$p_tags, [
-                        array_push(self::$p_tags, [
+                        'tag_name' => $label,
-                            'tag_name' => $label,
+                        'slug'     => StringTools::safeString($label),
-                            'slug'     => StringTools::safeString($label),
+                        'pages'    => self::tagPages($label, $pages),
-                            'pages'    => self::tagPages($label, $pages),
+                    ]);
-                        ]);
-                    }
                 }
             }
         }
@@ -45,15 +43,13 @@ class Sorting
     {
         $tagged = [];
         foreach ($pages as $page) {
-            if (isset($page['tags'])) {
+            if (strpos($page['tags'], $tag) !== false) {
-                if (strpos($page['tags'], $tag) !== false) {
+                array_push($tagged, [
-                    array_push($tagged, [
+                    'title'   => $page['title'],
-                        'title'   => $page['title'],
+                    'slug'    => $page['slug'],
-                        'slug'    => $page['slug'],
+                    'path'    => $page['path'],
-                        'path'    => $page['path'],
+                    'feature' => $page['feature'],
-                        'feature' => $page['feature'],
+                ]);
-                    ]);
-                }
             }
         }
 
@@ -128,16 +124,15 @@ class Sorting
             'image'       => $settings['global']['base_url'] . $settings['global']['background'],
             'baseURL'     => $settings['global']['base_url'],
         ];
-        $tags = [];
+
-        if (isset($page['tags'])) {
+        $taglist = explode(',', $page['tags']);
-            $taglist = explode(',', $page['tags']);
+        $tags    = [];
-            foreach ($taglist as $tag) {
+        foreach ($taglist as $tag) {
-                $label = trim($tag);
+            $label = trim($tag);
-                array_push($tags, [
+            array_push($tags, [
-                    'label' => $label . ' ',
+                'label' => $label . ' ',
-                    'slug'  => StringTools::safeString($label),
+                'slug'  => StringTools::safeString($label),
-                ]);
+            ]);
-            }
         }
 
         $meta = [

brain/views/dash/_frame.twig

@@ -3,7 +3,6 @@
 	<head>
 		<meta charset="UTF-8">
 		<meta name="theme-color" content="#FFFFFF"/>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<title>
 			{% block title %}
 				{{ title }}

brain/views/dash/book.twig

@@ -51,7 +51,7 @@
 							</a>
 						{% else %}
 							<a class="page-link" href="/dashboard/page/edit/{{ page.uuid }}">
-								<div class="page-bg" style="background: url({{ page.media[0].file }}) no-repeat center center / cover #fc6399">
+								<div class="page-bg" style="background: url({{ page.media[0].file }}) no-repeat center center / cover">
 									<div id="meta">
 										{{ include("dash/partials/recent-meta.twig") }}
 									</div>

brain/views/dash/forms/init-fresh.twig

@@ -3,7 +3,7 @@
 		<img id="the-logo" src="/assets/images/global/fipamo-logo.svg"/>
 	</a>
 </div>
-<form id="init-form" method="POST" onsubmit="return false;">
+<form id="init-form" method="POST">
 	<input type="text" name="new_member_handle" id="new_member_handle" placeholder="handle"/>
 	<input type="text" name="new_member_email" id="new_member_email" placeholder="email"/>
 	<input type="text" name="new_member_pass" id="new_member_pass" placeholder="password"/>

brain/views/dash/partials/editor.twig

@@ -1,38 +1,38 @@
 <div role="text-editor-control">
 	<button id="edit-bold" class="content-editor-btn-text editor-button" title="bold">
-		<i id="edit-bold" class="ti ti-bold"></i>
+		<i class="ti ti-bold"></i>
 	</button>
 	<button id="edit-italic" class="content-editor-btn-text editor-button" title="italic">
-		<i id="edit-italic" class="ti ti-italic"></i>
+		<i class="ti ti-italic"></i>
 	</button>
 	<button id="edit-strikethrough" class="content-editor-btn-text editor-button" title="strikethrough">
-		<i id="edit-strikethrough" class="ti ti-strikethrough"></i>
+		<i class="ti ti-strikethrough"></i>
 	</button>
 	<button id="edit-link" class="content-editor-btn-icon editor-button" title="insert link">
-		<i id="edit-link" class="ti ti-link"></i>
+		<i class="ti ti-link"></i>
 	</button>
 	<button id="edit-header1" class="content-editor-btn-text editor-button" title="header 1">
-		<i id="edit-header1" class="ti ti-h-1"></i>
+		<i class="ti ti-h-1"></i>
 	</button>
 	<button id="edit-header2" class="content-editor-btn-text editor-button" title="header 2">
-		<i id="edit-header2" class="ti ti-h-2"></i>
+		<i class="ti ti-h-2"></i>
 	</button>
 	<button id="edit-header3" class="content-editor-btn-text editor-button" title="header 3">
-		<i id="edit-header3" class="ti ti-h-3"></i>
+		<i class="ti ti-h-3"></i>
 	</button>
 	<button id="edit-image" class="content-editor-btn-icon editor-button" title="insert image">
-		<i id="edit-image" class="ti ti-photo"></i>
+		<i class="ti ti-photo"></i>
 	</button>
 	{% if mode == "edit" %}
 		<button id="edit-update" class="post-sumbit-btn submit-start editor-button" data-action='blog-update' data-id="{{ page['uuid'] }} type='submit' title=" bold">
-			<i id="edit-update" class="ti ti-device-floppy"></i>
+			<i class="ti ti-device-floppy"></i>
 		</button>
 		<button id="edit-delete" class="content-editor-btn-icon editor-button submit-delete" for="post-delete" title='delete post'>
-			<i id="edit-delete" class="ti ti-x"></i>
+			<i class="ti ti-x"></i>
 		</button>
 	{% else %}
 		<button id="edit-save" class="post-sumbit-btn submit-start editor-button" data-action='blog-add' type='submit'>
-			<i id="edit-save" class="ti ti-file-plus"></i>
+			<i class="ti ti-file-plus"></i>
 		</button>
 	{% endif %}
 </div>

brain/views/dash/partials/index.twig

@@ -18,7 +18,7 @@
 					</a>
 
 				{% else %}
-					<a href="/dashboard/page/edit/{{ page.uuid }}" id="{{ page.uuid }}" class="post-link recent-link" style="background: url({{ page.media[0].file }}) no-repeat center center / cover #fc6399">
+					<a href="/dashboard/page/edit/{{ page.uuid }}" id="{{ page.uuid }}" class="post-link recent-link" style="background: url({{ page.media[0].file }}) no-repeat center center / cover">
 						{{ include("dash/partials/recent-meta.twig") }}
 					</a>
 				{% endif %}

brain/views/dash/settings.twig

@@ -109,6 +109,7 @@
 						<i class="ti ti-mailbox"></i>
 						<span>TEST MAIL</span>
 					</button>
+					<br/><br/>
 				</div>
 				<div>
 					<label>API KEY</label>

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "are0h/fipamo",
   "descriptions": "The most chill no database blog framework ever.",
-  "version": "2.6.1-beta",
+  "version": "2.5.1-beta",
   "homepage": "https://fipamo.blog",
   "authors": [
     {
@@ -10,9 +10,9 @@
     }
   ],
   "support": {
-    "source": "https://koodu.ubiqueros.com/are0h/Fipamo",
+    "source": "https://code.playvicio.us/Are0h/Fipamo",
-    "wiki": "https://koodu.ubiqueros.com/are0h/Fipamo/wiki/?action=_pages",
+    "wiki": "https://code.playvicio.us/Are0h/Fipamo/wiki/_pages",
-    "issues": "https://koodu.ubiqueros.com/are0h/Fipamo/issues"
+    "issues": "https://code.playvicio.us/Are0h/Fipamo/issues"
   },
   "require": {
     "slim/slim": "4.*",
@@ -28,10 +28,5 @@
     "symfony/yaml": "^5.4",
     "olegatro/html-sanitizer-relative": "^1.0",
     "nesbot/carbon": "^2.62"
-  },
+  }
-  "scripts": {
-	  "start": [
-		"@php -S localhost:8000 -t public/"
-	  ]
-	}
 }

package.json

@@ -1,13 +1,13 @@
 {
 	"name": "fipamo-dash",
-	"version": "2.6.1-beta",
+	"version": "2.6.0-beta",
 	"private": true,
 	"apidoc": {
 		"name": "Fipamo API",
 		"version": "1.0.0",
 		"description": "The most chill API for the most chill blog framework"
 	},
-	"source": "src/com/Start.js",
+	"source": "src/com/start.js",
 	"main": "public/assets/scripts/dash.js",
 	"targets": {
 		"main": {

public/assets/css/dash/book.css

@@ -80,13 +80,20 @@ section[role="book-index-pages"] hr {
 
 section[role="book-index-pages"] button[data-active="true"] {
   background: var(--primary);
-  color: var(--tertiary);
+}
+
+section[role="book-index-pages"] button[data-active="true"] svg {
+  fill: var(--tertiary);
 }
 
 section[role="book-index-pages"] button[data-active="false"] {
   background: var(--secondary);
 }
 
+section[role="book-index-pages"] button[data-active="false"] svg {
+  fill: var(--primary);
+}
+
 section[role="book-index-pages"] > div[role="paginate"] {
   width: fit-content;
   margin: 0 auto;

public/assets/css/dash/frame.css

@@ -31,11 +31,6 @@ sup {
   border-radius: 3px;
 }
 
-::selection {
-  background: var(--highlight);
-  color: var(--white);
-}
-
 #notifications {
   display: none;
   visibility: hidden;
@@ -98,7 +93,6 @@ header > nav > div > div[role="mobile-menu"] {
   z-index: 1000;
   left: 0;
   transition: all 0.2s linear;
-  background: var(--white);
 }
 
 header > nav > div[role="nav-right"] button {

public/assets/css/dash/page-editor.css

@@ -304,13 +304,6 @@ main > section[role="text-editor"] > div[role="text-editor-control"] {
   grid-template-columns: repeat(10, 1fr);
 }
 
-.control-freeze {
-  position: fixed;
-  z-index: 300;
-  width: 97%;
-  top: 65px;
-}
-
 main > section[role="text-editor"] > div[role="edit-post-wrapper"] {
   width: 100%;
   max-width: 900px;

public/assets/css/dash/settings.css

@@ -26,6 +26,10 @@ section[role="member-settings"] {
   margin: 10px auto;
 }
 
+section[role="member-settings"] {
+  width: 100%;
+}
+
 section[role="member-settings"] > div:nth-child(1) {
   grid-column: 1/2;
   grid-row: 1/3;
@@ -81,13 +85,13 @@ section[role="member-settings"] div input[type="file"] {
 }
 
 section[role="member-settings"] div input[type="text"] {
-  width: 98.4%;
+  width: 100%;
   height: 40px;
   margin-bottom: 10px;
 }
 
 section[role="member-settings"] div textarea {
-  width: 98.4%;
+  width: 99%;
   height: 63%;
 }
 
@@ -159,9 +163,9 @@ section[role="member-settings"] > div[role="mail"] div[data-enabled="false"] {
 }
 
 section[role="member-settings"] > div[role="mail"] input {
-  width: 98.4%;
+  width: 96%;
-  height: 40px;
+  height: 30px;
-  padding-left: 5px;
+  padding: 5px;
   margin-bottom: 10px;
 }
 
@@ -173,29 +177,19 @@ section[role="data-settings"] {
   main > article[role="settings"] {
     width: 97%;
   }
+
+  main > article[role="settings"] > section[role="member-settings"] {
+    width: 97.5%;
+  }
 }
 
 @media only screen and (max-width: 650px) {
-  section[role="member-settings"] div input[type="text"] {
-    width: 99.3%;
-    height: 40px;
-    margin-bottom: 10px;
-  }
-
   section[role="member-settings"] {
     grid-template-columns: 1fr 1fr;
   }
 
-  section[role="member-settings"] > div[role="mail"] input {
-    width: 97.7%;
-    height: 40px;
-    padding-left: 5px;
-    margin-bottom: 10px;
-  }
-
   section[role="member-settings"] div textarea {
     height: 80px;
-    width: 99.3%;
   }
 
   section[role="member-settings"] > div:nth-child(1) {
@@ -237,12 +231,8 @@ section[role="data-settings"] {
 }
 
 @media only screen and (max-width: 530px) {
-  section[role="member-settings"] > div[role="mail"] input {
-    width: 98.5%;
-  }
-
   section[role="member-settings"] {
-    grid-template-columns: 100%;
+    grid-template-columns: 1fr;
   }
 
   section[role="member-settings"] div textarea {
@@ -256,8 +246,6 @@ section[role="data-settings"] {
 
   section[role="member-settings"] > div:nth-child(2) {
     grid-row: 3/5;
-    grid-column: 1;
-    height: 200px;
   }
 
   section[role="member-settings"] > div:nth-child(3) {
@@ -270,6 +258,6 @@ section[role="data-settings"] {
   section[role="member-settings"] > div:nth-child(6),
   section[role="member-settings"] > div:nth-child(7),
   section[role="member-settings"] > div:nth-child(8) {
-    grid-column: 1;
+    grid-column: 1/3;
   }
 }

public/assets/scripts/dash.js

@@ -405,7 +405,7 @@ const $7e781a188206b2b3$export$d46ee33f41c7e43d = "apiUseNotAuthorized";
    * @property {string} new_member_title - title for new user
    */ create(data) {
         return new Promise((resolve, reject)=>{
-            this._request($7e781a188206b2b3$export$6010ab8005eea11c, null, $7e781a188206b2b3$export$2fb4d35b5b0eebb2, $7e781a188206b2b3$export$1470a914435ca933, $7e781a188206b2b3$export$e133232680a85c80, data).then((result)=>{
+            this._request($7e781a188206b2b3$export$6010ab8005eea11c, $7e781a188206b2b3$export$2fb4d35b5b0eebb2, $7e781a188206b2b3$export$1470a914435ca933, $7e781a188206b2b3$export$e133232680a85c80, data).then((result)=>{
                 resolve(result);
             }).catch((err)=>{
                 reject(err);
@@ -426,7 +426,7 @@ const $7e781a188206b2b3$export$d46ee33f41c7e43d = "apiUseNotAuthorized";
             method = $7e781a188206b2b3$export$1470a914435ca933;
             type = $7e781a188206b2b3$export$d1a86f208bdcebe5;
             data = new FormData(form);
-            this._request(url, null, event, method, type, data).then((result)=>{
+            this._request(url, event, method, type, data).then((result)=>{
                 resolve(result);
             }).catch((err)=>{
                 reject(err);
@@ -2358,15 +2358,6 @@ class $e6c02983873e6cdf$var$TextEditor extends (0, $68b475f2a0292491$export$2e2b
     //--------------------------
     constructor(textEditor, scrollLimit){
         super();
-        document.querySelector('[role="text-editor-control"]').addEventListener("scroll", (e)=>{
-            console.log("HERE");
-        });
-        document.body.addEventListener("scroll", (e)=>{
-            var fixLimit = scrollLimit;
-            console.log("POSITION", document.body.scrollTop + " : " + fixLimit);
-            if (document.body.scrollTop + 5 >= fixLimit) document.querySelector('[role="text-editor-control"]').classList.add("control-freeze");
-            else document.querySelector('[role="text-editor-control"]').classList.remove("control-freeze");
-        });
         document.getElementById("edit").addEventListener("input", (e)=>{
             let result_element = document.querySelector("#highlight-content");
             this.textEditor = textEditor;
@@ -2387,7 +2378,12 @@ class $e6c02983873e6cdf$var$TextEditor extends (0, $68b475f2a0292491$export$2e2b
         });
         document.getElementById("edit").dispatchEvent(new Event("input"));
         this.setInputs();
-    //freeze editor formatting so it doesn't scroll off screen
+        //freeze editor formatting so it doesn't scroll off screen
+        window.addEventListener("scroll", ()=>{
+            var fixLimit = scrollLimit;
+            if (window.pageYOffset + 5 >= fixLimit) document.getElementById("edit-control").style.position = "fixed";
+            else document.getElementById("edit-control").style.position = "relative";
+        });
     }
     //--------------------------
     // methods
@@ -7322,17 +7318,17 @@ class $5ec7c34d3cbf8bc6$export$2e2bcd8739ae039 {
         mm.create(setUpForm).then((response)=>{
             if (response.type === $995f55a4eccd256d$export$74a5c30fa9753d80) {
                 self.processing = false;
-                e.target.innerHTML = response.message;
+                $5ec7c34d3cbf8bc6$var$notify.alert(response.message, false);
             } else {
                 self.processing = false;
-                e.target.innerHTML = response.message;
+                $5ec7c34d3cbf8bc6$var$notify.alert(response.message, true);
                 setTimeout(()=>{
                     window.location = "/dashboard";
                 }, 700);
             }
         }).catch((err)=>{
             self.processing = false;
-        //notify.alert(err, false);
+            $5ec7c34d3cbf8bc6$var$notify.alert(err, false);
         });
     }
     handleRestore(e) {
@@ -7346,17 +7342,17 @@ class $5ec7c34d3cbf8bc6$export$2e2bcd8739ae039 {
         mm.restore(form).then((response)=>{
             if (response.type === $995f55a4eccd256d$export$f99ec790401d28da) {
                 self.processing = false;
-                e.target.innerHTML = response.message;
+                $5ec7c34d3cbf8bc6$var$notify.alert(response.message, false);
             } else {
                 self.processing = false;
-                e.target.innerHTML = response.message;
+                $5ec7c34d3cbf8bc6$var$notify.alert(response.message, true);
                 setTimeout(()=>{
                     window.location = "/dashboard";
                 }, 1500);
             }
         }).catch((err)=>{
             self.processing = false;
-            e.target.innerHTML = err;
+            $5ec7c34d3cbf8bc6$var$notify.alert(err, false);
         });
     }
     handleReset(e) {