Merge branch 'master' into dependabot/npm_and_yarn/browserify-sign-4.2.2

chaynHQ · Dec 27, 2023 · c592232 · c592232
2 parents 9c57631 + aa0532f
commit c592232
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 100 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -5,6 +5,9 @@
 ### Why did you make the changes?
 
 <!--- PR CHECKLIST: PLEASE REMOVE BEFORE SUBMITTING —>
-- [ ] You have answered the above questions.
-- [ ] You have followed the contributing guidelines in the CONTRIBUTING.md file
-- [ ] You have a descriptive and concise PR title.
+Before submitting, check that you have completed the following tasks:
+- [ ] Answered the questions above.
+- [ ] Read Chayn's Contributing Guidelines in the CONTRIBUTING.md file.
+- [ ] Enabled "Allow edits and access to secrets by maintainers" on this PR.
+- [ ] If applicable, include images in the description.
+After submitting, please be available for discussion. Thank you!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "add": "^2.0.6",
-    "axios": "^0.21.0",
+    "axios": "^1.6.0",
     "firebase": "^10.5.0",
     "firebaseui": "^6.0.1",
     "html-to-pdfmake": "^2.1.2",

diff --git a/src/components/Head.js b/src/components/Head.js
@@ -7,7 +7,6 @@ const Head = ({ title, description, ogDescription, ogImage, ogTitle, ogImageAlt
   <NextHead>
     <title key="title">{title} | YSM</title>
     <link rel="icon" href="/favicon.png" />
-    <link href="https://bloom.chayn.co/hotjarNPS.css" rel="stylesheet" type="text/css" />
     <meta name="description" content={description} />
     <meta property="og:url" content={isBrowser ? window.location.href : null} />
     <meta property="og:type" content="website" />

diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -129,7 +129,7 @@ function App({ Component, pageProps }) {
     });
 
     if (process.env.NEXT_PUBLIC_ENV === 'live') {
-      hotjar.initialize(Number(process.env.NEXT_PUBLIC_HOTJAR_ID), 5);
+      hotjar.initialize(Number(process.env.NEXT_PUBLIC_HOTJAR_ID), 6);
     }
   }, []);
 

diff --git a/src/pages/_document.js b/src/pages/_document.js
@@ -1,16 +1,18 @@
 /* eslint-disable react/jsx-filename-extension */
 import { ServerStyleSheets } from '@material-ui/core/styles';
-import Document, {
-  Head, Html, Main, NextScript,
-} from 'next/document';
+import Document, { Head, Html, Main, NextScript } from 'next/document';
 import React from 'react';
 
 export default class MyDocument extends Document {
   render() {
     return (
       <Html lang="en">
         <Head>
-          <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito&display=swap" />
+          <link
+            rel="stylesheet"
+            href="https://fonts.googleapis.com/css?family=Nunito&display=swap"
+          />
+          <link rel="stylesheet" href="https://bloom.chayn.co/hotjarNPS.css" />
         </Head>
         <body>
           <Main />
@@ -25,9 +27,10 @@ MyDocument.getInitialProps = async (ctx) => {
   const sheets = new ServerStyleSheets();
   const originalRenderPage = ctx.renderPage;
 
-  ctx.renderPage = () => originalRenderPage({
-    enhanceApp: (App) => (props) => sheets.collect(<App {...props} />),
-  });
+  ctx.renderPage = () =>
+    originalRenderPage({
+      enhanceApp: (App) => (props) => sheets.collect(<App {...props} />),
+    });
 
   const initialProps = await Document.getInitialProps(ctx);
 

diff --git a/yarn.lock b/yarn.lock
@@ -2543,12 +2543,14 @@ axios@^0.19.0:
   dependencies:
     follow-redirects "1.5.10"
 
-axios@^0.21.0:
-  version "0.21.4"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.0"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 axobject-query@^3.1.1:
   version "3.2.1"
@@ -4303,7 +4305,7 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+follow-redirects@^1.0.0, follow-redirects@^1.15.0:
   version "1.15.3"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"
   integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
@@ -6535,6 +6537,11 @@ protobufjs@^7.2.4:
     "@types/node" ">=13.7.0"
     long "^5.0.0"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,7 +129,7 @@ function App({ Component, pageProps }) { @@
         });
         if (process.env.NEXT_PUBLIC_ENV === 'live') {
-          hotjar.initialize(Number(process.env.NEXT_PUBLIC_HOTJAR_ID), 5);
+          hotjar.initialize(Number(process.env.NEXT_PUBLIC_HOTJAR_ID), 6);
         }
       }, []);
@@ Expand Down @@