diff --git a/.gitignore b/.gitignore index 3e3daec..6fbdf82 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ dist *.sublime-project *.sublime-workspace *.code-workspace -assets vendor !themes diff --git a/.prettierignore b/.prettierignore index e2c7f28..5f5997c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,3 @@ *.php -*.inc.php \ No newline at end of file +*.inc.php +*.css \ No newline at end of file diff --git a/assets/docs/blog/2022/01/TAPP-Afsaneh_Design From the Margins_Final_220514.pdf b/assets/docs/blog/2022/01/TAPP-Afsaneh_Design From the Margins_Final_220514.pdf new file mode 100644 index 0000000..82a5c13 Binary files /dev/null and b/assets/docs/blog/2022/01/TAPP-Afsaneh_Design From the Margins_Final_220514.pdf differ diff --git a/assets/docs/blog/2022/01/areteeef.rtf b/assets/docs/blog/2022/01/areteeef.rtf new file mode 100644 index 0000000..496324f --- /dev/null +++ b/assets/docs/blog/2022/01/areteeef.rtf @@ -0,0 +1 @@ +This is a rich-text file. \ No newline at end of file diff --git a/assets/docs/blog/2022/01/teeextee.txt b/assets/docs/blog/2022/01/teeextee.txt new file mode 100644 index 0000000..0cf3a27 --- /dev/null +++ b/assets/docs/blog/2022/01/teeextee.txt @@ -0,0 +1 @@ +This is a text file. \ No newline at end of file diff --git a/assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg b/assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg new file mode 100644 index 0000000..c6fe51b Binary files /dev/null and b/assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg b/assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg new file mode 100644 index 0000000..c93c563 Binary files /dev/null and b/assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg b/assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg new file mode 100644 index 0000000..536d450 Binary files /dev/null and b/assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/jakob-owens-jmi61XJe450-unsplash.jpg b/assets/images/blog/2022/03/jakob-owens-jmi61XJe450-unsplash.jpg new file mode 100644 index 0000000..47994ed Binary files /dev/null and b/assets/images/blog/2022/03/jakob-owens-jmi61XJe450-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/leighann-blackwood-Y-EmPaN5D0E-unsplash.jpg b/assets/images/blog/2022/03/leighann-blackwood-Y-EmPaN5D0E-unsplash.jpg new file mode 100644 index 0000000..6c9eea0 Binary files /dev/null and b/assets/images/blog/2022/03/leighann-blackwood-Y-EmPaN5D0E-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/logan-weaver-lgnwvr-0IzoNpImF04-unsplash.jpg b/assets/images/blog/2022/03/logan-weaver-lgnwvr-0IzoNpImF04-unsplash.jpg new file mode 100644 index 0000000..7fede08 Binary files /dev/null and b/assets/images/blog/2022/03/logan-weaver-lgnwvr-0IzoNpImF04-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/masahiro-miyagi-r1wiw9CWg7I-unsplash.jpg b/assets/images/blog/2022/03/masahiro-miyagi-r1wiw9CWg7I-unsplash.jpg new file mode 100644 index 0000000..aa9183b Binary files /dev/null and b/assets/images/blog/2022/03/masahiro-miyagi-r1wiw9CWg7I-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/pawan-sharma-m41i9RcGcAo-unsplash.jpg b/assets/images/blog/2022/03/pawan-sharma-m41i9RcGcAo-unsplash.jpg new file mode 100644 index 0000000..019d88b Binary files /dev/null and b/assets/images/blog/2022/03/pawan-sharma-m41i9RcGcAo-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/seven-shooter-hPKTYwJ4FUo-unsplash.jpg b/assets/images/blog/2022/03/seven-shooter-hPKTYwJ4FUo-unsplash.jpg new file mode 100644 index 0000000..b994192 Binary files /dev/null and b/assets/images/blog/2022/03/seven-shooter-hPKTYwJ4FUo-unsplash.jpg differ diff --git a/assets/images/blog/2022/03/super-snapper-y57MGB34dEE-unsplash.jpg b/assets/images/blog/2022/03/super-snapper-y57MGB34dEE-unsplash.jpg new file mode 100644 index 0000000..14ef7e6 Binary files /dev/null and b/assets/images/blog/2022/03/super-snapper-y57MGB34dEE-unsplash.jpg differ diff --git a/assets/images/global/default-avi.png b/assets/images/global/default-avi.png new file mode 100644 index 0000000..99ee4bb Binary files /dev/null and b/assets/images/global/default-avi.png differ diff --git a/assets/images/global/default-bg.jpg b/assets/images/global/default-bg.jpg new file mode 100644 index 0000000..ff29737 Binary files /dev/null and b/assets/images/global/default-bg.jpg differ diff --git a/assets/images/global/sprite.svg b/assets/images/global/sprite.svg new file mode 100644 index 0000000..565e7ab --- /dev/null +++ b/assets/images/global/sprite.svg @@ -0,0 +1,823 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + instagram-with-circle + + instagram + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/global/the-logo.svg b/assets/images/global/the-logo.svg new file mode 100644 index 0000000..f8d21b5 --- /dev/null +++ b/assets/images/global/the-logo.svg @@ -0,0 +1,33 @@ + + + + + diff --git a/assets/sound/blog/2022/01/indefatigable.mp3 b/assets/sound/blog/2022/01/indefatigable.mp3 new file mode 100644 index 0000000..6b52f1f Binary files /dev/null and b/assets/sound/blog/2022/01/indefatigable.mp3 differ diff --git a/assets/sound/blog/2022/01/less-traveled.mp3 b/assets/sound/blog/2022/01/less-traveled.mp3 new file mode 100644 index 0000000..bc25fa2 Binary files /dev/null and b/assets/sound/blog/2022/01/less-traveled.mp3 differ diff --git a/assets/sound/blog/2022/01/silk-road.mp3 b/assets/sound/blog/2022/01/silk-road.mp3 new file mode 100644 index 0000000..e16df0c Binary files /dev/null and b/assets/sound/blog/2022/01/silk-road.mp3 differ diff --git a/assets/video/blog/2022/01/one.mp4 b/assets/video/blog/2022/01/one.mp4 new file mode 100644 index 0000000..3c2d595 Binary files /dev/null and b/assets/video/blog/2022/01/one.mp4 differ diff --git a/data/posts.json b/data/posts.json index c8d1a32..719a534 100644 --- a/data/posts.json +++ b/data/posts.json @@ -1,9 +1,9 @@ { "index-content-no-image": "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.", "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": "this is mini text
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}

