From 79fbc2437faf27a248cf7cc1f93d672a01e160ca Mon Sep 17 00:00:00 2001 From: Are0h Date: Thu, 17 Mar 2022 17:28:08 -0700 Subject: [PATCH] re-organized test data, added basic slider for media --- .gitignore | 2 + data/archives.json | 103 ++++++++ config.json => data/posts.json | 138 +--------- data/settings.json | 37 +++ index.php | 239 ++++++++++-------- src/themes/theme-fipamo-default/com/Base.js | 10 +- .../fipamo-default/frame.twig | 41 ++- .../styles/_structure.sass | 71 ++++-- 8 files changed, 369 insertions(+), 272 deletions(-) create mode 100644 data/archives.json rename config.json => data/posts.json (50%) create mode 100644 data/settings.json diff --git a/.gitignore b/.gitignore index 0688736..07ef72e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ dist .nova .cache .DS_Store +*.sublime-project +*.sublime-workspace assets vendor diff --git a/data/archives.json b/data/archives.json new file mode 100644 index 0000000..c664304 --- /dev/null +++ b/data/archives.json @@ -0,0 +1,103 @@ +{ + "archives": [ + { + "year": "2020", + "year_data": [ + { + "month": "06", + "full_month": "June", + "count": 1, + "pages": [ + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 1", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + }, + { + "id": 2, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 2", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + } + ] + }, + { + "month": "05", + "full_month": "May", + "count": 1, + "pages": [ + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 3", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + }, + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 4", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + } + ] + } + ] + }, + { + "year": "2019", + "year_data": [ + { + "month": "04", + "full_month": "April", + "count": 1, + "pages": [ + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 5", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + }, + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 6", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + } + ] + } + ] + }, + { + "year": "2018", + "year_data": [ + { + "month": "06", + "full_month": "June", + "count": 1, + "pages": [ + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 7", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + }, + { + "id": 1, + "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", + "title": "Swaggy Disgust 8", + "slug": "swaggy-disgust", + "content": "My man looks so fed up right now" + } + ] + } + ] + } + ] +} diff --git a/config.json b/data/posts.json similarity index 50% rename from config.json rename to data/posts.json index bd9db53..dce7c73 100644 --- a/config.json +++ b/data/posts.json @@ -1,18 +1,8 @@ { - "title": "This is Fipamo", - "welcome_message": "Hey there. So this is a long ass title to see how it breaks", - "keywords": "creative technoglogist, graphic design, web development, designer developer, social thought, political discussion, music producer, creative culture, black creative, black geek", - "description": "The home site of Creative Technologist, music maker, and social philoshoper, Ro. Ha, I know. Me too.", - "dynamicRender": "true", - "base_path": "/src/front/", - "default_bg": "/assets/images/global/default-bg.jpg", - "default_avi": "/assets/images/global/default-avi.png", "index-content": "
The path of the righteous man is beset on ALL sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who would attempt to poison and destroy My brothers. And you will know My name is the Lord when I lay My vengeance upon thee.", "content": "
The path of the righteous man is beset on ALL sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who would attempt to poison and destroy My brothers. And you will know My name is the Lord when I lay My vengeance upon thee.
server\n { listen 80; server_name yourcoolassdomain.com; \n\tlocation / \n\t\t{ \n\t\t\tproxy_pass https://127.0.0.1:2314; \n\t\t\tproxy_http_version 1.1; \n\t\t\tproxy_set_header \n\t\t\tUpgrade $http_upgrade; \n\t\t\tproxy_set_header Connection 'upgrade'; \n\t\t\tproxy_set_header Host $host; \n\t\t\tproxy_cache_bypass $http_upgrade; \n\t\t} \n\t}
", - "bucket": [{ "item": "one" }, { "item": "two" }, { "item": "three" }], - "tag_list": [ - { "title": "Swaggy Disgust", "slug": "swaggy-disgust", "path": "2020/06" } - ], + "feature": "/assets/video/blog/2022/01/one.mp4, /assets/images/blog/2022/03/01.jpg, /assets/images/blog/2022/03/02.jpg, /assets/images/blog/2022/03/03.jpg", + "files": "/assets/docs/blog/2022/01/one.pdf, /assets/docs/blog/2022/01/two.txt, /assets/docs/blog/2022/01/three.rtf, /assets/sound/blog/2022/01/one.mp3, /assets/sound/blog/2022/01/two.mp3,", "meta": { "who": "Are0h", "when": "6 hours ago", @@ -25,29 +15,6 @@ { "label": " tv", "slug": "tv" } ] }, - "menu": [ - { - "title": "This is the first page", - "id": "3", - "slug": "page-one", - "uuid": "b60d6843-e957-43ac-8425-65145142236c", - "path": "2021/04" - }, - { - "title": "This is the second page", - "id": "4", - "slug": "page-two", - "uuid": "b60d6843-e957-43ac-8425-65145142236d", - "path": "2021/04" - }, - { - "title": "This is the second page", - "id": "5", - "slug": "page-three", - "uuid": "b60d6843-e957-43ac-8425-65145142236d", - "path": "2021/04" - } - ], "recent_posts": [ { "title": "Teyonah Parris", @@ -119,106 +86,5 @@ "slug": "michael-mf-burnam", "content": "Yall acting like Michael won/'t give you those hands." } - ], - "archives": [ - { - "year": "2020", - "year_data": [ - { - "month": "06", - "full_month": "June", - "count": 1, - "pages": [ - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 1", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - }, - { - "id": 2, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 2", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - } - ] - }, - { - "month": "05", - "full_month": "May", - "count": 1, - "pages": [ - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 3", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - }, - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 4", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - } - ] - } - ] - }, - { - "year": "2019", - "year_data": [ - { - "month": "04", - "full_month": "April", - "count": 1, - "pages": [ - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 5", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - }, - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 6", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - } - ] - } - ] - }, - { - "year": "2018", - "year_data": [ - { - "month": "06", - "full_month": "June", - "count": 1, - "pages": [ - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 7", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - }, - { - "id": 1, - "uuid": "29338b67-68d9-4b05-99ac-8d031d27e95c", - "title": "Swaggy Disgust 8", - "slug": "swaggy-disgust", - "content": "My man looks so fed up right now" - } - ] - } - ] - } ] } diff --git a/data/settings.json b/data/settings.json new file mode 100644 index 0000000..b1d8a2e --- /dev/null +++ b/data/settings.json @@ -0,0 +1,37 @@ +{ + "title": "This is Fipamo", + "welcome_message": "Hey there. So this is a long ass title to see how it breaks", + "keywords": "creative technoglogist, graphic design, web development, designer developer, social thought, political discussion, music producer, creative culture, black creative, black geek", + "description": "The home site of Creative Technologist, music maker, and social philoshoper, Ro. Ha, I know. Me too.", + "dynamicRender": "true", + "base_path": "/src/front/", + "default_bg": "/assets/images/global/default-bg.jpg", + "default_avi": "/assets/images/global/default-avi.png", + "bucket": [{ "item": "one" }, { "item": "two" }, { "item": "three" }], + "tag_list": [ + { "title": "Swaggy Disgust", "slug": "swaggy-disgust", "path": "2020/06" } + ], + "menu": [ + { + "title": "This is the first page", + "id": "3", + "slug": "page-one", + "uuid": "b60d6843-e957-43ac-8425-65145142236c", + "path": "2021/04" + }, + { + "title": "This is the second page", + "id": "4", + "slug": "page-two", + "uuid": "b60d6843-e957-43ac-8425-65145142236d", + "path": "2021/04" + }, + { + "title": "This is the second page", + "id": "5", + "slug": "page-three", + "uuid": "b60d6843-e957-43ac-8425-65145142236d", + "path": "2021/04" + } + ] +} diff --git a/index.php b/index.php index 547fd0f..75ce545 100644 --- a/index.php +++ b/index.php @@ -3,121 +3,146 @@ require "vendor/autoload.php"; class StartKit { - public function __construct() - { - $settings = json_decode(file_get_contents("./package.json"), true); - $theme = $settings["config"]["current_theme"]; - new ThemeEngine( - "src/themes/theme-" . $theme, - "/src/themes/theme-" . $theme . "/" . $theme - ); - } + public function __construct() + { + $settings = json_decode(file_get_contents("./package.json"), true); + $theme = $settings["config"]["current_theme"]; + new ThemeEngine( + "src/themes/theme-" . $theme, + "/src/themes/theme-" . $theme . "/" . $theme + ); + } } class ThemeEngine { - public $data = []; - public $loader; - public $twig; - public function __construct(string $themePath, string $themeAssetPath) - { - $this->themePath = $themePath; - $this->themeAssetPath = $themeAssetPath; - $path = explode("/", $themeAssetPath); - $this->themeFolder = $path[4]; - $this->data = json_decode(file_get_contents("./config.json"), true); - $this->loader = new \Twig\Loader\FilesystemLoader( - $themePath . "/" . $path[4] - ); - $this->twig = new \Twig\Environment($this->loader, []); - $this->router($_SERVER["REQUEST_URI"]); - } + public $data = []; + public $loader; + public $twig; + public function __construct(string $themePath, string $themeAssetPath) + { + $this->themePath = $themePath; + $this->themeAssetPath = $themeAssetPath; + $path = explode("/", $themeAssetPath); + $this->themeFolder = $path[4]; + $this->settings = json_decode(file_get_contents("./data/settings.json"), true); + $this->posts = json_decode(file_get_contents("./data/posts.json"), true); + $this->archives = json_decode(file_get_contents("./data/archives.json"), true); + $this->loader = new \Twig\Loader\FilesystemLoader( + $themePath . "/" . $path[4] + ); + $this->twig = new \Twig\Environment($this->loader, []); + $this->router($_SERVER["REQUEST_URI"]); + } - public function router(string $request) - { - $pageInfo = [ - "keywords" => $this->data["keywords"], - "description" => $this->data["description"], - "image" => $this->themeAssetPath . "/assets/images/global/default-bg.jpg", - ]; + public function router(string $request) + { + $pageInfo = [ + "keywords" => $this->settings["keywords"], + "description" => $this->settings["description"], + "image" => $this->themeAssetPath . "/assets/images/global/default-bg.jpg", + ]; - $menu = $this->data["menu"]; - switch ($request) { - case "/": - $recent = $this->data["recent_posts"]; - $featured = $this->data["featured_posts"]; - $template = "index.twig"; - $content = $this->data["index-content"]; + $featureList = explode(",", $this->posts["feature"]); + $fileList = explode(",", $this->posts["files"]); - $pageOptions = [ - "debug" => true, //for theme kit - "theme" => $this->themeFolder, //for theme kit - "title" => "This is Fipamo", - "dynamicRender" => $this->data["dynamicRender"], - "background" => - $this->themeAssetPath . "/assets/images/global/default-bg.jpg", - "recent" => $recent, - "featured" => $featured, - "info" => $pageInfo, - "menu" => $menu, - "content" => $content, - ]; - break; - case "/page": - $content = $this->data["content"]; - $meta = $this->data["meta"]; - $template = $request . ".twig"; - $pageOptions = [ - "debug" => true, //for theme kit - "theme" => $this->themeFolder, //for theme kit - "title" => "Page Title", - "dynamicRender" => $this->data["dynamicRender"], - "background" => - $this->themeAssetPath . "/assets/images/global/default-bg.jpg", - "content" => $content, - "meta" => $meta, - "info" => $pageInfo, - "menu" => $menu, - ]; - break; - case "/tags": - $tags = $this->data["tag_list"]; - $template = $this->themeFolder . "/tags.twig"; - $pageOptions = [ - "debug" => true, //for theme kit - "theme" => $this->themeFolder, //for theme kit - "title" => "Pages Tagged as Tag", - "dynamicRender" => $this->data["dynamicRender"], - "background" => - $this->themeAssetPath . "/assets/images/global/default-bg.jpg", - "tag_list" => $tags, - "info" => $pageInfo, - "menu" => $menu, - ]; - break; - case "/archive": - $archive = $this->data["archives"]; - $template = $this->themeFolder . "/archive.twig"; - $pageOptions = [ - "debug" => true, //for theme kit - "theme" => $this->themeFolder, //for theme kit - "title" => "Archive", - "dynamicRender" => $this->data["dynamicRender"], - "background" => - $this->themeAssetPath . "/assets/images/global/default-bg.jpg", - "archives" => $archive, - "info" => $pageInfo, - "menu" => $menu, - ]; - break; - default: - http_response_code(404); - require __DIR__ . "/views/404.php"; - break; - } + $images = []; + $files = []; + foreach ($featureList as $file) { + $item = trim($file); + $ext = pathinfo($item, PATHINFO_EXTENSION); + if ($item != null || $item != "") { + array_push($images, ["file" => $item, "type" => trim($ext)]); + } + } + + foreach ($fileList as $file) { + $item = trim($file); + $ext = pathinfo($item, PATHINFO_EXTENSION); + if ($item != null || $item != "") { + array_push($files, ["file" => $item, "type" => trim($ext)]); + } + } - echo $this->twig->render($template, $pageOptions); - } + $menu = $this->settings["menu"]; + switch ($request) { + case "/": + $recent = $this->posts["recent_posts"]; + $featured = $this->posts["featured_posts"]; + $template = "index.twig"; + $content = $this->posts["index-content"]; + + $pageOptions = [ + "debug" => true, //for theme kit + "theme" => $this->themeFolder, //for theme kit + "title" => "This is Fipamo", + "dynamicRender" => $this->settings["dynamicRender"], + "background" => + $this->themeAssetPath . "/assets/images/global/default-bg.jpg", + "recent" => $recent, + "featured" => $featured, + "info" => $pageInfo, + "menu" => $menu, + "content" => $content, + ]; + break; + case "/page": + $content = $this->posts["content"]; + $meta = $this->posts["meta"]; + $template = $request . ".twig"; + $pageOptions = [ + "debug" => true, //for theme kit + "theme" => $this->themeFolder, //for theme kit + "title" => "Page Title", + "dynamicRender" => $this->settings["dynamicRender"], + "background" => + $this->themeAssetPath . "/assets/images/global/default-bg.jpg", + "content" => $content, + "meta" => $meta, + "info" => $pageInfo, + "menu" => $menu, + "media" => $images, + "files" => $files, + ]; + break; + case "/tags": + $tags = $this->settings["tag_list"]; + $template = $this->themeFolder . "/tags.twig"; + $pageOptions = [ + "debug" => true, //for theme kit + "theme" => $this->themeFolder, //for theme kit + "title" => "Pages Tagged as Tag", + "dynamicRender" => $this->settings["dynamicRender"], + "background" => + $this->themeAssetPath . "/assets/images/global/default-bg.jpg", + "tag_list" => $tags, + "info" => $pageInfo, + "menu" => $menu, + ]; + break; + case "/archive": + $archive = $this->archives; + $template = $this->themeFolder . "/archive.twig"; + $pageOptions = [ + "debug" => true, //for theme kit + "theme" => $this->themeFolder, //for theme kit + "title" => "Archive", + "dynamicRender" => $this->settings["dynamicRender"], + "background" => + $this->themeAssetPath . "/assets/images/global/default-bg.jpg", + "archives" => $archive, + "info" => $pageInfo, + "menu" => $menu, + ]; + break; + default: + http_response_code(404); + require __DIR__ . "/views/404.php"; + break; + } + + echo $this->twig->render($template, $pageOptions); + } } new StartKit(); diff --git a/src/themes/theme-fipamo-default/com/Base.js b/src/themes/theme-fipamo-default/com/Base.js index 6d12b17..2d037f8 100644 --- a/src/themes/theme-fipamo-default/com/Base.js +++ b/src/themes/theme-fipamo-default/com/Base.js @@ -3,10 +3,18 @@ export default class Base { // constructor //-------------------------- constructor() { + this.currentSlide = 0; + this.slides = document.querySelectorAll("#media .slide"); this.start(); } start() { - console.log("Connected like F.E."); + if (this.slides.length > 1) { + this.slideInterval = setInterval(() => { + this.slides[this.currentSlide].className = "slide hide"; + this.currentSlide = (this.currentSlide + 1) % this.slides.length; + this.slides[this.currentSlide].className = "slide show"; + }, 3000); + } } //-------------------------- // methods diff --git a/src/themes/theme-fipamo-default/fipamo-default/frame.twig b/src/themes/theme-fipamo-default/fipamo-default/frame.twig index 65cde89..45bcf68 100644 --- a/src/themes/theme-fipamo-default/fipamo-default/frame.twig +++ b/src/themes/theme-fipamo-default/fipamo-default/frame.twig @@ -20,10 +20,47 @@ - + + +
+
+ {% if media|length > 1 %} + {% for item in media %} + {% if item.type == "mp4"%} +
+ +
+ {% else %} +
+ {% endif %} + {% endfor %} + {% else %} + {% if media[0] != '' %} + {% if media[0].type == "mp4"%} +
+ +
+ {% else %} +
+ {% endif %} + {% else %} + {% endif %} + {% endif %} +