From eb5f2c2f375c63b73412a1207bfed6862934358e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 May 2021 21:27:05 -0700 Subject: [PATCH 01/13] code split search route, added notifications and small changes --- client/.eslintcache | 2 +- client/public/OneSignalSDKUpdaterWorker.js | 1 + client/public/OneSignalSDKWorker.js | 1 + client/public/index.html | 14 ++- .../ComparisonSearch/ComparisonSearch.jsx | 8 +- .../images/frontpage-mobile.webp | Bin 11630 -> 14674 bytes .../components/SearchModal/SearchModal.jsx | 8 +- client/src/pages/Homepage/Homepage.jsx | 2 +- client/src/pages/Homepage/Images/Logo.png | Bin 38528 -> 0 bytes client/src/pages/Homepage/Images/SALE.png | Bin 27481 -> 0 bytes .../pages/PriceComparison/PriceComparison.jsx | 4 +- config/env.config | 4 +- routes/index.js | 114 +----------------- routes/search.js | 111 +++++++++++++++++ server.js | 1 + 15 files changed, 141 insertions(+), 129 deletions(-) create mode 100644 client/public/OneSignalSDKUpdaterWorker.js create mode 100644 client/public/OneSignalSDKWorker.js delete mode 100644 client/src/pages/Homepage/Images/Logo.png delete mode 100644 client/src/pages/Homepage/Images/SALE.png create mode 100644 routes/search.js diff --git a/client/.eslintcache b/client/.eslintcache index 338a6f9..331dad6 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":314,"mtime":1620098128878,"results":"20","hashOfConfig":"21"},{"size":2071,"mtime":1621395360184,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621314572789,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621313643423,"results":"25","hashOfConfig":"21"},{"size":9460,"mtime":1621571686932,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621312773067,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1620706604814,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621394088757,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1620506859429,"results":"30","hashOfConfig":"21"},{"size":3486,"mtime":1621713245126,"results":"31","hashOfConfig":"21"},{"size":8967,"mtime":1621572145513,"results":"32","hashOfConfig":"21"},{"size":23055,"mtime":1621392341975,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1620416560808,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621394200122,"results":"35","hashOfConfig":"21"},{"size":17234,"mtime":1621570736674,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621659277355,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621565176242,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621572150528,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"wvdc2a",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9460,"mtime":1621877825530,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3535,"mtime":1622088018507,"results":"31","hashOfConfig":"21"},{"size":8962,"mtime":1622088091571,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":17232,"mtime":1622083095134,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/public/OneSignalSDKUpdaterWorker.js b/client/public/OneSignalSDKUpdaterWorker.js new file mode 100644 index 0000000..720b1d7 --- /dev/null +++ b/client/public/OneSignalSDKUpdaterWorker.js @@ -0,0 +1 @@ +importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); diff --git a/client/public/OneSignalSDKWorker.js b/client/public/OneSignalSDKWorker.js new file mode 100644 index 0000000..720b1d7 --- /dev/null +++ b/client/public/OneSignalSDKWorker.js @@ -0,0 +1 @@ +importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); diff --git a/client/public/index.html b/client/public/index.html index 96c5ebe..289c00c 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -16,7 +16,17 @@ -
-
+
+ + + + diff --git a/client/src/components/ComparisonSearch/ComparisonSearch.jsx b/client/src/components/ComparisonSearch/ComparisonSearch.jsx index 35bcf9b..99a1002 100644 --- a/client/src/components/ComparisonSearch/ComparisonSearch.jsx +++ b/client/src/components/ComparisonSearch/ComparisonSearch.jsx @@ -35,8 +35,8 @@ const ComparisonSearch = () => { <>
-
-
+
+
Compare cosmetic price's across major brands.
@@ -65,8 +65,8 @@ const ComparisonSearch = () => {
- - +
diff --git a/client/src/components/ComparisonSearch/images/frontpage-mobile.webp b/client/src/components/ComparisonSearch/images/frontpage-mobile.webp index e3b0b1668ba74c248ee90b0162c2c78487d1435e..d1728d799ca34fcc6fa214b9cbe6610695b9b011 100644 GIT binary patch literal 14674 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 diff --git a/client/src/components/SearchModal/SearchModal.jsx b/client/src/components/SearchModal/SearchModal.jsx index 34fa078..582a86d 100644 --- a/client/src/components/SearchModal/SearchModal.jsx +++ b/client/src/components/SearchModal/SearchModal.jsx @@ -6,8 +6,8 @@ import { AppContext } from "../Context/Context"; import algoliasearch from 'algoliasearch/lite'; import { Index, InstantSearch, Configure, connectStateResults, connectHits, connectSearchBox } from 'react-instantsearch-dom'; -// //#23263b -const algoliaClient = algoliasearch('GRXWQQHS2I', 'babd585148a07355c43a354cc0aece0f'); +// +const algoliaClient = algoliasearch('MBEPWP2KU4', '707e446460ad927473b80fc736b70c1a'); const searchClient = { search(requests) { @@ -140,10 +140,10 @@ const SearchModal = ({closeModal, isOpen, history}) => { - + {/* - + */} diff --git a/client/src/pages/Homepage/Homepage.jsx b/client/src/pages/Homepage/Homepage.jsx index b4c9d3d..2d80256 100644 --- a/client/src/pages/Homepage/Homepage.jsx +++ b/client/src/pages/Homepage/Homepage.jsx @@ -123,7 +123,7 @@ const Homepage = ({ history }) => {
-
+
diff --git a/client/src/pages/Homepage/Images/Logo.png b/client/src/pages/Homepage/Images/Logo.png deleted file mode 100644 index ff754e652fade30de157be280ae95088fea3658b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38528 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 diff --git a/client/src/pages/Homepage/Images/SALE.png b/client/src/pages/Homepage/Images/SALE.png deleted file mode 100644 index f99322303ca93359d20cccf1d59757c82f778e24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27481 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 {
{/* Button Group */} -
+
-
+
diff --git a/config/env.config b/config/env.config index 92ca88c..91566eb 100644 --- a/config/env.config +++ b/config/env.config @@ -5,5 +5,5 @@ HOSTNAME=redis-16007.c14.us-east-1-2.ec2.cloud.redislabs.com REDISPORT=16007 PASSWORD=TRnDAA0lkjETalGE8OT2NeMzOPmbp3Xj -ALGOLIA_APP_KEY=GRXWQQHS2I -ALGOLIA_ADMIN_KEY=78f3136c4c0ab10a48c521095c0198bf \ No newline at end of file +ALGOLIA_APP_KEY=MBEPWP2KU4 +ALGOLIA_ADMIN_KEY=707e446460ad927473b80fc736b70c1a \ No newline at end of file diff --git a/routes/index.js b/routes/index.js index 6c5a079..4e547df 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,27 +1,13 @@ const express = require('express'); const redis = require('redis'); const { promisify } = require('util'); -const algoliasearch = require('algoliasearch'); + // Rate Limiters const RateLimit = require('express-rate-limit'); const RedisStore = require('rate-limit-redis'); const router = express.Router(); -// Todo -// use affiliatejs to make all links affiliate links. - -// Algolia -const AlgoliaClient = algoliasearch( - process.env.ALGOLIA_APP_KEY, - process.env.ALGOLIA_ADMIN_KEY, - { - headers: { - 'X-Algolia-UserToken': '100', - }, - } -); - // Redis Clients const RedisClient = redis.createClient({ host: process.env.HOSTNAME, @@ -39,13 +25,6 @@ const redisLimiter = new RateLimit({ max: 100, }); -const searchApi = RateLimit({ - windowMs: 1 * 60 * 1000, - max: 20, - message: - 'Too many many requests from this IP, please try again after an hour', -}); - router.use(redisLimiter); // Homepage Get @@ -153,95 +132,4 @@ router.get('/api/homepage', async (req, res) => { } }); -router.get('/api/search', searchApi, async (req, res) => { - const { q } = req.query; - - // Validate query - if (q === '' || q.length < 3 || q.length > 150) { - res.status(422).send({ - title: 'Invalid query', - desc: 'Please try again.', - }); - } else { - const queries = [ - { - indexName: 'amazonProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - { - indexName: 'sephoraProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - { - indexName: 'shoppersdrugmartProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - { - indexName: 'walmartProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - { - indexName: 'wellProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - { - indexName: 'thebayProducts', - query: q, - params: { - hitsPerPage: 1, - }, - }, - ]; - AlgoliaClient.multipleQueries(queries) - .then(({ results }) => { - // Filter empty results - const filterResults = results.filter( - (item) => Array.isArray(item.hits) && !item.hits.length == 0 - ); - - // Validation - if (!Array.isArray(filterResults) || !filterResults.length) { - res.status(404).send({ - title: 'No result found', - desc: "We couldn't find any products related to your query.", - }); - } else { - // Send Results - const results = []; - filterResults.forEach((item) => { - results.push(item.hits[0]); - }); - - const sortedResults = results.sort( - (a, b) => - // Special expression is replacing '$' - a.price.current_price - b.price.current_price - ); - res.send(sortedResults); - } - }) - .catch((err) => { - res.status(500).send({ - title: "Oops. There's been a problem on our end", - desc: 'Please try again later. We will look into this immediately.', - }); // Server error - }); - } -}); - module.exports = router; diff --git a/routes/search.js b/routes/search.js new file mode 100644 index 0000000..b812f76 --- /dev/null +++ b/routes/search.js @@ -0,0 +1,111 @@ +const express = require('express'); +const algoliasearch = require('algoliasearch'); +const RateLimit = require('express-rate-limit'); + +const router = express.Router(); + +// Algolia +const AlgoliaClient = algoliasearch( + process.env.ALGOLIA_APP_KEY, + process.env.ALGOLIA_ADMIN_KEY, + { + headers: { + 'X-Algolia-UserToken': '100', + }, + } +); + +// Search rate limit +const searchApi = RateLimit({ + windowMs: 1 * 60 * 1000, + max: 20, + message: + 'Too many many requests from this IP, please try again after an hour', +}); + +// Search Api +router.get('/api/search', searchApi, async (req, res) => { + const { q } = req.query; + + // Validate query + if (q === '' || q.length < 3 || q.length > 150) { + res.status(422).send({ + title: 'Invalid query', + desc: 'Please try again.', + }); + } else { + const queries = [ + { + indexName: 'amazonProducts', + query: q, + params: { + hitsPerPage: 1, + }, + }, + { + indexName: 'sephoraProducts', + query: q, + params: { + hitsPerPage: 1, + }, + }, + { + indexName: 'shoppersdrugmartProducts', + query: q, + params: { + hitsPerPage: 1, + }, + }, + { + indexName: 'wellProducts', + query: q, + params: { + hitsPerPage: 1, + }, + }, + { + indexName: 'thebayProducts', + query: q, + params: { + hitsPerPage: 1, + }, + }, + ]; + AlgoliaClient.multipleQueries(queries) + .then(({ results }) => { + // Filter empty results + const filterResults = results.filter( + (item) => Array.isArray(item.hits) && !item.hits.length == 0 + ); + + // Validation + if (!Array.isArray(filterResults) || !filterResults.length) { + res.status(404).send({ + title: 'No result found', + desc: "We couldn't find any products related to your query.", + }); + } else { + // Send Results + const results = []; + filterResults.forEach((item) => { + results.push(item.hits[0]); + }); + + const sortedResults = results.sort( + (a, b) => + // Special expression is replacing '$' + a.price.current_price - b.price.current_price + ); + res.send(sortedResults); + } + }) + .catch((err) => { + res.status(500).send({ + title: "Oops. There's been a problem on our end", + desc: 'Please try again later. We will look into this immediately.', + }); // Server error + }); + } +}); + +module.exports = router; diff --git a/server.js b/server.js index f91a645..a3a0312 100644 --- a/server.js +++ b/server.js @@ -22,6 +22,7 @@ app.use(helmet()); // Routes app.use('/', require('./routes/index')); +app.use('/', require('./routes/search')); // Server const PORT = 3001; From fe912496f898f507e601ef7347d4e8bdf5b03b75 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 May 2021 15:39:52 -0700 Subject: [PATCH 02/13] added brand font to tagline --- client/.eslintcache | 2 +- client/src/assets/Gilroy-ExtraBold.woff | Bin 0 -> 33576 bytes .../ComparisonSearch/ComparisonSearch.jsx | 7 +++++-- client/src/components/NavBar/NavBar.jsx | 2 +- client/src/index.css | 5 +++++ client/src/pages/Homepage/Homepage.jsx | 15 ++++++++------- client/tailwind.config.js | 1 + 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 client/src/assets/Gilroy-ExtraBold.woff diff --git a/client/.eslintcache b/client/.eslintcache index 331dad6..96856ef 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9460,"mtime":1621877825530,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3535,"mtime":1622088018507,"results":"31","hashOfConfig":"21"},{"size":8962,"mtime":1622088091571,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":17232,"mtime":1622083095134,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9473,"mtime":1622323442526,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3769,"mtime":1622327816550,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":17232,"mtime":1622083095134,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ksv8fw",{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"72","messages":"73","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[]] \ No newline at end of file diff --git a/client/src/assets/Gilroy-ExtraBold.woff b/client/src/assets/Gilroy-ExtraBold.woff new file mode 100644 index 0000000000000000000000000000000000000000..8a00be9737b611cbcacbe769b440c04972f20e6b GIT binary patch literal 33576 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 literal 0 HcmV?d00001 diff --git a/client/src/components/ComparisonSearch/ComparisonSearch.jsx b/client/src/components/ComparisonSearch/ComparisonSearch.jsx index 99a1002..c5de046 100644 --- a/client/src/components/ComparisonSearch/ComparisonSearch.jsx +++ b/client/src/components/ComparisonSearch/ComparisonSearch.jsx @@ -36,8 +36,11 @@ const ComparisonSearch = () => {
-
- Compare cosmetic price's across major brands. +
+ Find the best prices on Canadian cosmetics. +
+
+ Compare prices on Canadian cosmetics
diff --git a/client/src/components/NavBar/NavBar.jsx b/client/src/components/NavBar/NavBar.jsx index 65b4d10..f183183 100644 --- a/client/src/components/NavBar/NavBar.jsx +++ b/client/src/components/NavBar/NavBar.jsx @@ -36,7 +36,7 @@ const solutions = [ const resources = [ { - name: 'Tos', + name: 'Terms of Service', description: 'Learn the terms of using our service.', href: '/tos', icon: SupportIcon, diff --git a/client/src/index.css b/client/src/index.css index b5c61c9..5368ec8 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -1,3 +1,8 @@ @tailwind base; @tailwind components; @tailwind utilities; + +@font-face { + font-family: Gilroy-ExtraBold; + src: url('./assets/Gilroy-ExtraBold.woff'); +} diff --git a/client/src/pages/Homepage/Homepage.jsx b/client/src/pages/Homepage/Homepage.jsx index 2d80256..0e92b02 100644 --- a/client/src/pages/Homepage/Homepage.jsx +++ b/client/src/pages/Homepage/Homepage.jsx @@ -67,7 +67,7 @@ const Homepage = ({ history }) => {
{products.map((item, index) => { return ( -
+
{item.thumbnail || item.subThumbnail ? @@ -137,12 +137,13 @@ const Homepage = ({ history }) => { : } - -
- -
-
-
+
Find the best prices on Canadian cosmetics.
-
+
Compare prices on Canadian cosmetics
diff --git a/client/src/components/NavBar/NavBar.jsx b/client/src/components/NavBar/NavBar.jsx index f183183..e7dd4be 100644 --- a/client/src/components/NavBar/NavBar.jsx +++ b/client/src/components/NavBar/NavBar.jsx @@ -174,11 +174,20 @@ export default function Navbar() {
-
+
+ Glitzher Logo Workflow
diff --git a/client/src/components/SearchModal/SearchModal.jsx b/client/src/components/SearchModal/SearchModal.jsx index 582a86d..4506867 100644 --- a/client/src/components/SearchModal/SearchModal.jsx +++ b/client/src/components/SearchModal/SearchModal.jsx @@ -113,7 +113,7 @@ const SearchModal = ({closeModal, isOpen, history}) => {
Search
-
+
@@ -140,11 +140,6 @@ const SearchModal = ({closeModal, isOpen, history}) => { - {/* - - - */} - From df669309defae9523070212618bf1f7a86c39c7e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 May 2021 20:23:01 -0700 Subject: [PATCH 04/13] icon adjustment --- client/.eslintcache | 2 +- .../components/ComparisonSearch/ComparisonSearch.jsx | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index 9d1da85..b4936a3 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3745,"mtime":1622344501542,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3436,"mtime":1622344956564,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/src/components/ComparisonSearch/ComparisonSearch.jsx b/client/src/components/ComparisonSearch/ComparisonSearch.jsx index 06152d3..81c80c1 100644 --- a/client/src/components/ComparisonSearch/ComparisonSearch.jsx +++ b/client/src/components/ComparisonSearch/ComparisonSearch.jsx @@ -42,8 +42,8 @@ const ComparisonSearch = () => {
Compare prices on Canadian cosmetics
-
-
+
+
@@ -59,11 +59,9 @@ const ComparisonSearch = () => {
-

- - - -

+
+
From e0434e7a86dd0130f45b6d444f0b5cdb4a36955b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jun 2021 22:02:05 -0700 Subject: [PATCH 05/13] fixed front-page margin bug --- client/.eslintcache | 2 +- client/public/index.html | 2 +- client/src/components/ComparisonSearch/ComparisonSearch.jsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index b4936a3..29ab37b 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3436,"mtime":1622344956564,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ksv8fw",{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"72","messages":"73","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[]] \ No newline at end of file diff --git a/client/public/index.html b/client/public/index.html index 289c00c..8a56105 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -8,7 +8,7 @@ diff --git a/client/src/components/ComparisonSearch/ComparisonSearch.jsx b/client/src/components/ComparisonSearch/ComparisonSearch.jsx index 81c80c1..7025412 100644 --- a/client/src/components/ComparisonSearch/ComparisonSearch.jsx +++ b/client/src/components/ComparisonSearch/ComparisonSearch.jsx @@ -35,11 +35,11 @@ const ComparisonSearch = () => { <>
-
-
+
+
Find the best prices on Canadian cosmetics.
-
+
Compare prices on Canadian cosmetics
From 098b160f1e4a6be3b4982a893776e41e14cebdde Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jun 2021 22:13:15 -0700 Subject: [PATCH 06/13] added safari notifcation support --- client/public/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/public/index.html b/client/public/index.html index 8a56105..0d0a921 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -25,6 +25,7 @@ OneSignal.push(function () { OneSignal.init({ appId: "f715c645-fdfc-4682-9a46-406b56ccf1b2", + safari_web_id: "web.onesignal.auto.32d5e245-163c-40cb-8f57-67057af17423" }); }); From 6a074b577040789c35649793812423b1c2956b55 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jun 2021 22:26:46 -0700 Subject: [PATCH 07/13] added postgres db and gitignore update --- .gitignore | 5 +- client/.eslintcache | 2 +- package-lock.json | 135 ++++++++++++++++++++++++++++++++++++++++++-- package.json | 1 + 4 files changed, 135 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b92c9d4..84f9bc7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ # misc .DS_Store -config.env \ No newline at end of file +config.env + +# db config +/config \ No newline at end of file diff --git a/client/.eslintcache b/client/.eslintcache index 29ab37b..cafb0d2 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ksv8fw",{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"72","messages":"73","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[]] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 74c7d75..5ae1ffd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -548,6 +548,11 @@ "node-releases": "^1.1.71" } }, + "buffer-writer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", + "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -898,9 +903,9 @@ } }, "css-what": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.0.tgz", - "integrity": "sha512-qxyKHQvgKwzwDWC/rGbT821eJalfupxYW2qbSJSAtdSTimsr/MlaGONoNLllaUPZWf8QnbcKM/kPVYUQuEKAFA==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", + "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==" }, "dashdash": { "version": "1.14.1", @@ -1272,9 +1277,9 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -2078,6 +2083,11 @@ } } }, + "packet-reader": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz", + "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==" + }, "paginate-info": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/paginate-info/-/paginate-info-1.0.4.tgz", @@ -2134,6 +2144,60 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "pg": { + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz", + "integrity": "sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==", + "requires": { + "buffer-writer": "2.0.0", + "packet-reader": "1.0.0", + "pg-connection-string": "^2.5.0", + "pg-pool": "^3.3.0", + "pg-protocol": "^1.5.0", + "pg-types": "^2.1.0", + "pgpass": "1.x" + } + }, + "pg-connection-string": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz", + "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==" + }, + "pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==" + }, + "pg-pool": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz", + "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==" + }, + "pg-protocol": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz", + "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==" + }, + "pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "requires": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + } + }, + "pgpass": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz", + "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==", + "requires": { + "split2": "^3.1.1" + } + }, "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", @@ -2168,6 +2232,29 @@ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, + "postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==" + }, + "postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=" + }, + "postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==" + }, + "postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "requires": { + "xtend": "^4.0.0" + } + }, "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", @@ -2285,6 +2372,16 @@ } } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -2601,6 +2698,14 @@ "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", "dev": true }, + "split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "requires": { + "readable-stream": "^3.0.0" + } + }, "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", @@ -2637,6 +2742,14 @@ "strip-ansi": "^5.1.0" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -2874,6 +2987,11 @@ "prepend-http": "^2.0.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -3005,6 +3123,11 @@ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + }, "y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", diff --git a/package.json b/package.json index 9daea8e..4bda8f3 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "node-cron": "^3.0.0", "node-fetch": "^2.6.1", "paginate-info": "^1.0.4", + "pg": "^8.6.0", "rate-limit-redis": "^2.1.0", "react-ga": "^3.3.0", "redis": "^3.1.1" From 62c45eaf5ef614d8da0c1037db7a93d8680a830f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Jun 2021 08:34:49 -0700 Subject: [PATCH 08/13] fixed hardcoded brand --- .gitignore | 1 - client/.eslintcache | 2 +- client/src/pages/PriceComparison/PriceComparison.jsx | 4 ++-- routes/blog.js | 10 ++++++++++ server.js | 4 +++- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 routes/blog.js diff --git a/.gitignore b/.gitignore index 84f9bc7..5f05214 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ # misc .DS_Store -config.env # db config /config \ No newline at end of file diff --git a/client/.eslintcache b/client/.eslintcache index cafb0d2..84dad59 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23012,"mtime":1622089011057,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23055,"mtime":1623292118924,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/src/pages/PriceComparison/PriceComparison.jsx b/client/src/pages/PriceComparison/PriceComparison.jsx index dbe57ca..9d55118 100644 --- a/client/src/pages/PriceComparison/PriceComparison.jsx +++ b/client/src/pages/PriceComparison/PriceComparison.jsx @@ -55,7 +55,7 @@ const PriceComparison = () => { })) setTableData(formattedTableData) - + console.log(formattedTableData) }).catch((err) => { if (axios.isCancel(err)) return setErrorTitle(err.response.data.title) @@ -297,7 +297,7 @@ const PriceComparison = () => { alt={product.title} />
- Amazon + {product.brand}
diff --git a/routes/blog.js b/routes/blog.js new file mode 100644 index 0000000..22e3b3b --- /dev/null +++ b/routes/blog.js @@ -0,0 +1,10 @@ +const express = require('express'); +const pool = require('../config/db'); + +// router +const router = express.Router(); + +router.get('/blog', (req, res) => { + res.json('Welcome to my blog '); +}); +module.exports = router; diff --git a/server.js b/server.js index a3a0312..2d3079a 100644 --- a/server.js +++ b/server.js @@ -17,12 +17,14 @@ if (process.env.NODE_ENV === 'development') { app.use(morgan('dev')); } -// Helmet +// Middleware app.use(helmet()); +app.use(express.json()); // req.body // Routes app.use('/', require('./routes/index')); app.use('/', require('./routes/search')); +app.use('/', require('./routes/blog')); // Server const PORT = 3001; From 7c012ea353a9a7e7619548133b3caa75233267c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Jun 2021 20:18:44 -0700 Subject: [PATCH 09/13] added react-helmet --- client/.eslintcache | 2 +- client/package-lock.json | 16 ++++++++++++++++ client/package.json | 1 + .../pages/PopularProducts/PopularProducts.jsx | 6 ++++++ .../pages/PriceComparison/PriceComparison.jsx | 6 ++++++ client/src/pages/privacyPolicy/privacyPolicy.jsx | 9 +++++++-- client/src/pages/tos/tos.jsx | 7 +++++++ 7 files changed, 44 insertions(+), 3 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index 84dad59..e3dc01b 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23055,"mtime":1623292118924,"results":"33","hashOfConfig":"21"},{"size":14274,"mtime":1621877825563,"results":"34","hashOfConfig":"21"},{"size":22267,"mtime":1621877825561,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11260,"mtime":1621877825545,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23354,"mtime":1623381408096,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index ddb2369..2fdb4c2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -14661,6 +14661,17 @@ "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-3.3.0.tgz", "integrity": "sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ==" }, + "react-helmet": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", + "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==", + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.7.2", + "react-fast-compare": "^3.1.1", + "react-side-effect": "^2.1.0" + } + }, "react-infinite-scroll-component": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/react-infinite-scroll-component/-/react-infinite-scroll-component-6.0.0.tgz", @@ -14881,6 +14892,11 @@ "prop-types": "^15.7.2" } }, + "react-side-effect": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", + "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" + }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", diff --git a/client/package.json b/client/package.json index 1d0f3da..d1922dd 100644 --- a/client/package.json +++ b/client/package.json @@ -23,6 +23,7 @@ "react-app-rewired": "^2.1.8", "react-dom": "^17.0.2", "react-ga": "^3.3.0", + "react-helmet": "^6.1.0", "react-infinite-scroll-component": "^6.0.0", "react-instantsearch-dom": "^6.10.3", "react-lazyload": "^3.2.0", diff --git a/client/src/pages/PopularProducts/PopularProducts.jsx b/client/src/pages/PopularProducts/PopularProducts.jsx index 03629f0..f7faf54 100644 --- a/client/src/pages/PopularProducts/PopularProducts.jsx +++ b/client/src/pages/PopularProducts/PopularProducts.jsx @@ -7,6 +7,7 @@ import { useHistory } from 'react-router-dom'; import axios from 'axios'; import LazyLoad from 'react-lazyload'; import { ShoppingBagIcon, ArrowRightIcon } from '@heroicons/react/outline' +import { Helmet } from "react-helmet"; // Components import SkeletonLoader from '../../components/SkeletonLoaders/SkeletonLoader'; @@ -92,6 +93,11 @@ const PopularProducts = () => { return ( <> + + + Popular Products - Glitzher + +
diff --git a/client/src/pages/PriceComparison/PriceComparison.jsx b/client/src/pages/PriceComparison/PriceComparison.jsx index 9d55118..8519c53 100644 --- a/client/src/pages/PriceComparison/PriceComparison.jsx +++ b/client/src/pages/PriceComparison/PriceComparison.jsx @@ -5,6 +5,7 @@ import { Link } from "react-router-dom"; // Application Packages import axios from 'axios'; import { ShoppingBagIcon, SwitchHorizontalIcon } from '@heroicons/react/outline' +import { Helmet } from "react-helmet"; // Components import SkeletonLoader from '../../components/SkeletonLoaders/ComparisonSkeleton'; @@ -70,6 +71,11 @@ const PriceComparison = () => { return ( <> + + + Search - Glitzher + + {/* Product Not Found */} {errorTitle && errorDesc ?
diff --git a/client/src/pages/privacyPolicy/privacyPolicy.jsx b/client/src/pages/privacyPolicy/privacyPolicy.jsx index 7c5efa5..3ad9e26 100644 --- a/client/src/pages/privacyPolicy/privacyPolicy.jsx +++ b/client/src/pages/privacyPolicy/privacyPolicy.jsx @@ -1,10 +1,15 @@ import React from 'react'; - -// Ant d +import { Helmet } from "react-helmet"; const privacyPolicy = () => { return ( <> + + + Privacy Policy - Glitzher + + +

Privacy Notice

diff --git a/client/src/pages/tos/tos.jsx b/client/src/pages/tos/tos.jsx index 938e0b5..3c313b7 100644 --- a/client/src/pages/tos/tos.jsx +++ b/client/src/pages/tos/tos.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import { Helmet } from "react-helmet"; // Css import './tos.module.css'; @@ -6,6 +7,12 @@ import './tos.module.css'; const tos = () => { return ( <> + + + Terms of Service - Glitzher + + +

Terms and Conditions

From 2bc310ff726f848983f6a62972c9349e4579fa74 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Jun 2021 12:51:35 -0700 Subject: [PATCH 10/13] removed css file --- client/public/index.html | 4 ++-- client/src/components/FooterBar/FooterBar.jsx | 8 ++++---- client/src/components/SkeletonLoaders/skeleton.css | 11 ----------- 3 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 client/src/components/SkeletonLoaders/skeleton.css diff --git a/client/public/index.html b/client/public/index.html index 0d0a921..fe4c6c7 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -4,8 +4,8 @@ - - + + {
-

Terms of Service

+

Terms of Service

 • @@ -20,7 +20,7 @@ const FooterBar = () => { • -

Privacy Policy

+

Privacy Policy
@@ -29,12 +29,12 @@ const FooterBar = () => {
-

Terms of Service

+

Terms of Service

 -

Privacy Policy

+

Privacy Policy
diff --git a/client/src/components/SkeletonLoaders/skeleton.css b/client/src/components/SkeletonLoaders/skeleton.css deleted file mode 100644 index d30f792..0000000 --- a/client/src/components/SkeletonLoaders/skeleton.css +++ /dev/null @@ -1,11 +0,0 @@ -.skeletonButton, -.priceSkeleton { - justify-content: left; -} - -@media screen and (max-width: 1284px) { - .skeletonButton, - .priceSkeleton { - justify-content: center; - } -} From 59cb7c558713276a2a24403ab3d3f4be5685f7c7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2021 19:47:11 -0700 Subject: [PATCH 11/13] updated title and keywords --- client/.eslintcache | 2 +- client/public/index.html | 7 ++++--- .../SkeletonLoaders/ComparisonSkeleton.jsx | 18 +++++++++--------- .../SkeletonLoaders/SkeletonLoader.jsx | 12 ++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index e3dc01b..93a807d 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1621877825528,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23354,"mtime":1623381408096,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1623537282926,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23354,"mtime":1623381408096,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"73"},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"78","messages":"79","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["80","81"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],["82","83"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"84","replacedBy":"85"},{"ruleId":"86","replacedBy":"87"},{"ruleId":"84","replacedBy":"88"},{"ruleId":"86","replacedBy":"89"},"no-native-reassign",["90"],"no-negated-in-lhs",["91"],["90"],["91"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/public/index.html b/client/public/index.html index fe4c6c7..316f5c6 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -4,15 +4,16 @@ - + - Glitzher + + Glitzher - Compare prices on Canadian cosmetics from major retailers diff --git a/client/src/components/SkeletonLoaders/ComparisonSkeleton.jsx b/client/src/components/SkeletonLoaders/ComparisonSkeleton.jsx index 24bf09a..b287f79 100644 --- a/client/src/components/SkeletonLoaders/ComparisonSkeleton.jsx +++ b/client/src/components/SkeletonLoaders/ComparisonSkeleton.jsx @@ -4,27 +4,27 @@ const ComparisonSkeleton = () => { return (
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
diff --git a/client/src/components/SkeletonLoaders/SkeletonLoader.jsx b/client/src/components/SkeletonLoaders/SkeletonLoader.jsx index 4ff8314..9e0bb9c 100644 --- a/client/src/components/SkeletonLoaders/SkeletonLoader.jsx +++ b/client/src/components/SkeletonLoaders/SkeletonLoader.jsx @@ -8,15 +8,15 @@ const SkeletonLoader = () => { return (
-
+
-
-
-
-
+
+
+
+
-
+
From d30d64fb4e1c62324b148790f0b0afec6bd660c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2021 22:08:35 -0700 Subject: [PATCH 12/13] small adjustments to pricecomparison & added seo boosters for links --- client/.eslintcache | 2 +- client/package-lock.json | 5 +++ client/package.json | 1 + client/public/index.html | 9 ++++- client/src/components/NavBar/NavBar.jsx | 36 +++++------------ .../pages/PriceComparison/PriceComparison.jsx | 39 ++++++++++++------- 6 files changed, 48 insertions(+), 44 deletions(-) diff --git a/client/.eslintcache b/client/.eslintcache index 93a807d..5f06675 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1621877825518,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9810,"mtime":1622344256893,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1621877825538,"results":"27","hashOfConfig":"21"},{"size":1470,"mtime":1621877825538,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1623537282926,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":23354,"mtime":1623381408096,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"73"},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"78","messages":"79","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["80","81"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],["82","83"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"84","replacedBy":"85"},{"ruleId":"86","replacedBy":"87"},{"ruleId":"84","replacedBy":"88"},{"ruleId":"86","replacedBy":"89"},"no-native-reassign",["90"],"no-negated-in-lhs",["91"],["90"],["91"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1623820092643,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9213,"mtime":1623819463238,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1623614659968,"results":"27","hashOfConfig":"21"},{"size":1478,"mtime":1623622523635,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1623537282926,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":24388,"mtime":1623820078258,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index 2fdb4c2..14e22a2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -14897,6 +14897,11 @@ "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" }, + "react-truncate": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/react-truncate/-/react-truncate-2.4.0.tgz", + "integrity": "sha512-3QW11/COYwi6iPUaunUhl06DW5NJBJD1WkmxW5YxqqUu6kvP+msB3jfoLg8WRbu57JqgebjVW8Lknw6T5/QZdA==" + }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", diff --git a/client/package.json b/client/package.json index d1922dd..fc3a111 100644 --- a/client/package.json +++ b/client/package.json @@ -32,6 +32,7 @@ "react-router-dom": "^5.2.0", "react-scripts": "4.0.1", "react-scroll": "^1.8.2", + "react-truncate": "^2.4.0", "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.1.2", "web-vitals": "^0.2.4", "workbox-cacheable-response": "^6.1.5", diff --git a/client/public/index.html b/client/public/index.html index 316f5c6..0c6ab1e 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -13,6 +13,10 @@ + + + Glitzher - Compare prices on Canadian cosmetics from major retailers @@ -26,7 +30,10 @@ OneSignal.push(function () { OneSignal.init({ appId: "f715c645-fdfc-4682-9a46-406b56ccf1b2", - safari_web_id: "web.onesignal.auto.32d5e245-163c-40cb-8f57-67057af17423" + safari_web_id: "web.onesignal.auto.32d5e245-163c-40cb-8f57-67057af17423", + notifyButton: { + enable: true, + }, }); }); diff --git a/client/src/components/NavBar/NavBar.jsx b/client/src/components/NavBar/NavBar.jsx index e7dd4be..ae3194a 100644 --- a/client/src/components/NavBar/NavBar.jsx +++ b/client/src/components/NavBar/NavBar.jsx @@ -6,8 +6,7 @@ import { ShoppingBagIcon, MenuIcon, SearchIcon, - ShieldCheckIcon, - SupportIcon, + PencilAltIcon, XIcon, } from '@heroicons/react/outline' @@ -32,20 +31,12 @@ const solutions = [ href: '/brands', icon: ShoppingBagIcon, }, -] - -const resources = [ - { - name: 'Terms of Service', - description: 'Learn the terms of using our service.', - href: '/tos', - icon: SupportIcon, - }, { - name: 'Privacy Policy', - description: 'Understand how we take your privacy seriously.', - href: '/policies/privacy', - icon: ShieldCheckIcon, + name: 'Blog', + description: + 'Discover the Glitzher blog. Here we write about cosmetic reviews, beauty tips and tricks and the best product deals.', + href: 'https://glitzher.com/brands', + icon: PencilAltIcon, }, ] @@ -129,6 +120,9 @@ export default function Navbar() { Brands + + Brands + {/* Seperator */} @@ -213,18 +207,6 @@ export default function Navbar() {
-
{
- {product.title} + + {product.title} + {i === 0 ? @@ -270,14 +273,16 @@ const PriceComparison = () => { : null } - {product.title} + + {product.title} + - + {'$' + product.price.current_price} - -
+ +
@@ -296,13 +301,13 @@ const PriceComparison = () => { : 'grid grid-cols-4 sm:mb-3 p-2 sm:grid-cols-3' }> - + {product.title} -
+
{product.brand}
@@ -316,15 +321,19 @@ const PriceComparison = () => { : null } -
- {product.title} -
+ +
+ ...}> + {product.title} + +
+
{'$' + product.price.current_price}
- +
From 3291699749239772bf918aef9ef6277fddf886c7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Jun 2021 21:46:51 -0700 Subject: [PATCH 13/13] updated notifications --- client/.eslintcache | 2 +- client/public/OneSignalSDKUpdaterWorker.js | 1 - client/public/OneSignalSDKWorker.js | 1 - client/public/firebase-messaging-sw.js | 2 ++ client/public/index.html | 15 ++------------- .../src/pages/PriceComparison/PriceComparison.jsx | 9 +++------ client/src/pages/tos/tos.jsx | 3 --- client/src/pages/tos/tos.module.css | 5 ----- 8 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 client/public/OneSignalSDKUpdaterWorker.js delete mode 100644 client/public/OneSignalSDKWorker.js create mode 100644 client/public/firebase-messaging-sw.js delete mode 100644 client/src/pages/tos/tos.module.css diff --git a/client/.eslintcache b/client/.eslintcache index 5f06675..a1b41bd 100644 --- a/client/.eslintcache +++ b/client/.eslintcache @@ -1 +1 @@ -[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1623820092643,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9213,"mtime":1623819463238,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1623614659968,"results":"27","hashOfConfig":"21"},{"size":1478,"mtime":1623622523635,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1623537282926,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":24388,"mtime":1623820078258,"results":"33","hashOfConfig":"21"},{"size":14527,"mtime":1623381163799,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"1ksv8fw",{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"42"},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],["79","80"],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[],{"ruleId":"81","replacedBy":"82"},{"ruleId":"83","replacedBy":"84"},"no-native-reassign",["85"],"no-negated-in-lhs",["86"],"no-global-assign","no-unsafe-negation"] \ No newline at end of file +[{"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js":"1","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js":"2","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js":"3","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js":"4","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js":"5","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx":"6","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx":"7","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx":"8","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx":"9","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx":"10","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx":"11","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx":"12","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx":"13","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx":"14","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx":"15","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx":"16","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx":"17","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx":"18","C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx":"19"},{"size":328,"mtime":1621877825541,"results":"20","hashOfConfig":"21"},{"size":2164,"mtime":1623895441076,"results":"22","hashOfConfig":"21"},{"size":441,"mtime":1612323975442,"results":"23","hashOfConfig":"21"},{"size":492,"mtime":1621877825540,"results":"24","hashOfConfig":"21"},{"size":390,"mtime":1621877825560,"results":"25","hashOfConfig":"21"},{"size":9213,"mtime":1623819463238,"results":"26","hashOfConfig":"21"},{"size":1841,"mtime":1623614659968,"results":"27","hashOfConfig":"21"},{"size":1478,"mtime":1623622523635,"results":"28","hashOfConfig":"21"},{"size":2641,"mtime":1623537282926,"results":"29","hashOfConfig":"21"},{"size":780,"mtime":1621877825526,"results":"30","hashOfConfig":"21"},{"size":3388,"mtime":1623128495885,"results":"31","hashOfConfig":"21"},{"size":9161,"mtime":1622324698808,"results":"32","hashOfConfig":"21"},{"size":24146,"mtime":1623822005762,"results":"33","hashOfConfig":"21"},{"size":14489,"mtime":1623821475446,"results":"34","hashOfConfig":"21"},{"size":22504,"mtime":1623381192505,"results":"35","hashOfConfig":"21"},{"size":16995,"mtime":1622344399398,"results":"36","hashOfConfig":"21"},{"size":1957,"mtime":1621877825548,"results":"37","hashOfConfig":"21"},{"size":11521,"mtime":1623381474279,"results":"38","hashOfConfig":"21"},{"size":2374,"mtime":1621877825524,"results":"39","hashOfConfig":"21"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"wvdc2a",{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"72","messages":"73","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"74","messages":"75","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"76","messages":"77","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\App.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Context\\Context.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\index.js",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\NavBar\\NavBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\ComparisonSkeleton.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SkeletonLoaders\\SkeletonLoader.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\FooterBar\\FooterBar.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\Error\\Error.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\ComparisonSearch\\ComparisonSearch.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\Homepage\\Homepage.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PriceComparison\\PriceComparison.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\tos\\tos.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\privacyPolicy\\privacyPolicy.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\SearchModal\\SearchModal.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\brands\\brands.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\pages\\PopularProducts\\PopularProducts.jsx",[],"C:\\Users\\Nicola\\Desktop\\Code\\glitzher\\client\\src\\components\\CookieBanner\\CookieBanner.jsx",[]] \ No newline at end of file diff --git a/client/public/OneSignalSDKUpdaterWorker.js b/client/public/OneSignalSDKUpdaterWorker.js deleted file mode 100644 index 720b1d7..0000000 --- a/client/public/OneSignalSDKUpdaterWorker.js +++ /dev/null @@ -1 +0,0 @@ -importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); diff --git a/client/public/OneSignalSDKWorker.js b/client/public/OneSignalSDKWorker.js deleted file mode 100644 index 720b1d7..0000000 --- a/client/public/OneSignalSDKWorker.js +++ /dev/null @@ -1 +0,0 @@ -importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); diff --git a/client/public/firebase-messaging-sw.js b/client/public/firebase-messaging-sw.js new file mode 100644 index 0000000..cab8c44 --- /dev/null +++ b/client/public/firebase-messaging-sw.js @@ -0,0 +1,2 @@ +var version = "1.5.1"; +importScripts("https://cdn.subscribers.com/assets/subscribers-sw.js"); diff --git a/client/public/index.html b/client/public/index.html index 0c6ab1e..a9aaa35 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -24,18 +24,7 @@
- - + + diff --git a/client/src/pages/PriceComparison/PriceComparison.jsx b/client/src/pages/PriceComparison/PriceComparison.jsx index 33f0abf..97d9dcb 100644 --- a/client/src/pages/PriceComparison/PriceComparison.jsx +++ b/client/src/pages/PriceComparison/PriceComparison.jsx @@ -6,7 +6,6 @@ import { Link } from "react-router-dom"; import axios from 'axios'; import { ShoppingBagIcon, SwitchHorizontalIcon } from '@heroicons/react/outline' import { Helmet } from "react-helmet"; -import Truncate from 'react-truncate'; // Components import SkeletonLoader from '../../components/SkeletonLoaders/ComparisonSkeleton'; @@ -257,7 +256,7 @@ const PriceComparison = () => {
- + { : 'grid grid-cols-4 sm:mb-3 p-2 sm:grid-cols-3' }> - + { }
- ...}> - {product.title} - + {product.title}
diff --git a/client/src/pages/tos/tos.jsx b/client/src/pages/tos/tos.jsx index 3c313b7..a7a69af 100644 --- a/client/src/pages/tos/tos.jsx +++ b/client/src/pages/tos/tos.jsx @@ -1,9 +1,6 @@ import React from 'react'; import { Helmet } from "react-helmet"; -// Css -import './tos.module.css'; - const tos = () => { return ( <> diff --git a/client/src/pages/tos/tos.module.css b/client/src/pages/tos/tos.module.css deleted file mode 100644 index e2bb81b..0000000 --- a/client/src/pages/tos/tos.module.css +++ /dev/null @@ -1,5 +0,0 @@ -/* @media screen and (max-width: 767px) { - ul { - padding-inline-start: 0; - } -} */