From 200db6da45b6808a68b65f7b6bd6f390778e80db Mon Sep 17 00:00:00 2001 From: Josh Spangler Date: Wed, 20 Nov 2019 19:28:38 -0500 Subject: [PATCH] More fruitless efforts on the calendar. I tried. #69 --- basic.html | 4 ++-- caleandar.js | 12 +++--------- main.js | 12 +++++------- planner.html | 14 ++++++++++++-- planner.js | 4 +++- planner2.js | 20 ++++++++++++++++++++ random.js | 2 +- 7 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 planner2.js diff --git a/basic.html b/basic.html index c3334d2..81f3780 100644 --- a/basic.html +++ b/basic.html @@ -66,7 +66,7 @@

RECIPE BOOK

} - + diff --git a/caleandar.js b/caleandar.js index 7ad5249..251e5d2 100644 --- a/caleandar.js +++ b/caleandar.js @@ -8,12 +8,6 @@ $( document ).ready(function() { caleandar(element, events, settings); }); -//document.getElementById('addEvent').addEventListener('click', function(){ -// ipcRenderer.send('addEvent', ''); -//}) - -//ipcRenderer.on - var Calendar = function(model, options, date){ // Default Values this.Options = { @@ -332,13 +326,13 @@ document.getElementById('addEvent').addEventListener('click', function(){ console.log("hello"); ipcRenderer.send('addEvent', ""); }) -*/ + ipcRenderer.on('addEvent', (event, arg) => { if(arg.length === 0){ var empty = document.createElement("P"); empty.innerHTML = "No recipes added yet"; document.form.appendChild(empty); -} + } else{ for(var i = 0; i < arg.length; i++){ var newRecipe = document.createElement("BUTTON"); @@ -346,4 +340,4 @@ ipcRenderer.on('addEvent', (event, arg) => { document.form.appendChild(newRecipe); } } -}) +})*/ diff --git a/main.js b/main.js index 321b075..6dde137 100644 --- a/main.js +++ b/main.js @@ -260,18 +260,16 @@ ipcMain.on('display_recipe', (event, arg, returnarr) => { display_recipe = arg; searcharr = returnarr; }) -/* -ipcMain.on('mealPlanner', (event, arg) => { + +ipcMain.on('Planner', (event, arg) => { var recipenames = []; RecipeMap.forEach(function (item, index){ recipenames.push(index); }) - for(var i = 0; i < recipenames.length(); i++){ - console.log(recipenames[i]); - } + event.sender.send('addEvent', recipenames); }) -*/ + ipcMain.on('display_recipe_ready', (event, arg) => { event.sender.send('random_recipe_return', display_recipe); }) @@ -280,4 +278,4 @@ ipcMain.on('redirect', (event) => { if(searcharr !== 0){ event.sender.send('recipe', searcharr); } -}) \ No newline at end of file +}) diff --git a/planner.html b/planner.html index d6b521e..c95640b 100644 --- a/planner.html +++ b/planner.html @@ -84,10 +84,20 @@
- +
+
+
+ Please select recipe to make on this day. + +
+
+
+ - + diff --git a/planner.js b/planner.js index 113a76e..e68bef9 100644 --- a/planner.js +++ b/planner.js @@ -1,4 +1,6 @@ //placeholder file for the js needed for meal planner const { ipcRenderer } = require('electron'); - +document.getElementById('mealPlanner').addEventListener('click', function(){ + ipcRenderer.send('Planner', ""); +}) diff --git a/planner2.js b/planner2.js new file mode 100644 index 0000000..2214bd1 --- /dev/null +++ b/planner2.js @@ -0,0 +1,20 @@ +const{ ipcRenderer } = require('electron'); +const{ remote } = require('electron'); +currWindow = remote.getCurrentWindow(); +window.$ = window.jQuery = require('jquery'); + +ipcRenderer.on('addEvent', (event, arg ) => { + console.log("in event function"); + if(arg.length === 0){ + var empty = document.createElement("div"); + empty.innerHTML = "No recipes added yet"; + document.form.appendChild(empty); + } + else{ + for(var i = 0; i < arg.length; i++){ + var newRecipe = document.createElement("div"); + newRecipe.innerHTML = arg[i]; + document.getElementById("buttons").appendChild(newRecipe); + } + } +}) diff --git a/random.js b/random.js index daf1b16..168f1d0 100644 --- a/random.js +++ b/random.js @@ -46,7 +46,7 @@ ipcRenderer.on('random_recipe_return', (event, arg ) => { prep.textContent = "Prep Time: " + arg.prep; course.textContent = "Course: " + arg.course; img.innerHTML = " ' - console.log(img); + //console.log(img); for(let i = 0; i < arg.ingredients.length; i++){ if(i == arg.ingredients.length - 1){