Skip to content

Commit

Permalink
Merge pull request #43 from phoenixbeats01/glitzherv2
Browse files Browse the repository at this point in the history 
Glitzherv2 merge
  • Loading branch information
@nick-0101
nick-0101 authored Jun 17, 2021
2 parents 377a75d + 3291699 commit fca2dd5
Show file tree
Hide file tree
Showing 32 changed files with 424 additions and 248 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@

# misc
.DS_Store
config.env

# db config
/config
2 changes: 1 addition & 1 deletion client/.eslintcache
View file
Original file line number Diff line number Diff line change
@@ -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"]
[{"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",[]]
21 changes: 21 additions & 0 deletions client/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -31,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",
Expand Down
2 changes: 2 additions & 0 deletions client/public/firebase-messaging-sw.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
var version = "1.5.1";
importScripts("https://cdn.subscribers.com/assets/subscribers-sw.js");
20 changes: 14 additions & 6 deletions client/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,27 @@
<meta charset="utf-8" />
<link rel="icon" type="image/png" href="./images/logo.webp" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="keywords" content="makeup, cosmetics, canada, best price, compare, price compare">
<meta name="theme-color" content="#000000" />
<meta name="keywords" content="makeup, cosmetic, Canadian, best price, skin care, canada, beauty" />
<meta name="theme-color" content="#EE4444" />
<meta
name="description"
content="Compare cosmetic price's across major brands."
content="Find the best price on makeup, skincare, and more in Canadian cosmetic's online and retail stores."
/>
<link rel="apple-touch-icon" href="./images/logo.webp" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Glitzher</title>
<link rel="canonical" href="https://glitzher.com" />

<script data-ad-client="ca-pub-6370718788461527" async
src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>

<title>Glitzher - Compare prices on Canadian cosmetics from major retailers</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root">
</div>
<div id="root"></div>

<!-- Push Notifcation Script -->
<script type="text/javascript">var subscribersSiteId = 'c5ce9151-7f56-4fc0-b5e4-0d82b4528ff6';</script>
<script type="text/javascript" src="https://cdn.subscribers.com/assets/subscribers.js"></script>
</body>
</html>
Binary file added client/src/assets/Gilroy-ExtraBold.woff
View file
Binary file not shown.
Loading

0 comments on commit fca2dd5

Please sign in to comment.