Compare commits

...

5 commits

Author SHA1 Message Date
Robyn Vaughan-Williams
a33833875c Switched to printf, changed to using a function to check if any arguments are empty 2025-05-24 20:46:39 +01:00
Robyn Vaughan-Williams
8e3d1557a8 removed blog page template 2025-05-22 15:50:58 +01:00
Rosia E Evans
ba86b5bf9b edits gitinore 2025-05-22 15:42:31 +01:00
Rosia E Evans
a42d8c5477 removed unescessary navbar header, this should now be added in template 2025-05-22 15:42:00 +01:00
Rosia E Evans
fdff6eb23c adds new colour scheme 2025-05-22 12:54:53 +01:00
4 changed files with 15 additions and 11 deletions

4
.gitignore vendored
View file

@ -32,6 +32,6 @@
*.app
#CMake
build/
Resources/Output/
build/*
Resources/Output/*

View file

@ -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<Page*> pages, std::s
{
this->options = options;
std::string buffer;
buffer.append(navHeader);
buffer.append(generateCategories(sourceFolderUrl));
buffer = insertPagesIntoCategories(buffer, pages);
return buffer;

View file

@ -24,7 +24,6 @@ enum OptionFlags
class NavBarGenerator
{
private:
std::string navHeader = "\n<h1>Navigation</h1>\n\n";
int options;
std::string generateCategories(std::string rootFolderUrl);

View file

@ -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: