Skip to content

Commit c577c24

Browse files
committed
Did some minor changes in the application
1 parent 54cd934 commit c577c24

File tree

11 files changed

+29
-27
lines changed

11 files changed

+29
-27
lines changed

app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ app.use(express.static("public"));
1515

1616
const apiKey = "f8f19f5552fe4a64a5bd79038933bb05";
1717

18-
// All the get request to render differrent page.
18+
// All the get request to render different page.
1919

2020
app.get("/", (req, res) => {
2121
res.render("home");
@@ -122,7 +122,7 @@ app.post("/ingredientList", async (req, res) => {
122122

123123
// res.send(recipesWithNutrients);
124124
} catch (error) {
125-
res.send(error);
125+
res.send("Sorry! Some error occurred. Please try again!");
126126
console.log(error);
127127
}
128128
});
@@ -166,7 +166,7 @@ app.post("/randomList", async (req, res) => {
166166
recipes: recipesWithNutrients,
167167
});
168168
} catch (error) {
169-
res.send(error);
169+
res.send("Sorry! Some error occurred. Please try again!");
170170
console.log(error);
171171
}
172172
});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Meal Planning Web App",
55
"main": "server.js",
66
"scripts": {
7-
"start": "nodemon server.js"
7+
"start": "node server.js"
88
},
99
"repository": {
1010
"type": "git",

public/css/styles.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
body * {
2-
font-family: 'Montserrat', sans-serif;
3-
}
2+
font-family: "Montserrat", sans-serif;
3+
}

views/home.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link rel="preconnect" href="https://fonts.googleapis.com">
99
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1010
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
@@ -18,7 +18,7 @@
1818
<!--nav-->
1919
<nav x-data="{show:false}" class="flex items-center justify-between flex-wrap bg-orange-600 p-6">
2020
<div class="flex items-center flex-shrink-0 text-white mr-6">
21-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
21+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
2222
</div>
2323
<div class="block md:hidden">
2424
<button @click="show=!show" class="flex items-center px-3 py-2 border rounded text-gray-100 border-gray-200 hover:text-white hover:border-white">
@@ -38,7 +38,7 @@
3838
<!-- Col -->
3939
<div
4040
class="w-full h-auto bg-gray-400 hidden lg:block lg:w-5/12 bg-cover rounded-l-lg"
41-
style="background-image: url('images/food.png')"
41+
style="background-image: url('/images/food.png')"
4242
></div>
4343
<!-- Col -->
4444
<div class="w-full lg:w-7/12 bg-white p-5 rounded-lg lg:rounded-l-none">

views/inputIngredient.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link
99
href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
1010
rel="stylesheet"
1111
/>
12-
<link href="css/styles.css" rel="stylesheet" />
12+
<link href="/css/styles.css" rel="stylesheet" />
1313
</head>
1414

1515
<body class="font-mono bg-gray-400">
@@ -19,7 +19,7 @@
1919
class="flex items-center justify-between flex-wrap bg-orange-600 p-6"
2020
>
2121
<div class="flex items-center flex-shrink-0 text-white mr-6">
22-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
22+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
2323
</div>
2424
<div class="block md:hidden">
2525
<button

views/inputRandom.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link
99
href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
1010
rel="stylesheet"
1111
/>
12-
<link href="css/styles.css" rel="stylesheet" />
12+
<link href="/css/styles.css" rel="stylesheet" />
1313
</head>
1414

1515
<body class="font-mono bg-gray-400">
@@ -19,7 +19,7 @@
1919
class="flex items-center justify-between flex-wrap bg-orange-600 p-6"
2020
>
2121
<div class="flex items-center flex-shrink-0 text-white mr-6">
22-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
22+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
2323
</div>
2424
<div class="block md:hidden">
2525
<button

views/inputWeekPlanMeals.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
9-
<link href="css/styles.css" rel="stylesheet">
9+
<link href="/css/styles.css" rel="stylesheet">
1010
</head>
1111

1212
<body class="font-mono bg-gray-400">
@@ -15,7 +15,7 @@
1515
<!--nav-->
1616
<nav x-data="{show:false}" class="flex items-center justify-between flex-wrap bg-orange-600 p-6">
1717
<div class="flex items-center flex-shrink-0 text-white mr-6">
18-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
18+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
1919
</div>
2020
<div class="block md:hidden">
2121
<button @click="show=!show" class="flex items-center px-3 py-2 border rounded text-gray-100 border-gray-200 hover:text-white hover:border-white">

views/planMeals.ejs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
99
<link href="/css/styles.css" rel="stylesheet">
1010
<style>
@@ -26,7 +26,7 @@
2626
<body class="font-mono bg-gray-400">
2727
<nav x-data="{show:false}" class="flex items-center justify-between flex-wrap bg-orange-600 p-6">
2828
<div class="flex items-center flex-shrink-0 text-white mr-6">
29-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
29+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
3030
</div>
3131
<div class="block md:hidden">
3232
<button @click="show=!show" class="flex items-center px-3 py-2 border rounded text-gray-100 border-gray-200 hover:text-white hover:border-white">
@@ -222,13 +222,15 @@
222222
></script>
223223

224224
<script>
225+
useCORS: true;
225226
window.onload = function () {
226227
const btn = document.getElementById("downloadBtn");
227228
btn.addEventListener("click", () => {
228229
const menu = this.document.getElementById("result");
229230
const options = {
230231
filename: "menu.pdf",
231232
image: { type: "jpeg", quality: 0.98 },
233+
html2canvas: { scale: 2, useCORS: true },
232234
jsPDF: { format: "letter", orientation: "landscape" },
233235
};
234236
html2pdf().from(menu).set(options).save();

views/planMealsByIngredients.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link
99
href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
1010
rel="stylesheet"
@@ -33,7 +33,7 @@
3333
class="flex items-center justify-between flex-wrap bg-orange-600 p-6"
3434
>
3535
<div class="flex items-center flex-shrink-0 text-white mr-6">
36-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
36+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
3737
</div>
3838
<div class="block md:hidden">
3939
<button

views/randomMeals.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Meal Planning App</title>
7+
<title>FoodMeets</title>
88
<link
99
href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
1010
rel="stylesheet"
@@ -33,7 +33,7 @@
3333
class="flex items-center justify-between flex-wrap bg-orange-600 p-6"
3434
>
3535
<div class="flex items-center flex-shrink-0 text-white mr-6">
36-
<span class="font-semibold text-xl tracking-tight">Plan Your Meal</span>
36+
<span class="font-semibold text-xl tracking-tight">FoodMeets</span>
3737
</div>
3838
<div class="block md:hidden">
3939
<button

0 commit comments

Comments
 (0)