From 0d508ac6d58287b1a6df45530e3c3d884dfde7b0 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Fri, 10 Nov 2023 14:27:00 +0100 Subject: [PATCH] refactor: improve readability and maintainability --- page-generator/index.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/page-generator/index.php b/page-generator/index.php index e16a752..503826c 100644 --- a/page-generator/index.php +++ b/page-generator/index.php @@ -72,14 +72,14 @@ foreach ($footer_data as $item) { $generator->writeToFile($footer_path, '
'); } - if (!is_null($item['url'])) { + if (!is_null($item['url'])) $generator->writeToFile($footer_path, $generator->a($item['url'], $item['text'], $item['title'])); - } else if (!is_null($item['title'])) { + else if (!is_null($item['title'])) $generator->writeToFile($footer_path, $generator->spanTitle($item['title'], $item['text'])); - } else { + else $generator->writeToFile($footer_path, $item['text'] . " "); - } } + $generator->writeToFile($footer_path, '

'); #endregion @@ -113,15 +113,14 @@ $generator->writeToFile($header_path, ''); #endregion -// generate page folders +// populate page array with paths $page_array = []; -foreach ($menu_list as $item) { - foreach ($item as $key => $value) { +foreach ($menu_list as $item) + foreach ($item as $key => $value) if ($key == 'path') $page_array[] = $value; - } -} +// generate page folders mkdir(BASE_PATH_TEMP . "/pages"); $generator->generateFoldersForPages($page_array, BASE_PATH_TEMP . "/pages"); @@ -129,11 +128,12 @@ $generator->generateFoldersForPages($page_array, BASE_PATH_TEMP . "/pages"); $generator->setTemplateVar($head_path, "lang-code", "en"); $generator->setTemplateVar($head_path, "page-title", "TheRiceGoat"); +// populate an array with path => title $path_title = []; -foreach ($menu_list as $item) { +foreach ($menu_list as $item) $path_title[$item['path']] = $item['title']; -} +// get page list $page_list = file_get_contents(URL . '?sheet=_pages'); $page_list = json_decode($page_list, true); @@ -153,7 +153,6 @@ foreach ($page_list as $page) { $page_data = json_decode($page_data, true); switch ($page["type"]) { - # simple pages case '1-col': $section = ""; foreach ($page_data as $key => $line) { @@ -165,11 +164,10 @@ foreach ($page_list as $page) { } elseif ($key == 0) $generator->writeToFile($page_path, '

'); - if ($line['url'] != null) { + if ($line['url'] != null) $generator->writeToFile($page_path, $generator->a($line['url'], $line['text'])); - } else { + else $generator->writeToFile($page_path, $line['text']); - } $generator->writeToFile($page_path, '
'); } -- 2.30.2