From fdff6eb23c18adf36b400a29b991bd403193e986 Mon Sep 17 00:00:00 2001 From: Rosia E Evans Date: Thu, 22 May 2025 12:54:53 +0100 Subject: [PATCH 1/4] adds new colour scheme --- Resources/Templates/BlogPageTemplate.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Templates/BlogPageTemplate.html b/Resources/Templates/BlogPageTemplate.html index 6895ca7..dd6136f 100644 --- a/Resources/Templates/BlogPageTemplate.html +++ b/Resources/Templates/BlogPageTemplate.html @@ -34,6 +34,7 @@ From a42d8c547773d3c3d4bf21ae5a7851d485d24047 Mon Sep 17 00:00:00 2001 From: Rosia E Evans Date: Thu, 22 May 2025 15:42:00 +0100 Subject: [PATCH 2/4] removed unescessary navbar header, this should now be added in template --- Src/BlogPageBuilder.cpp | 3 --- Src/BlogPageBuilder.h | 1 - 2 files changed, 4 deletions(-) diff --git a/Src/BlogPageBuilder.cpp b/Src/BlogPageBuilder.cpp index 6b2c905..07ae0ff 100644 --- a/Src/BlogPageBuilder.cpp +++ b/Src/BlogPageBuilder.cpp @@ -109,8 +109,6 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s int insertLocation = 0; if (categoryStart != -1) insertLocation = categories.find(categoryOpening, categoryStart) + categoryOpening.length(); - else - insertLocation = navHeader.length(); categories.insert(insertLocation, item); @@ -123,7 +121,6 @@ std::string NavBarGenerator::generateNavSection(std::vector pages, std::s { this->options = options; std::string buffer; - buffer.append(navHeader); buffer.append(generateCategories(sourceFolderUrl)); buffer = insertPagesIntoCategories(buffer, pages); return buffer; diff --git a/Src/BlogPageBuilder.h b/Src/BlogPageBuilder.h index d75386f..9911949 100644 --- a/Src/BlogPageBuilder.h +++ b/Src/BlogPageBuilder.h @@ -24,7 +24,6 @@ enum OptionFlags class NavBarGenerator { private: - std::string navHeader = "\n

Navigation

\n\n"; int options; std::string generateCategories(std::string rootFolderUrl); From ba86b5bf9b45e32c10b874eda7667b983f85fbe0 Mon Sep 17 00:00:00 2001 From: Rosia E Evans Date: Thu, 22 May 2025 15:42:31 +0100 Subject: [PATCH 3/4] edits gitinore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9dafa90..2cb78e3 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,6 @@ *.app #CMake -build/ -Resources/Output/ +build/* +Resources/Output/* From a33833875c0f3006f66f99ebe7c258b2b55d56d6 Mon Sep 17 00:00:00 2001 From: Robyn Vaughan-Williams Date: Sat, 24 May 2025 20:46:39 +0100 Subject: [PATCH 4/4] Switched to printf, changed to using a function to check if any arguments are empty --- Src/blog.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Src/blog.cpp b/Src/blog.cpp index 63619fe..b9e02c4 100644 --- a/Src/blog.cpp +++ b/Src/blog.cpp @@ -34,10 +34,8 @@ std::string getArgValue(int argc, char* argv[], std::string argIdString) if (strncmp(argId, argv[i], idValSplit) == 0) return std::string(argv[i]).substr(idValSplit+1, strlen(argv[i])-(idValSplit+1)); } - - std::cout << "Missing argument!"; //the program exists if the value is 0 - std::cout << argIdString; - exit(0); + printf("Missing argument! %s", argIdString); //the program exists if the value is 0 + return std::string("") } bool doesArgExist(int argc, char* argv[], std::string argIdString) @@ -57,6 +55,15 @@ void copyFolderAndContents(std::string inUrl, std::string outUrl) std::filesystem::copy(inUrl, outUrl, opts); } +void checkForEmptyArguments() +{ + // I hate doing it like this + if (source.empty() || output.empty() || stat.empty() || siteWebUrl.empty() || blogTemplate.empty() || atomTemplate.empty()) + { + exit(0); + } +} + /* * -in="" // give source folder * -out="" // give output folder @@ -72,6 +79,7 @@ int main(int argc, char* argv[]) std::string blogTemplate = getArgValue(argc, argv, "-blogTemplate="); std::string atomTemplate = getArgValue(argc, argv, "-atomTemplate="); + checkForEmptyArguments() int flags = OptionFlags::NONE; if (doesArgExist(argc, argv, "-hide")) @@ -82,7 +90,7 @@ int main(int argc, char* argv[]) // pre-written pages and resources i.e. images copyFolderAndContents(stat, output); - std::cout << "Enjoy your website :)"; + printf("Enjoy your website :)"); } // TODO: nav sections :eww: