Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
More fruitless efforts on the calendar. I tried. #69
Browse files Browse the repository at this point in the history
  • Loading branch information
jspangl3 committed Nov 21, 2019
1 parent d44db6d commit 200db6d
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 22 deletions.
4 changes: 2 additions & 2 deletions basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1>RECIPE BOOK</h1>

}
</script>
<!--<script>
<script>
require('./planner.js');
</script>-->
</script>
</html>
12 changes: 3 additions & 9 deletions caleandar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -332,18 +326,18 @@ 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");
newRecipe.innerHTML = arg[i];
document.form.appendChild(newRecipe);
}
}
})
})*/
12 changes: 5 additions & 7 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
Expand All @@ -280,4 +278,4 @@ ipcMain.on('redirect', (event) => {
if(searcharr !== 0){
event.sender.send('recipe', searcharr);
}
})
})
14 changes: 12 additions & 2 deletions planner.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,20 @@
<br>
</center>
</form>
<button class="button" id="addEvent">Add a meal</button>
<div id="buttons">
</div>
<center>
<font color="white">Please select recipe to make on this day.</font>

</center>
<br>
<br>
<button class="button" id="addEvent">Add this meal</button>
<button class="button" onclick="location.href='basic.html'">Back</button>
</body>


<script>
require('./planner2.js');
</script>

</html>
4 changes: 3 additions & 1 deletion planner.js
Original file line number Diff line number Diff line change
@@ -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', "");
})
20 changes: 20 additions & 0 deletions planner2.js
Original file line number Diff line number Diff line change
@@ -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);
}
}
})
2 changes: 1 addition & 1 deletion random.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ipcRenderer.on('random_recipe_return', (event, arg ) => {
prep.textContent = "Prep Time: " + arg.prep;
course.textContent = "Course: " + arg.course;
img.innerHTML = "<img src = images/" + arg.img + ' width="512" height="360"> </img>'
console.log(img);
//console.log(img);

for(let i = 0; i < arg.ingredients.length; i++){
if(i == arg.ingredients.length - 1){
Expand Down

0 comments on commit 200db6d

Please sign in to comment.