diff options
| author | scottj <jones.scott0391@gmail.com> | 2021-08-21 13:35:16 -0700 |
|---|---|---|
| committer | scottj <jones.scott0391@gmail.com> | 2021-08-21 13:35:16 -0700 |
| commit | 91f7b11cbd375165e0cb19db5a4951678f354995 (patch) | |
| tree | 7aac15562379a7f5f9d30fdbf955b7326fad8f94 | |
| parent | c3011d75e8abd6c4665dc94447f7a6b5df3ca49a (diff) | |
changed file structure so html files are generated into main root folder
| -rw-r--r-- | about.html (renamed from output/about.html) | 10 | ||||
| -rw-r--r-- | banana-muffins.md.html (renamed from output/banana-muffins.md.html) | 10 | ||||
| -rwxr-xr-x | bin/build_about | 2 | ||||
| -rwxr-xr-x | bin/build_index | 2 | ||||
| -rwxr-xr-x | bin/build_recipe_directory | 2 | ||||
| -rw-r--r-- | build-files/build_posts.rb | 2 | ||||
| -rw-r--r-- | content/main-pages/about.md | 2 | ||||
| -rw-r--r-- | content/main-pages/index.md | 8 | ||||
| -rw-r--r-- | content/main-pages/recipes.md | 8 | ||||
| -rw-r--r-- | content/posts/banana-muffins.md | 2 | ||||
| -rw-r--r-- | content/posts/maple-bread.md | 2 | ||||
| -rw-r--r-- | index.html (renamed from output/index.html) | 16 | ||||
| -rw-r--r-- | maple-bread.md.html (renamed from output/maple-bread.md.html) | 10 | ||||
| -rw-r--r-- | output/.gitkeep | 0 | ||||
| -rw-r--r-- | partials/footer.html.erb | 2 | ||||
| -rw-r--r-- | partials/head.html.erb | 4 | ||||
| -rw-r--r-- | partials/header.html.erb | 2 | ||||
| -rw-r--r-- | recipes.html (renamed from output/recipes.html) | 16 |
18 files changed, 50 insertions, 50 deletions
diff --git a/output/about.html b/about.html index 4fb6ec2..d53022a 100644 --- a/output/about.html +++ b/about.html @@ -2,14 +2,14 @@ <html> <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> <body> <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> @@ -20,7 +20,7 @@ <div class="content"> <h1>About</h1> <div class="image-and-text"> - <img src="../images/placeholder/home3.jpg" class="image" /> + <img src="images/placeholder/home3.jpg" class="image" /> <div class="text"> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et @@ -37,7 +37,7 @@ </div> <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> diff --git a/output/banana-muffins.md.html b/banana-muffins.md.html index 5dd7644..9319fb2 100644 --- a/output/banana-muffins.md.html +++ b/banana-muffins.md.html @@ -2,14 +2,14 @@ <html> <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> <body> <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> @@ -22,7 +22,7 @@ <div class="image-and-text"> -<img src="../images/recipe-images/banana-muffin.JPG" class="image"> +<img src="images/recipe-images/banana-muffin.JPG" class="image"> <div class="text"> @@ -76,7 +76,7 @@ For Loaf bake approx 50-60 minutes.</p> </div> <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> diff --git a/bin/build_about b/bin/build_about index da7cda8..e79ac4a 100755 --- a/bin/build_about +++ b/bin/build_about @@ -1,3 +1,3 @@ #!/usr/bin/env bash -ruby build-files/build_about.rb > output/about.html +ruby build-files/build_about.rb > about.html diff --git a/bin/build_index b/bin/build_index index 12b2e5a..840ab64 100755 --- a/bin/build_index +++ b/bin/build_index @@ -1,3 +1,3 @@ #!/usr/bin/env bash -ruby build-files/build_index.rb > output/index.html +ruby build-files/build_index.rb > index.html diff --git a/bin/build_recipe_directory b/bin/build_recipe_directory index caefbb2..6a76626 100755 --- a/bin/build_recipe_directory +++ b/bin/build_recipe_directory @@ -1,3 +1,3 @@ #!/usr/bin/env bash -ruby build-files/build_recipe_directory.rb > output/recipes.html +ruby build-files/build_recipe_directory.rb > recipes.html diff --git a/build-files/build_posts.rb b/build-files/build_posts.rb index ec03b77..eead269 100644 --- a/build-files/build_posts.rb +++ b/build-files/build_posts.rb @@ -19,7 +19,7 @@ def filename file = Array.new Dir.foreach("./content/posts") do |post_filename| if post_filename.include?("md") - file.push("output/#{post_filename}.html") + file.push("#{post_filename}.html") end end return file diff --git a/content/main-pages/about.md b/content/main-pages/about.md index fd048f8..00e5577 100644 --- a/content/main-pages/about.md +++ b/content/main-pages/about.md @@ -1,7 +1,7 @@ <div class="content"> <h1>About</h1> <div class="image-and-text"> - <img src="../images/placeholder/home3.jpg" class="image"> + <img src="images/placeholder/home3.jpg" class="image"> <div class="text"> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et diff --git a/content/main-pages/index.md b/content/main-pages/index.md index e04e393..7acf309 100644 --- a/content/main-pages/index.md +++ b/content/main-pages/index.md @@ -3,13 +3,13 @@ <div class="slideshow-container"> <!-- Full-width images with rounded edges --> <div class="slides"> - <img src="../images/recipe-images/bread-3.JPG" style="width:100%; border-radius:20px;"> + <img src="images/recipe-images/bread-3.JPG" style="width:100%; border-radius:20px;"> </div> <div class="slides"> - <img src="../images/recipe-images/banana-muffin.JPG" style="width:100%; border-radius:20px;"> + <img src="images/recipe-images/banana-muffin.JPG" style="width:100%; border-radius:20px;"> </div> <div class="slides"> - <img src="../images/placeholder/home3.jpg" style="width:100%; border-radius:20px;"> + <img src="images/placeholder/home3.jpg" style="width:100%; border-radius:20px;"> </div> </div> <!-- The dots/circles --> @@ -23,7 +23,7 @@ <p>Explore Recipes</p> </a> <a class="button" id="contact" href="mailto:scott@pantryofplants.ca"> - <p>Contact <img src="../images/mail.svg" class="mail-1"></p> + <p>Contact <img src="images/mail.svg" class="mail-1"></p> </a> </div> </div>
\ No newline at end of file diff --git a/content/main-pages/recipes.md b/content/main-pages/recipes.md index bb6bcad..fdcd691 100644 --- a/content/main-pages/recipes.md +++ b/content/main-pages/recipes.md @@ -19,10 +19,10 @@ names[3] = "<p>Maple Bread</p>"; //recipe image links - images[0] = '<img src="../images/recipe-images/banana-muffin.JPG">'; - images[1] = '<img src="../images/recipe-images/bread-3.JPG">'; - images[2] = '<img src="../images/recipe-images/bread-3.JPG">'; - images[3] = '<img src="../images/recipe-images/bread-3.JPG">'; + images[0] = '<img src="images/recipe-images/banana-muffin.JPG">'; + images[1] = '<img src="images/recipe-images/bread-3.JPG">'; + images[2] = '<img src="images/recipe-images/bread-3.JPG">'; + images[3] = '<img src="images/recipe-images/bread-3.JPG">'; //recipe hrefs links[0] = '<a href="banana-muffins.md.html"</a>'; diff --git a/content/posts/banana-muffins.md b/content/posts/banana-muffins.md index 096a4f1..4174479 100644 --- a/content/posts/banana-muffins.md +++ b/content/posts/banana-muffins.md @@ -3,7 +3,7 @@ <div markdown=1 class="image-and-text"> {::nomarkdown} -<img src="../images/recipe-images/banana-muffin.JPG" class="image"> +<img src="images/recipe-images/banana-muffin.JPG" class="image"> {:/} <div markdown=1 class="text"> diff --git a/content/posts/maple-bread.md b/content/posts/maple-bread.md index 7544047..0bc43b6 100644 --- a/content/posts/maple-bread.md +++ b/content/posts/maple-bread.md @@ -3,7 +3,7 @@ <div markdown=1 class="image-and-text"> {::nomarkdown} -<img src="../images/recipe-images/bread-3.jpg" class="image"> +<img src="images/recipe-images/bread-3.jpg" class="image"> {:/} <div markdown=1 class="text"> diff --git a/output/index.html b/index.html index 401eb25..942e777 100644 --- a/output/index.html +++ b/index.html @@ -2,14 +2,14 @@ <html> <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> <body> <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> @@ -22,13 +22,13 @@ <div class="slideshow-container"> <!-- Full-width images with rounded edges --> <div class="slides"> - <img src="../images/recipe-images/bread-3.JPG" style="width:100%; border-radius:20px;" /> + <img src="images/recipe-images/bread-3.JPG" style="width:100%; border-radius:20px;" /> </div> <div class="slides"> - <img src="../images/recipe-images/banana-muffin.JPG" style="width:100%; border-radius:20px;" /> + <img src="images/recipe-images/banana-muffin.JPG" style="width:100%; border-radius:20px;" /> </div> <div class="slides"> - <img src="../images/placeholder/home3.jpg" style="width:100%; border-radius:20px;" /> + <img src="images/placeholder/home3.jpg" style="width:100%; border-radius:20px;" /> </div> </div> <!-- The dots/circles --> @@ -42,13 +42,13 @@ <p>Explore Recipes</p> </a> <a class="button" id="contact" href="mailto:scott@pantryofplants.ca"> - <p>Contact <img src="../images/mail.svg" class="mail-1" /></p> + <p>Contact <img src="images/mail.svg" class="mail-1" /></p> </a> </div> </div> <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> diff --git a/output/maple-bread.md.html b/maple-bread.md.html index 3d02bd1..0b82d8c 100644 --- a/output/maple-bread.md.html +++ b/maple-bread.md.html @@ -2,14 +2,14 @@ <html> <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> <body> <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> @@ -22,7 +22,7 @@ <div class="image-and-text"> -<img src="../images/recipe-images/bread-3.jpg" class="image"> +<img src="images/recipe-images/bread-3.jpg" class="image"> <div class="text"> @@ -61,7 +61,7 @@ </div> <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> diff --git a/output/.gitkeep b/output/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/output/.gitkeep +++ /dev/null diff --git a/partials/footer.html.erb b/partials/footer.html.erb index 1853f01..927f14e 100644 --- a/partials/footer.html.erb +++ b/partials/footer.html.erb @@ -1,4 +1,4 @@ <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> diff --git a/partials/head.html.erb b/partials/head.html.erb index 54a1636..8d4f1d3 100644 --- a/partials/head.html.erb +++ b/partials/head.html.erb @@ -1,5 +1,5 @@ <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> diff --git a/partials/header.html.erb b/partials/header.html.erb index efe40c9..d967ae2 100644 --- a/partials/header.html.erb +++ b/partials/header.html.erb @@ -1,6 +1,6 @@ <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> diff --git a/output/recipes.html b/recipes.html index d6ba0a6..573d390 100644 --- a/output/recipes.html +++ b/recipes.html @@ -2,14 +2,14 @@ <html> <head> <title>Pantry of Plants</title> - <link rel="stylesheet" href="../style/style.css"> - <script src="../scripts/image-slide.js" defer></script> + <link rel="stylesheet" href="style/style.css"> + <script src="scripts/image-slide.js" defer></script> </head> <body> <header> <nav> - <a href="index.html"><img src="../images/pantry-of-plants-logo.png" class="logo"></a> + <a href="index.html"><img src="images/pantry-of-plants-logo.png" class="logo"></a> <div class="nav-text-outer"> <a href="recipes.html" class="nav-text">Recipes</a> <a href="about.html" class="nav-text">About</a> @@ -39,10 +39,10 @@ names[3] = "<p>Maple Bread</p>"; //recipe image links - images[0] = '<img src="../images/recipe-images/banana-muffin.JPG">'; - images[1] = '<img src="../images/recipe-images/bread-3.JPG">'; - images[2] = '<img src="../images/recipe-images/bread-3.JPG">'; - images[3] = '<img src="../images/recipe-images/bread-3.JPG">'; + images[0] = '<img src="images/recipe-images/banana-muffin.JPG">'; + images[1] = '<img src="images/recipe-images/bread-3.JPG">'; + images[2] = '<img src="images/recipe-images/bread-3.JPG">'; + images[3] = '<img src="images/recipe-images/bread-3.JPG">'; //recipe hrefs links[0] = '<a href="banana-muffins.md.html"</a>'; @@ -89,7 +89,7 @@ </div> <footer> - <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="../images/mail.svg" class="mail-2"></a> + <a href="mailto:scott@pantryofplants.ca" class="mail">Contact: scott@pantryofplants.ca <img src="images/mail.svg" class="mail-2"></a> <p>© 2021 Pantry of Plants</p> </footer> |