From 01911b5b5add2f64566cf1b8da271646157f73df Mon Sep 17 00:00:00 2001 From: JLP2000 Date: Wed, 16 Nov 2022 16:04:06 +0000 Subject: [PATCH 01/10] added comments --- server/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 6df486e..2526c1c 100644 --- a/server/app.js +++ b/server/app.js @@ -1,4 +1,4 @@ -const express = require("express"); +const express = require("express"); // install express const bodyParser = require("body-parser"); const searchRoutes = require("./routes/searchResults") const app = express(); @@ -19,4 +19,6 @@ app.listen(port, () => { app.use(bodyParser.json()); app.use("/searches", searchRoutes) + +// export app module.exports = app From c8b1ca811694a5d6658300fecd782612ecba9533 Mon Sep 17 00:00:00 2001 From: Adam-Dowsett <78181424+Adam-Dowsett@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:32:29 +0000 Subject: [PATCH 02/10] added new font --- client/style.css | 4 ++++ client/stylesearch.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/client/style.css b/client/style.css index 65ce950..c4d3978 100644 --- a/client/style.css +++ b/client/style.css @@ -1,3 +1,7 @@ +body { + font-family: Arial, Helvetica, sans-serif; +} + .nav { display: flex; justify-content: flex-end; diff --git a/client/stylesearch.css b/client/stylesearch.css index 78c88da..fba7b83 100644 --- a/client/stylesearch.css +++ b/client/stylesearch.css @@ -1,3 +1,7 @@ +body { + font-family: Arial, Helvetica, sans-serif; +} + .nav { display: flex; justify-content: space-between; From e4fa216a2e69ec4dfe3c428c8b3c0a20db7b365d Mon Sep 17 00:00:00 2001 From: Adam-Dowsett <78181424+Adam-Dowsett@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:42:26 +0000 Subject: [PATCH 03/10] Removed all of the pointless text in the html --- client/allSearches.html | 60 ++++++++++++++++++++--------------------- client/stylesearch.css | 2 ++ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/client/allSearches.html b/client/allSearches.html index 4b87a95..315765a 100644 --- a/client/allSearches.html +++ b/client/allSearches.html @@ -33,54 +33,54 @@
- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Lorem ipsum dolor sit amet consectetur adipisicing elit. Sint quisquam tenetur cum deserunt iste dicta vero blanditiis veritatis omnis illo quia quos minima exercitationem officiis laudantium, nulla consequatur officia. Inventore!

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

- URL -

Search 1

-

Search Des

+ +

+

diff --git a/client/stylesearch.css b/client/stylesearch.css index fba7b83..717bfd3 100644 --- a/client/stylesearch.css +++ b/client/stylesearch.css @@ -115,6 +115,8 @@ body { } .searchResults h2 { + font-weight:normal; + font-size: large; margin: 5px 0px; color: rgb(69, 69, 243); } From 77b895f9d3aae9248fd57828921156fc4a411172 Mon Sep 17 00:00:00 2001 From: Adam-Dowsett <78181424+Adam-Dowsett@users.noreply.github.com> Date: Thu, 17 Nov 2022 10:36:58 +0000 Subject: [PATCH 04/10] sorted the client folder and the buttons --- README.md | 0 client/allSearches.html | 12 ++++++------ client/googleImage.png | Bin 19790 -> 0 bytes client/homepage.html | 18 +++++++++--------- client/{ => images}/9dots.PNG | Bin client/{ => images}/googleImage.jpg | Bin client/{ => images}/searchicon.png | Bin client/{ => images}/settings.png | Bin client/{ => images}/teal_circle.png | Bin client/{ => styles}/style.css | 8 ++------ client/{ => styles}/stylesearch.css | 0 11 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 README.md delete mode 100644 client/googleImage.png rename client/{ => images}/9dots.PNG (100%) rename client/{ => images}/googleImage.jpg (100%) rename client/{ => images}/searchicon.png (100%) rename client/{ => images}/settings.png (100%) rename client/{ => images}/teal_circle.png (100%) rename client/{ => styles}/style.css (96%) rename client/{ => styles}/stylesearch.css (100%) diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/client/allSearches.html b/client/allSearches.html index 315765a..8e3d1a4 100644 --- a/client/allSearches.html +++ b/client/allSearches.html @@ -4,7 +4,7 @@ - + Google All Searches @@ -12,22 +12,22 @@ diff --git a/client/googleImage.png b/client/googleImage.png deleted file mode 100644 index 2fbba7a73c686782e915097791a0ec46d576e66f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19790 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 diff --git a/client/homepage.html b/client/homepage.html index 5814f0f..921218e 100644 --- a/client/homepage.html +++ b/client/homepage.html @@ -4,7 +4,7 @@ - + Google @@ -13,25 +13,25 @@ Gmail Images
- +
- +
- +
- +

