diff --git a/brain/data/Render.inc.php b/brain/data/Render.inc.php index 51ed995..7098f1d 100644 --- a/brain/data/Render.inc.php +++ b/brain/data/Render.inc.php @@ -15,6 +15,7 @@ class Render $this->twig = new \Twig\Environment($this->loader, []); $settings = $config->getSettings(); $this->menu = $settings["menu"]; + $this->theme = $settings["global"]["theme"]; $this->pageInfo = [ "keywords" => isset($settings["global"]["keywords"]) ? $settings["global"]["keywords"] @@ -22,6 +23,21 @@ class Render "description" => $settings["global"]["descriptions"], "image" => $settings["global"]["background"], ]; + //copy current theme assets to public + if (is_file("../public/assets/css/base.css")) { + unlink("../public/assets/css/base.css"); + } + copy( + "../content/themes/" . $this->theme . "/assets/css/base.css", + "../public/assets/css/base.css" + ); + if (is_file("../public/assets/scripts/start.min.js")) { + unlink("../public/assets/scripts/start.min.js"); + } + copy( + "../content/themes/" . $this->theme . "/assets/scripts/start.min.js", + "../public/assets/scripts/start.min.js" + ); } public function renderPages() @@ -104,7 +120,7 @@ class Render //$cleaned = html_entity_decode($cleaned, ENT_QUOTES, "UTF-8"); if ($page["layout"] == "index") { - $template = "fipamo-default/index.twig"; + $template = $this->theme . "/index.twig"; $location = "../public/index.html"; $dir = null; @@ -119,7 +135,7 @@ class Render "menu" => $this->menu, ]; } else { - $template = "fipamo-default/page.twig"; + $template = $this->theme . "/page.twig"; $location = "../public/" . $page["path"] . "/" . $page["slug"] . ".html"; $dir = "../public/" . $page["path"]; @@ -142,7 +158,7 @@ class Render public function renderArchive() { $archive = Sorting::archive(); - $template = "fipamo-default/archive.twig"; + $template = $this->theme . "/archive.twig"; $pageOptions = [ "title" => "Archive", "background" => $this->pageInfo["image"], @@ -160,7 +176,7 @@ class Render { $list = Sorting::tags(); foreach ($list as $item) { - $template = "fipamo-default/tags.twig"; + $template = $this->theme . "/tags.twig"; $pageOptions = [ "title" => "Pages Tagged as " . $item["tag_name"], "background" => $this->pageInfo["image"], diff --git a/brain/views/dash/settings.twig b/brain/views/dash/settings.twig index 79a91e2..6a5401a 100644 --- a/brain/views/dash/settings.twig +++ b/brain/views/dash/settings.twig @@ -69,8 +69,6 @@ {% else %} span No back ups. Frowny face. {% endif %} - -

diff --git a/content/themes/fipamo-default/assets/scripts/start.min.js b/content/themes/fipamo-default/assets/scripts/start.min.js index b108df7..a6af2c0 100644 --- a/content/themes/fipamo-default/assets/scripts/start.min.js +++ b/content/themes/fipamo-default/assets/scripts/start.min.js @@ -1,376 +1,2 @@ -// modules are defined as an array -// [ module function, map of requires ] -// -// map of requires is short require name -> numeric require -// -// anything defined in a previous bundle is accessed via the -// orig method which is the require for previous bundles -parcelRequire = (function (modules, cache, entry, globalName) { - // Save the require from previous bundle to this closure if any - var previousRequire = typeof parcelRequire === 'function' && parcelRequire; - var nodeRequire = typeof require === 'function' && require; - - function newRequire(name, jumped) { - if (!cache[name]) { - if (!modules[name]) { - // if we cannot find the module within our internal map or - // cache jump to the current global require ie. the last bundle - // that was added to the page. - var currentRequire = typeof parcelRequire === 'function' && parcelRequire; - if (!jumped && currentRequire) { - return currentRequire(name, true); - } - - // If there are other bundles on this page the require from the - // previous one is saved to 'previousRequire'. Repeat this as - // many times as there are bundles until the module is found or - // we exhaust the require chain. - if (previousRequire) { - return previousRequire(name, true); - } - - // Try the node require function if it exists. - if (nodeRequire && typeof name === 'string') { - return nodeRequire(name); - } - - var err = new Error('Cannot find module \'' + name + '\''); - err.code = 'MODULE_NOT_FOUND'; - throw err; - } - - localRequire.resolve = resolve; - localRequire.cache = {}; - - var module = cache[name] = new newRequire.Module(name); - - modules[name][0].call(module.exports, localRequire, module, module.exports, this); - } - - return cache[name].exports; - - function localRequire(x){ - return newRequire(localRequire.resolve(x)); - } - - function resolve(x){ - return modules[name][1][x] || x; - } - } - - function Module(moduleName) { - this.id = moduleName; - this.bundle = newRequire; - this.exports = {}; - } - - newRequire.isParcelRequire = true; - newRequire.Module = Module; - newRequire.modules = modules; - newRequire.cache = cache; - newRequire.parent = previousRequire; - newRequire.register = function (id, exports) { - modules[id] = [function (require, module) { - module.exports = exports; - }, {}]; - }; - - var error; - for (var i = 0; i < entry.length; i++) { - try { - newRequire(entry[i]); - } catch (e) { - // Save first error but execute all entries - if (!error) { - error = e; - } - } - } - - if (entry.length) { - // Expose entry point to Node, AMD or browser globals - // Based on https://github.com/ForbesLindesay/umd/blob/master/template.js - var mainExports = newRequire(entry[entry.length - 1]); - - // CommonJS - if (typeof exports === "object" && typeof module !== "undefined") { - module.exports = mainExports; - - // RequireJS - } else if (typeof define === "function" && define.amd) { - define(function () { - return mainExports; - }); - - //