Revert "Merge branch 'master' into fix-404-error"

samscupoftea · samscupoftea · commit 0405d2c0535a · 2024-05-11T08:59:00.000+01:00
This reverts commit 552a6a3, reversing changes made to e1bc12f.
diff --git a/package.json b/package.json
@@ -1,8 +1,7 @@
 {
   "scripts": {
-    "start": "nodemon server.cjs",
-    "devStart": "nodemon server.cjs"
-
+    "start": "nodemon server.js",
+    "devStart": "nodemon server.js"
   },
   "dependencies": {
     "dotenv": "^16.4.5",
@@ -17,5 +16,4 @@
   "devDependencies": {
     "nodemon": "^3.1.0"
   }
-  
 }
diff --git a/public/index.css b/public/index.css
@@ -9,15 +9,6 @@
   --black: rgb(67, 63, 63);
 }
 
-
-.fa-paper-plane {
-  background: white;
- 
-}
-
-
-
-
 .parent-container {
   height: 100vh;
   width: 100vw;
@@ -110,14 +101,6 @@ h1 {
   margin-top: 80px;
 }
 
-
-.user-img {
-  height: 200px;
-  width: 200px;
-}
-
-
-
 .want-another-recipe,
 button {
   text-transform: uppercase;
@@ -135,15 +118,9 @@ button {
   margin: auto;
 }
 
-
 .email-section {
   width: 200px;
   display: none;
-
-
-.grid {
-  /* display: grid; */
-
   grid-template-columns: 2fr 1fr;
   gap: 1rem;
   margin:auto
@@ -159,11 +136,9 @@ button {
   background-color: var(--green);
   transition: background-color 0.5s ease;
   display: block;
-
   margin: auto;
   margin-top: 20px;
   width: fit-content;
-
 }
 
 .gpt-response {
@@ -237,7 +212,6 @@ input:checked + .slider:before {
   transform: translateX(26px);
 }
 
-
 /* Rounded sliders */
 .slider.round {
   border-radius: 34px;
@@ -249,11 +223,6 @@ input:checked + .slider:before {
 
 /* Loading indicator */
 
-#user-text {
-  display: none;
-}
-r
-
 #loading-container {
   display: none;
   margin-bottom: 1em;
@@ -277,6 +246,9 @@ r
   text-align: center;
 }
 
+.off {
+  display: none;
+}
 
 .legend {
   /* background: var(--green) */
diff --git a/public/index.html b/public/index.html
@@ -54,22 +54,12 @@ <h1 aria-label="app text" class="headline">
           />
           <label for="other-dietary-requirements">other</label>
           <input
-
             id="user-text"
             type="text"
             class="dietary-requirements off"
             value=""
             name="what_are_user_other_dietary_requirements"
             placeholder="I don't eat:"
-
-          id="user-text"
-          type="text"
-          class="dietary-requirements"
-          value=""
-          name="what_are_user_other_dietary_requirements"
-          placeholder="I don't eat:"
-          
-
           />
         </fieldset>
 
@@ -107,19 +97,6 @@ <h1 aria-label="app text" class="headline">
           <div id="loading-indicator"></div>
           <h3 id="loading-text">Creating Recipe...</h3>
         </div>
-
-        <section
-          aria-label="gpt-response"
-          class="gpt-response preserve-line-breaks"
-        ></section>
-        <button class="want-another-recipe">I want another recipe</button>
-        <button  class="send-recipe-to-user-inbox" name="do_we_email_user" value="false">send recipe to my inbox</button>
-        <section class="email-section">
-          <input type="email" id="user-email" class="" name="user_email_address" placeholder="sophie@example.com">
-          <i class="fa fa-paper-plane" aria-hidden="true" fa-lg ></i>
-          <!-- <button class="send-email-btn">send</button> -->
-        </section>
-
         
       
 
@@ -153,10 +130,6 @@ <h3 id="loading-text">Creating Recipe...</h3>
         
       </div>
     </div>
-    <!-- <script src="index.js"></script> -->
-    <script type="module" src="index.js"></script>
-   
-
-    
+    <script src="index.js"></script>
   </body>
 </html>
diff --git a/public/index.js b/public/index.js
@@ -88,7 +88,6 @@ let errorMessage = `
 
 tryAgainBtn.style.display = "none";
 
-
 function createQuery(myObject) {
   let esc = encodeURIComponent;
   let query = Object.keys(myObject)
@@ -97,8 +96,6 @@ function createQuery(myObject) {
   return query;
 }
 
-
-
 function loopOverArrayOfElements(array, display) {
   array.forEach((elememt) => {
     elememt.style.display = display;
@@ -206,8 +203,8 @@ paperPlane.addEventListener("click", () => {
 recipeButtons.forEach((button) => {
   console.log(userText.value);
   button.addEventListener("click", async () => {
-    // recipeTextLoaded = false; undefined
-    // recipeImageLoaded = false; undefined
+    recipeTextLoaded = false;
+    recipeImageLoaded = false;
 
     let userRecipe = {
       [button.name]: button.value,
@@ -243,9 +240,7 @@ recipeButtons.forEach((button) => {
       .catch((error) => {
         console.error("Error", error);
       });
-
     fetch(`/openai?${createQuery(userRecipe)}`)
-
       .then((response) => response.json())
       .then((data) => {
         // CREATE IMAGE PROMISE
diff --git a/public/url_folder/url_folder.txt b/public/url_folder/url_folder.txt
diff --git a/server.js b/server.js
@@ -1,13 +1,9 @@
 const express = require("express");
-const fs = require("fs");
-const nodemailer = require("nodemailer");
+var nodemailer = require("nodemailer");
+require("dotenv").config();
 const { OpenAI } = require("openai");
 const app = express();
 const bodyParser = require("body-parser");
-const path = require("path");
-require("dotenv").config();
-let doubleResponse;
-
 app.use(bodyParser.json());
 app.post("/server.js", (req, res) => {
   const dishCountry = req.body.recipe_country_of_origin;
@@ -19,6 +15,9 @@ app.post("/server.js", (req, res) => {
 const openai = new OpenAI({
   apiKey: process.env.openaiAPI,
 });
+
+let doubleResponse;
+
 app.get("/email", async (req, res) => {
   var transporter = nodemailer.createTransport({
     service: process.env.service,
@@ -28,49 +27,16 @@ app.get("/email", async (req, res) => {
     },
   });
 
-  const folderPath = path.join(__dirname, "./public/url_folder");
-  const url = doubleResponse.image.data[0].url;
-  const filePath = path.join(folderPath, "url_folder.txt");
-  fs.writeFileSync(filePath, url);
-
-  const emailDocument = `
-    <html>
-      <head>
-        <style>
-          .preserve-line-breaks {
-            white-space: pre-line
-          }
-          .user-img {
-            width: 200px;
-            height: 200px;
-          }
-        </style>
-      </head>
-      <body class="preserve-line-breaks" >
-        ${doubleResponse.text.choices[0].message.content}
-        <br />
-         Embedded image:
-        <br /> 
-        <img class="user-img" src="${url}"/>
-      </body>
-    </html>
-  `;
-
-  var mailOptions = {
-    from: process.env.from,
-    to: req.query.user_email_address,
-    subject: "Your recipe from recipe-for-success dynamic app",
-    html: emailDocument,
-    attachments: [
-      {
-        filename: "url_folder.txt",
-        path: path.join(__dirname, "/public/url_folder/url_folder.txt"),
-        cid: "url",
-      },
-    ],
-  };
-
-  console.log(mailOptions)
+  if (doubleResponse && doubleResponse.text && doubleResponse.text.choices) {
+    var mailOptions = {
+      from: process.env.from,
+      to: req.query.user_email_address,
+      subject: "Your recipe from recipe-for-success dynamic app",
+      text: doubleResponse.text.choices[0].message.content,
+    };
+  } else {
+    console.log("doubleResponse is not defined yet.");
+  }
 
   transporter.sendMail(mailOptions, function (error, info) {
     if (error) {
@@ -91,20 +57,19 @@ app.get("/openai", async (req, res) => {
       {
         user_otherdietary_requirements:
           req.query.what_are_user_other_dietary_requirements,
-      },
-      { I_do_not_eat: req.query.I_do_not_eat }
+      }
     );
 
     const prompt = `Provide a recipe for a dish from ${
       req.query.recipe_country_of_origin
     }, taking into account the fact that I'm ${
       req.query.is_lactose_intolerant === "true"
-        ? "lactose intolerant,"
-        : "not lactose intolerant,"
-    } ${req.query.is_vegan === "true" ? "I'm vegan" : "I'm not vegan"} and ${
+        ? "lactose intolerant"
+        : "not lactose intolerant"
+    } ${req.query.is_vegan === "true" ? "vegan" : "not vegan"} and ${
       req.query.what_are_user_other_dietary_requirements === ""
         ? "I have no other dietary requirements"
-        : `${req.query.I_do_not_eat}${req.query.what_are_user_other_dietary_requirements}`
+        : req.query.what_are_user_other_dietary_requirements
     } `;
 
     console.log(prompt);
@@ -130,7 +95,6 @@ app.get("/openai", async (req, res) => {
       text: completion,
       image: imageResponse,
     };
-    console.log(doubleResponse.text.choices);
     res.json(doubleResponse);
   } catch (error) {
     console.error("An error occurred:", error.message);

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"scripts": {`
`3`		`- "start": "nodemon server.cjs",`
`4`		`- "devStart": "nodemon server.cjs"`
`5`		`-`
	`3`	`+ "start": "nodemon server.js",`
	`4`	`+ "devStart": "nodemon server.js"`
`6`	`5`	`},`
`7`	`6`	`"dependencies": {`
`8`	`7`	`"dotenv": "^16.4.5",`
`@@ -17,5 +16,4 @@`
`17`	`16`	`"devDependencies": {`
`18`	`17`	`"nodemon": "^3.1.0"`
`19`	`18`	`}`
`20`		`-`
`21`	`19`	`}`