-
- - -
+
+ + +
diff --git a/client/9dots.PNG b/client/images/9dots.PNG similarity index 100% rename from client/9dots.PNG rename to client/images/9dots.PNG diff --git a/client/googleImage.jpg b/client/images/googleImage.jpg similarity index 100% rename from client/googleImage.jpg rename to client/images/googleImage.jpg diff --git a/client/searchicon.png b/client/images/searchicon.png similarity index 100% rename from client/searchicon.png rename to client/images/searchicon.png diff --git a/client/settings.png b/client/images/settings.png similarity index 100% rename from client/settings.png rename to client/images/settings.png diff --git a/client/teal_circle.png b/client/images/teal_circle.png similarity index 100% rename from client/teal_circle.png rename to client/images/teal_circle.png diff --git a/client/style.css b/client/styles/style.css similarity index 96% rename from client/style.css rename to client/styles/style.css index c4d3978..457f1a8 100644 --- a/client/style.css +++ b/client/styles/style.css @@ -106,14 +106,10 @@ main form { .buttonContainer { display: flex; justify-content: center; - width: 100%; + width: 30%; column-gap: 10px; } .searchButton { width: 30%; -} - -.searchButton2 { - width: 139.22px; -} +} \ No newline at end of file diff --git a/client/stylesearch.css b/client/styles/stylesearch.css similarity index 100% rename from client/stylesearch.css rename to client/styles/stylesearch.css From 511f13eb7324eb45041bbd327e06f97de91ec9b5 Mon Sep 17 00:00:00 2001 From: JLP2000 Date: Thu, 17 Nov 2022 11:38:02 +0000 Subject: [PATCH 05/10] updated dataset and added findbyName function --- README.md | 15 +++++ client/js/search.js | 37 ++++++++++++ client/search.html | 103 +++++++++++++++++++++++++++++++++ server/data.js | 23 ++++---- server/models/searchResults.js | 10 ++++ server/routes/searchResults.js | 16 +++++ 6 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 README.md create mode 100644 client/js/search.js create mode 100644 client/search.html diff --git a/README.md b/README.md new file mode 100644 index 0000000..c7d0f47 --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# Google Clone Task + +## Installation and Usage + +### Installation +- Clone or Download this repo +- navigate to this folder + +### Usage +- In the server folder, run npm start to launch server +- Open the homepage.html with live server +- Press one of the two buttons to see results + +*** + diff --git a/client/js/search.js b/client/js/search.js new file mode 100644 index 0000000..001ff09 --- /dev/null +++ b/client/js/search.js @@ -0,0 +1,37 @@ +window.addEventListener("load", getResults) + +let datalength + +fetch("http://localhost:3000/searches") + .then((res) => res.json()) + .then(data => { + console.log(data.length) + datalength = data.length; + }) + + +function getResults(e) { + e.preventDefault(); + + for(let i = 1; i <= datalength; i++){ + let url = `http://localhost:3000/searches/${i}` + + fetch(url) + .then((res) => res.json()) + .then(data => { + + let searchResult = document.getElementById(`${i}`); + let a = searchResult.querySelector("a") + let h2 = searchResult.querySelector("h2") + let h2a = h2.querySelector("a") + let p = searchResult.querySelector("p") + + a.textContent = data.url; + a.setAttribute("href", data.url); + h2a.textContent = data.title; + h2a.setAttribute("href", data.url); + p.textContent = data.desc; + + }) + } +} diff --git a/client/search.html b/client/search.html new file mode 100644 index 0000000..2a993f4 --- /dev/null +++ b/client/search.html @@ -0,0 +1,103 @@ + + + + + + + + + Google All Searches + + + +
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ + + diff --git a/server/data.js b/server/data.js index bee6068..48fff29 100644 --- a/server/data.js +++ b/server/data.js @@ -1,14 +1,17 @@ const searchResults = [ - {id: 1, url: "https://theuselessweb.com/", title: "The Useless Web", desc: "The Useless Web... because some websites, we just couldn't do without - By Tim Holman - Read About The Sites - submit your own ..."}, - {id: 2, url: "https://www.youtube.com/", title: "Youtube", desc: "Enjoy the videos and music you love, upload original content, and share it all with friends, family, and the world on YouTube."}, - {id: 3, url: "https://www.whatsapp.com/", title: "WhatsApp", desc: "WhatsApp Messenger: More than 2 billion people in over 180 countries use WhatsApp to stay in touch with friends and family, anytime and anywhere."}, - {id: 4, url: "https://www.friv.com/", title: "Friv® | FRIV.COM : The Best Free Games! [Jogos | Juegos]", desc: "A safe place to play free online games and more on your desktop, mobile or tablet! No in-app purchases and no nagging! :)"}, - {id: 5, url: "https://www.amazon.co.uk", title: "Amazon.co.uk: Low Prices in Electronics, Books, Sports ...", desc: "Sign up to Amazon Prime for unlimited free delivery. Low prices at Amazon on ..."}, - {id: 6, url: "https://www.w3schools.com/", title: "W3Schools Online Web Tutorials", desc: "W3Schools is optimized for learning, testing, and training. Examples might be simplified to improve reading and basic understanding. Tutorials, references, and ..."}, - {id: 7, url: "https://www.riotgames.com/en", title: "Riot Games", desc: "Riot Games is the most player-focused game developer and publisher in the world. We published League of Legends in 2009, and have since released Teamfight ..."}, - {id: 8, url: "https://www.linkedin.com/", title: "LinkedIn: Log In or Sign Up", desc: "Sign up to Amazon Prime for unlimited free delivery. Low prices at Amazon on ..."}, - {id: 9, url: "https://github.com/", title: "GitHub: Let's build from here · GitHub", desc: "GitHub is where over 94 million developers shape the future of software, together. Contribute to the open source community, manage your Git repositories, ..."}, - {id: 10, url: "https://slack.com/intl/en-gb", title: "Slack is your digital HQ", desc: "In Slack, you've got all the flexibility to work when, where and how it's best for you. You can easily chat, send audio and video clips, or join a huddle to ..."} + {id: 1, name: "useless", url: "https://theuselessweb.com/", title: "The Useless Web", desc: "The Useless Web... because some websites, we just couldn't do without - By Tim Holman - Read About The Sites - submit your own ..."}, + {id: 2, name: "youtube", url: "https://www.youtube.com/", title: "Youtube", desc: "Enjoy the videos and music you love, upload original content, and share it all with friends, family, and the world on YouTube."}, + {id: 3, name: "whatsapp", url: "https://www.whatsapp.com/", title: "WhatsApp", desc: "WhatsApp Messenger: More than 2 billion people in over 180 countries use WhatsApp to stay in touch with friends and family, anytime and anywhere."}, + {id: 4, name: "friv", url: "https://www.friv.com/", title: "Friv® | FRIV.COM : The Best Free Games! [Jogos | Juegos]", desc: "A safe place to play free online games and more on your desktop, mobile or tablet! No in-app purchases and no nagging! :)"}, + {id: 5, name: "amazon", url: "https://www.amazon.co.uk", title: "Amazon.co.uk: Low Prices in Electronics, Books, Sports ...", desc: "Sign up to Amazon Prime for unlimited free delivery. Low prices at Amazon on ..."}, + {id: 6, name: "w3schools", url: "https://www.w3schools.com/", title: "W3Schools Online Web Tutorials", desc: "W3Schools is optimized for learning, testing, and training. Examples might be simplified to improve reading and basic understanding. Tutorials, references, and ..."}, + {id: 7, name: "riot", url: "https://www.riotgames.com/en", title: "Riot Games", desc: "Riot Games is the most player-focused game developer and publisher in the world. We published League of Legends in 2009, and have since released Teamfight ..."}, + {id: 8, name: "linkedin", url: "https://www.linkedin.com/", title: "LinkedIn: Log In or Sign Up", desc: "Sign up to Amazon Prime for unlimited free delivery. Low prices at Amazon on ..."}, + {id: 9, name: "github", url: "https://github.com/", title: "GitHub: Let's build from here · GitHub", desc: "GitHub is where over 94 million developers shape the future of software, together. Contribute to the open source community, manage your Git repositories, ..."}, + {id: 10, name: "slack", url: "https://slack.com/intl/en-gb", title: "Slack is your digital HQ", desc: "In Slack, you've got all the flexibility to work when, where and how it's best for you. You can easily chat, send audio and video clips, or join a huddle to ..."}, + {id: 11, name: "trains", url: "https://www.nationalrail.co.uk/", title: "National Rail Enquiries - Official source for UK train times and ...", desc: "The gateway to Britain's National Rail network. A portal into UK rail travel including train company information and promotions; train times; ..."}, + {id: 12, name: "trains", url: "https://www.thetrainline.com/", title: "Trainline : Search, Compare & Buy Cheap Train Tickets", desc: "The gateway to Britain's National Rail network. A portal into UK rail travel including train company information and promotions; train times; ..."}, + {id: 13, name: "trains", url: "https://www.lner.co.uk/", title: "LNER | London North Eastern Railway", desc: "Need train tickets? Book quickly and easily direct with LNER. Save 52% on LNER Advance tickets, and travel with confidence from start to finish!"}, ] module.exports = searchResults; diff --git a/server/models/searchResults.js b/server/models/searchResults.js index a1ff9d3..af74683 100644 --- a/server/models/searchResults.js +++ b/server/models/searchResults.js @@ -3,6 +3,7 @@ const searchResults = require("../data"); class Search{ constructor(data){ this.id = data.id; + this.name = data.name; this.url = data.url; this.title = data.title; this.desc = data.desc; @@ -21,6 +22,15 @@ class Search{ const search = new Search(searchID); return search; } + + static findByName(name){ + const searchName = searchResults.filter((searches) => searches.name === name)[0] + if(!name){ + return; + } + const search = new Search(searchName) + return search; + } } module.exports = Search; diff --git a/server/routes/searchResults.js b/server/routes/searchResults.js index 63fcb06..d9e9ceb 100644 --- a/server/routes/searchResults.js +++ b/server/routes/searchResults.js @@ -25,4 +25,20 @@ router.get('/:id', (req, res) => { } }) +router.get("/name/:name", (req, res) => { + try{ + const name = req.params.name; + const searchResult = Search.findByName(name); + if(!searchResult){ + throw new Error(`There are not results for ${name}`); + } + else{ + res.send(searchResult); + } + } catch(err) { + console.log(err); + res.status(404).send({message: err.message}) + } +}) + module.exports = router; From d5934cf711cb6ddea42a6ed2dec233efbe1e312c Mon Sep 17 00:00:00 2001 From: Adam-Dowsett <78181424+Adam-Dowsett@users.noreply.github.com> Date: Thu, 17 Nov 2022 11:39:32 +0000 Subject: [PATCH 06/10] added some stuff --- README.md | 0 client/allSearches.html | 4 ++-- client/homepage.html | 6 +++--- client/js/showOne.js | 14 +++++++++++--- server/models/searchResults.js | 11 ++++++++++- 5 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/client/allSearches.html b/client/allSearches.html index 8e3d1a4..6dd5300 100644 --- a/client/allSearches.html +++ b/client/allSearches.html @@ -12,11 +12,11 @@