From a70bb7b2b03a8786f1bf3f0abde3af5b3e43a8b2 Mon Sep 17 00:00:00 2001 From: are0h Date: Thu, 6 Apr 2023 20:07:02 -0700 Subject: [PATCH] Theme folder clean up Cleaned up the themes folder since it did not need the additional folder depth to manage bundled scripts anymore. Updated the theme engine accordingly. --- .gitignore | 10 ++--- engine/StartKit.php | 5 +-- engine/ThemeEngine.php | 37 +++++++++--------- .../fipamo-default/archive.twig | 0 .../fipamo-default/assets/css/color.css | 0 .../fipamo-default/assets/css/frame.css | 0 .../fipamo-default/assets/css/start.css | 0 .../fipamo-default/assets/css/typography.css | 0 .../assets/images/global/default-avi.png | Bin .../assets/images/global/default-bg.jpg | Bin .../assets/images/global/sprite.svg | 0 .../assets/images/global/the-logo.svg | 0 .../fipamo-default/assets/scripts/Base.js | 0 .../assets/scripts/ThemeStart.js | 0 .../fipamo-default/error.twig | 0 .../fipamo-default/frame.twig | 2 +- .../fipamo-default/index.twig | 0 .../fipamo-default/page.twig | 0 .../fipamo-default/tags.twig | 0 .../fipamo-default/theme.json | 0 20 files changed, 24 insertions(+), 30 deletions(-) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/archive.twig (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/css/color.css (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/css/frame.css (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/css/start.css (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/css/typography.css (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/images/global/default-avi.png (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/images/global/default-bg.jpg (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/images/global/sprite.svg (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/images/global/the-logo.svg (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/scripts/Base.js (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/assets/scripts/ThemeStart.js (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/error.twig (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/frame.twig (98%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/index.twig (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/page.twig (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/tags.twig (100%) rename {src/themes/theme-fipamo-default => themes}/fipamo-default/theme.json (100%) diff --git a/.gitignore b/.gitignore index 5bbe720..3e3daec 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,8 @@ dist assets vendor -!src/ -src/* -!src/themes -src/themes/* -!src/themes/theme-fipamo-default -!src/themes/theme-fipamo-default/fipamo-default/assets +!themes +themes/* +!themes/fipamo-default +!themes/fipamo-default/assets config.json \ No newline at end of file diff --git a/engine/StartKit.php b/engine/StartKit.php index fd87fbb..4ad170b 100644 --- a/engine/StartKit.php +++ b/engine/StartKit.php @@ -8,9 +8,6 @@ class StartKit { $config = json_decode(file_get_contents("./config.json"), true); $theme = $config["current_theme"]; - new ThemeEngine( - "src/themes/theme-" . $theme, - "/src/themes/theme-" . $theme . "/" . $theme - ); + new ThemeEngine("themes/" . $theme); } } diff --git a/engine/ThemeEngine.php b/engine/ThemeEngine.php index 092a25d..aeb4ccc 100644 --- a/engine/ThemeEngine.php +++ b/engine/ThemeEngine.php @@ -8,14 +8,13 @@ class ThemeEngine public $loader; public $twig; - public function __construct(string $themePath, string $themeAssetPath) + public function __construct(string $themePath) { - $var = []; - $this->themePath = $themePath; - $this->themeAssetPath = $themeAssetPath; - $path = explode('/', $themeAssetPath); - $this->themeFolder = $path[4]; - $this->settings = json_decode( + $var = []; + $this->themePath = $themePath; + //$path = explode('/', $themeAssetPath); + //$this->themeFolder = $path[4]; + $this->settings = json_decode( file_get_contents('./data/settings.json'), true ); @@ -25,7 +24,7 @@ class ThemeEngine true ); $this->loader = new \Twig\Loader\FilesystemLoader( - $themePath . '/' . $path[4] + $themePath . '/' ); $this->twig = new \Twig\Environment($this->loader, []); $this->router($_SERVER['REQUEST_URI']); @@ -36,7 +35,7 @@ class ThemeEngine $pageInfo = [ 'keywords' => $this->settings['keywords'], 'description' => $this->settings['description'], - 'image' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'image' => $this->themePath . '/assets/images/global/default-bg.jpg', ]; $featureList = explode(',', $this->posts['feature']); @@ -70,10 +69,10 @@ class ThemeEngine $pageOptions = [ 'debug' => true, // for theme kit - 'theme' => $this->themeFolder, // for theme kit + 'theme' => $this->themePath, // for theme kit 'title' => 'This is Fipamo', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'recent' => $recent, 'featured' => $featured, 'info' => $pageInfo, @@ -89,10 +88,10 @@ class ThemeEngine $template = $request . '.twig'; $pageOptions = [ 'debug' => true, // for theme kit - 'theme' => $this->themeFolder, // for theme kit + 'theme' => $this->themePath, // for theme kit 'title' => 'Page Title', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'content' => $content, 'meta' => $meta, 'info' => $pageInfo, @@ -106,10 +105,10 @@ class ThemeEngine $template = 'tags.twig'; $pageOptions = [ 'debug' => true, // for theme kit - 'theme' => $this->themeFolder, // for theme kit + 'theme' => $this->themePath, // for theme kit 'title' => 'Pages Tagged as Tag', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'tag_list' => $tags, 'info' => $pageInfo, 'menu' => $menu, @@ -120,10 +119,10 @@ class ThemeEngine $template = 'archive.twig'; $pageOptions = [ 'debug' => true, // for theme kit - 'theme' => $this->themeFolder, // for theme kit + 'theme' => $this->themePath, // for theme kit 'title' => 'Archive', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'archives' => $archive['archives'], 'info' => $pageInfo, 'menu' => $menu, @@ -137,10 +136,10 @@ class ThemeEngine $template = 'error.twig'; $pageOptions = [ 'debug' => true, // for theme kit - 'theme' => $this->themeFolder, // for theme kit + 'theme' => $this->themePath, // for theme kit 'title' => 'Uh oh', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themeAssetPath . '/assets/images/global/default-bg.jpg', + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'info' => $pageInfo, 'content' => "This page is not defined", 'menu' => $menu, diff --git a/src/themes/theme-fipamo-default/fipamo-default/archive.twig b/themes/fipamo-default/archive.twig similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/archive.twig rename to themes/fipamo-default/archive.twig diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/css/color.css b/themes/fipamo-default/assets/css/color.css similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/css/color.css rename to themes/fipamo-default/assets/css/color.css diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/css/frame.css b/themes/fipamo-default/assets/css/frame.css similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/css/frame.css rename to themes/fipamo-default/assets/css/frame.css diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/css/start.css b/themes/fipamo-default/assets/css/start.css similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/css/start.css rename to themes/fipamo-default/assets/css/start.css diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/css/typography.css b/themes/fipamo-default/assets/css/typography.css similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/css/typography.css rename to themes/fipamo-default/assets/css/typography.css diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/images/global/default-avi.png b/themes/fipamo-default/assets/images/global/default-avi.png similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/images/global/default-avi.png rename to themes/fipamo-default/assets/images/global/default-avi.png diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/images/global/default-bg.jpg b/themes/fipamo-default/assets/images/global/default-bg.jpg similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/images/global/default-bg.jpg rename to themes/fipamo-default/assets/images/global/default-bg.jpg diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/images/global/sprite.svg b/themes/fipamo-default/assets/images/global/sprite.svg similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/images/global/sprite.svg rename to themes/fipamo-default/assets/images/global/sprite.svg diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/images/global/the-logo.svg b/themes/fipamo-default/assets/images/global/the-logo.svg similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/images/global/the-logo.svg rename to themes/fipamo-default/assets/images/global/the-logo.svg diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/scripts/Base.js b/themes/fipamo-default/assets/scripts/Base.js similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/scripts/Base.js rename to themes/fipamo-default/assets/scripts/Base.js diff --git a/src/themes/theme-fipamo-default/fipamo-default/assets/scripts/ThemeStart.js b/themes/fipamo-default/assets/scripts/ThemeStart.js similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/assets/scripts/ThemeStart.js rename to themes/fipamo-default/assets/scripts/ThemeStart.js diff --git a/src/themes/theme-fipamo-default/fipamo-default/error.twig b/themes/fipamo-default/error.twig similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/error.twig rename to themes/fipamo-default/error.twig diff --git a/src/themes/theme-fipamo-default/fipamo-default/frame.twig b/themes/fipamo-default/frame.twig similarity index 98% rename from src/themes/theme-fipamo-default/fipamo-default/frame.twig rename to themes/fipamo-default/frame.twig index 602fe63..54cc2ff 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/frame.twig +++ b/themes/fipamo-default/frame.twig @@ -1,7 +1,7 @@ {% if debug is defined %} - {% set assetPath = '/src/themes/theme-'~theme~'/'~theme~'/assets/' %} + {% set assetPath = theme~'/assets/' %} {% else %} {% set assetPath = '/assets/' %} {% endif %} diff --git a/src/themes/theme-fipamo-default/fipamo-default/index.twig b/themes/fipamo-default/index.twig similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/index.twig rename to themes/fipamo-default/index.twig diff --git a/src/themes/theme-fipamo-default/fipamo-default/page.twig b/themes/fipamo-default/page.twig similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/page.twig rename to themes/fipamo-default/page.twig diff --git a/src/themes/theme-fipamo-default/fipamo-default/tags.twig b/themes/fipamo-default/tags.twig similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/tags.twig rename to themes/fipamo-default/tags.twig diff --git a/src/themes/theme-fipamo-default/fipamo-default/theme.json b/themes/fipamo-default/theme.json similarity index 100% rename from src/themes/theme-fipamo-default/fipamo-default/theme.json rename to themes/fipamo-default/theme.json