", - "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,", + "content": "this is mini text
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}

", + "feature": "/assets/video/blog/2022/01/one.mp4, /assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg, /assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg, /assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg", + "files": "/assets/docs/blog/2022/01/TAPP-Afsaneh_Design From the Margins_Final_220514.pdf, /assets/docs/blog/2022/01/teeextee.txt, /assets/docs/blog/2022/01/areteeef.rtf, /assets/sound/blog/2022/01/indefatigable.mp3, /assets/sound/blog/2022/01/less-traveled.mp3,/assets/sound/blog/2022/01/silk-road.mp3, ", "meta": { "who": "Are0h", "when": "2022 Jan Sun 30", @@ -37,104 +37,68 @@ "recent_posts": [ { "title": "Teyonah Parris", - "slug": "teyonah-parris", - "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", + "slug": "page", + "feature": "/assets/video/blog/2022/01/one.mp4, /assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg, /assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg, /assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg", "path": "2020/06", "created": "2018 Nov 11th" }, { "title": "Aja Naomi-King", "slug": "aja-naomi-king", - "feature": "/assets/images/blog/2022/03/01.jpg, /assets/images/blog/2022/03/02.jpg, /assets/images/blog/2022/03/03.jpg", + "feature": "/assets/images/blog/2022/03/alexis-chloe-D1_fFiqaQw8-unsplash.jpg, /assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg, /assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg", "path": "2020/06", "created": "2018 Nov 11th" }, { "title": "Sonequa Martin-Green", "slug": "sonequa-martin-green", - "feature": "/assets/images/blog/2022/03/02.jpg, /assets/images/blog/2022/03/03.jpg", + "feature": "/assets/images/blog/2022/03/allef-vinicius-EpMPCuGcePQ-unsplash.jpg, /assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg", "path": "2020/06", "created": "2018 Nov 11th" }, { "title": "Jameela Jamil", "slug": "jameela-jamil", - "feature": "/assets/images/blog/2022/03/03.jpg", + "feature": "/assets/images/blog/2022/03/honey-yanibel-minaya-cruz-bVr3cTtmNk8-unsplash.jpg", "path": "2020/06", "created": "2018 Nov 11th" }, { "title": "I/'m so behind", "slug": "im-so-behind", - "feature": "/assets/images/blog/2022/03/03.jpg", + "feature": "/assets/images/blog/2022/03/jakob-owens-jmi61XJe450-unsplash.jpg", "path": "2020/06", "created": "2018 Nov 11th" } ], "featured_posts": [ { - "id": 6, - "uuid": "e322f21e-3317-4795-a7e8-a280c4611406", "title": "Roberta MF Draper", - "feature": "/src/themes/theme-rikc03/rikc03/assets/images/test/2018/05/nxt_08202016dg_2622.jpg", + "feature": "/assets/images/blog/2022/03/leighann-blackwood-Y-EmPaN5D0E-unsplash.jpg", "path": "2020/06", - "layout": "page", - "tags": "faves, damn, the expanse, sci-fi, frankie adams", - "author": "Are0h", - "deleted": false, - "menu": false, - "featured": true, - "published": true, - "slug": "roberta-mf-draper", - "content": "Even Amos doesn/'t want any smoke with Mars/' Finest. She will fuck your whole shit up. Bad. \r\n\r\nRENDER ON SAVE WORKS!\r\n" + "created": "2018 Nov 11th", + "slug": "roberta-mf-draper" }, { - "id": 4, - "uuid": "9051e9df-c723-42c6-bf77-59f5bb8caeac", "title": "Michael MF Burnam", - "feature": "/src/themes/theme-rikc03/rikc03/assets/images/test/2018/05/13603447_1213326028679516_1212043235232357993_o.jpg", + "feature": "/assets/images/blog/2022/03/logan-weaver-lgnwvr-0IzoNpImF04-unsplash.jpg", "path": "2020/06", - "layout": "page", - "tags": "star trek discovery, sonequa martin-green, faves, damn, sci-fi, tv", - "author": "Are0h", - "deleted": false, - "menu": true, - "featured": true, - "published": true, - "slug": "michael-mf-burnam", - "content": "Yall acting like Michael won/'t give you those hands." + "created": "2018 Nov 11th", + "slug": "michael-mf-burnam" }, { - "id": 6, - "uuid": "e322f21e-3317-4795-a7e8-a280c4611406", "title": "Roberta MF Draper", - "feature": "/assets/video/blog/2022/01/one.mp4", + "feature": "/assets/images/blog/2022/03/masahiro-miyagi-r1wiw9CWg7I-unsplash.jpg", "path": "2020/06", - "layout": "page", - "tags": "faves, damn, the expanse, sci-fi, frankie adams", - "author": "Are0h", - "deleted": false, - "menu": false, - "featured": true, - "published": true, - "slug": "roberta-mf-draper", - "content": "Even Amos doesn/'t want any smoke with Mars/' Finest. She will fuck your whole shit up. Bad. \r\n\r\nRENDER ON SAVE WORKS!\r\n" + "created": "2018 Nov 11th", + "slug": "roberta-mf-draper" }, { - "id": 4, - "uuid": "9051e9df-c723-42c6-bf77-59f5bb8caeac", "title": "Michael MF Burnam", - "feature": "/src/themes/theme-rikc03/rikc03/assets/images/test/2018/05/13603447_1213326028679516_1212043235232357993_o.jpg", + "feature": "/assets/images/blog/2022/03/pawan-sharma-m41i9RcGcAo-unsplash.jpg", "path": "2020/06", - "layout": "page", - "tags": "star trek discovery, sonequa martin-green, faves, damn, sci-fi, tv", - "author": "Are0h", - "deleted": false, - "menu": true, - "featured": true, - "published": true, - "slug": "michael-mf-burnam", - "content": "Yall acting like Michael won/'t give you those hands." + "created": "2018 Nov 11th", + "slug": "michael-mf-burnam" } ] } diff --git a/data/settings.json b/data/settings.json index 5fe9f21..2e1eac6 100644 --- a/data/settings.json +++ b/data/settings.json @@ -4,10 +4,9 @@ "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/", + "background": "/assets/images/blog/2022/03/super-snapper-y57MGB34dEE-unsplash.jpg", "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", @@ -38,21 +37,21 @@ { "title": "First", "id": "3", - "slug": "page-one", + "slug": "page", "uuid": "b60d6843-e957-43ac-8425-65145142236c", "path": "2021/04" }, { "title": "Second", "id": "4", - "slug": "page-two", + "slug": "page", "uuid": "b60d6843-e957-43ac-8425-65145142236d", "path": "2021/04" }, { "title": "Third", "id": "5", - "slug": "page-three", + "slug": "page", "uuid": "b60d6843-e957-43ac-8425-65145142236d", "path": "2021/04" } diff --git a/engine/ThemeEngine.php b/engine/ThemeEngine.php index aeb4ccc..0c68548 100644 --- a/engine/ThemeEngine.php +++ b/engine/ThemeEngine.php @@ -35,7 +35,7 @@ class ThemeEngine $pageInfo = [ 'keywords' => $this->settings['keywords'], 'description' => $this->settings['description'], - 'image' => $this->themePath . '/assets/images/global/default-bg.jpg', + 'image' => $this->settings['background'], ]; $featureList = explode(',', $this->posts['feature']); @@ -108,13 +108,13 @@ class ThemeEngine 'theme' => $this->themePath, // for theme kit 'title' => 'Pages Tagged as Tag', 'dynamicRender' => $this->settings['dynamicRender'], - 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', 'tag_list' => $tags, 'info' => $pageInfo, 'menu' => $menu, + 'media' => [['file' => $pageInfo['image'], 'type' => trim(pathinfo($pageInfo['image'], PATHINFO_EXTENSION))]], ]; break; - case '/archive': + case '/archives': $archive = $this->archives; $template = 'archive.twig'; $pageOptions = [ @@ -126,9 +126,10 @@ class ThemeEngine 'archives' => $archive['archives'], 'info' => $pageInfo, 'menu' => $menu, + 'media' => [['file' => $pageInfo['image'], 'type' => trim(pathinfo($pageInfo['image'], PATHINFO_EXTENSION))]], ]; break; - default: + case '/error': set_error_handler(function ($errno, $errstr, $errfile, $errline) { throw new \ErrorException($errstr, $errno, 0, $errfile, $errline); $error = $errstr; @@ -145,8 +146,27 @@ class ThemeEngine 'menu' => $menu, 'media' => $images, 'files' => $files, + 'media' => [['file' => $pageInfo['image'], 'type' => trim(pathinfo($pageInfo['image'], PATHINFO_EXTENSION))]], ]; + break; + default: + $content = $this->posts['content']; + $meta = $this->posts['meta']; + $template = $request . '.twig'; + $pageOptions = [ + 'debug' => true, // for theme kit + 'theme' => $this->themePath, // for theme kit + 'title' => 'CUSTOM PAGE', + 'dynamicRender' => $this->settings['dynamicRender'], + 'background' => $this->themePath . '/assets/images/global/default-bg.jpg', + 'content' => $content, + 'meta' => $meta, + 'info' => $pageInfo, + 'menu' => $menu, + 'media' => $images, + 'files' => $files, + ]; break; }