- update dependencies

- upgrade gatsby v2 to v3
- update functions

src/pages/404.js

@@ -1,5 +1,5 @@
-import { navigate } from 'gatsby';
 import { memo, useEffect } from 'react';
+import { navigate } from 'gatsby';
 
 const NotFound = () => {
   useEffect(() => {

src/pages/app.js

@@ -1,10 +1,10 @@
 import { Redirect, Router } from '@reach/router';
 import React, { memo } from 'react';
-import PrivateRoute from '../components/router/PrivateRoute';
-import Wrapper from '../components/shared/Wrapper';
-import NotFound from './404';
 import Builder from './app/builder';
 import Dashboard from './app/dashboard';
+import NotFound from './404';
+import PrivateRoute from '../components/router/PrivateRoute';
+import Wrapper from '../components/shared/Wrapper';
 
 const App = () => (
   <Wrapper>

src/pages/app/__tests__/builder.dataPersistence.test.js

@@ -3,8 +3,8 @@ import { fireEvent, screen } from '@testing-library/react';
 import { DatabaseConstants } from 'gatsby-plugin-firebase';
 
 import {
-  setupAndWait,
   expectDatabaseUpdateToHaveCompleted,
+  setupAndWait,
 } from './helpers/builder';
 
 const testTimeoutInMilliseconds = 20000;

src/pages/app/__tests__/builder.errorHandling.test.js

@@ -1,5 +1,5 @@
-import { navigate as mockNavigateFunction } from 'gatsby';
 import { fireEvent, getByText, screen, waitFor } from '@testing-library/react';
+import { navigate as mockNavigateFunction } from 'gatsby';
 
 import setup from './helpers/builder';
 

src/pages/app/__tests__/builder.settings.test.js

@@ -5,8 +5,8 @@ import { DatabaseConstants } from 'gatsby-plugin-firebase';
 import { languageStorageItemKey } from '../../../contexts/SettingsContext';
 
 import {
-  setupAndWait,
   expectDatabaseUpdateToHaveCompleted,
+  setupAndWait,
 } from './helpers/builder';
 
 const testTimeoutInMilliseconds = 20000;

src/pages/app/__tests__/builder.skills.test.js

@@ -6,10 +6,10 @@ import { DatabaseConstants } from 'gatsby-plugin-firebase';
 import { dataTestIdPrefix as listItemDataTestIdPrefix } from '../../../components/builder/lists/ListItem';
 
 import {
-  setupAndWait,
-  expectDatabaseUpdateToHaveCompleted,
   dragAndDropDirectionDown,
   dragAndDropListItem,
+  expectDatabaseUpdateToHaveCompleted,
+  setupAndWait,
 } from './helpers/builder';
 
 const testTimeoutInMilliseconds = 20000;

src/pages/app/__tests__/dashboard.createResume.test.js

@@ -10,12 +10,12 @@ import FirebaseStub, { DatabaseConstants } from 'gatsby-plugin-firebase';
 
 import { createResumeButtonDataTestId } from '../../../components/dashboard/CreateResume';
 import {
-  waitForResumeToBeRenderedInPreview,
-  expectResumeToBeRenderedInPreview,
-  waitForModalWindowToHaveBeenClosed,
   dismissNotification,
-  unsplashPhotoResponseUrl,
+  expectResumeToBeRenderedInPreview,
   setupWithFetchMockAndWait,
+  unsplashPhotoResponseUrl,
+  waitForModalWindowToHaveBeenClosed,
+  waitForResumeToBeRenderedInPreview,
 } from './helpers/dashboard';
 
 const tooShortResumeName = 'CV 1';

src/pages/app/__tests__/dashboard.deleteResume.test.js

@@ -8,14 +8,14 @@ import {
 
 import FirebaseStub, { DatabaseConstants } from 'gatsby-plugin-firebase';
 
-import { menuToggleDataTestIdPrefix as resumePreviewMenuToggleDataTestIdPrefix } from '../../../components/dashboard/ResumePreview';
 import {
+  dismissNotification,
+  expectResumeToBeRenderedInPreview,
+  findAndDismissNotification,
   setupAndWait,
   waitForResumeToDisappearFromPreview,
-  expectResumeToBeRenderedInPreview,
-  dismissNotification,
-  findAndDismissNotification,
 } from './helpers/dashboard';
+import { menuToggleDataTestIdPrefix as resumePreviewMenuToggleDataTestIdPrefix } from '../../../components/dashboard/ResumePreview';
 
 const waitForDatabaseRemoveToHaveCompleted = async (
   mockDatabaseRemoveFunction,
@@ -73,11 +73,8 @@ async function setup() {
 }
 
 it('removes resume from database and preview', async () => {
-  const {
-    resumeToDelete,
-    undeletedResume,
-    mockDatabaseRemoveFunction,
-  } = await setup();
+  const { resumeToDelete, undeletedResume, mockDatabaseRemoveFunction } =
+    await setup();
 
   await findAndDismissNotification();
 

src/pages/app/__tests__/dashboard.duplicateResume.test.js

@@ -7,13 +7,13 @@ import {
 
 import FirebaseStub, { DatabaseConstants } from 'gatsby-plugin-firebase';
 
-import { menuToggleDataTestIdPrefix as resumePreviewMenuToggleDataTestIdPrefix } from '../../../components/dashboard/ResumePreview';
 import {
-  setupWithFetchMockAndWait,
-  waitForResumeToBeRenderedInPreview,
   expectResumeToBeRenderedInPreview,
+  setupWithFetchMockAndWait,
   unsplashPhotoResponseUrl,
+  waitForResumeToBeRenderedInPreview,
 } from './helpers/dashboard';
+import { menuToggleDataTestIdPrefix as resumePreviewMenuToggleDataTestIdPrefix } from '../../../components/dashboard/ResumePreview';
 
 async function setup() {
   const user = DatabaseConstants.user1;

src/pages/app/__tests__/dashboard.rendering.test.js

@@ -4,9 +4,9 @@ import { DatabaseConstants } from 'gatsby-plugin-firebase';
 
 import { createResumeButtonDataTestId } from '../../../components/dashboard/CreateResume';
 import setup, {
-  setupAndWait,
-  expectResumeToBeRenderedInPreview,
   expectLoadingScreenToBeRendered,
+  expectResumeToBeRenderedInPreview,
+  setupAndWait,
   waitForLoadingScreenToDisappear,
 } from './helpers/dashboard';
 

src/pages/app/__tests__/helpers/builder.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   fireEvent,
   render,
@@ -6,21 +5,22 @@ import {
   waitFor,
   waitForElementToBeRemoved,
 } from '@testing-library/react';
+import React from 'react';
 
 import FirebaseStub, { DatabaseConstants } from 'gatsby-plugin-firebase';
 
-import { dataTestId as loadingScreenTestId } from '../../../../components/router/LoadingScreen';
-import { SettingsProvider } from '../../../../contexts/SettingsContext';
-import { ModalProvider } from '../../../../contexts/ModalContext';
-import { UserProvider } from '../../../../contexts/UserContext';
 import {
   DatabaseProvider,
   DebounceWaitTime,
 } from '../../../../contexts/DatabaseContext';
+import { ModalProvider } from '../../../../contexts/ModalContext';
 import { ResumeProvider } from '../../../../contexts/ResumeContext';
+import { SettingsProvider } from '../../../../contexts/SettingsContext';
 import { StorageProvider } from '../../../../contexts/StorageContext';
-import Wrapper from '../../../../components/shared/Wrapper';
+import { UserProvider } from '../../../../contexts/UserContext';
+import { dataTestId as loadingScreenTestId } from '../../../../components/router/LoadingScreen';
 import Builder from '../../builder';
+import Wrapper from '../../../../components/shared/Wrapper';
 
 const waitForDatabaseUpdateToHaveCompletedFn = async (
   mockDatabaseUpdateFunction,

src/pages/app/__tests__/helpers/dashboard.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   fireEvent,
   render,
@@ -6,6 +5,7 @@ import {
   waitFor,
   waitForElementToBeRemoved,
 } from '@testing-library/react';
+import React from 'react';
 
 import fetchMock from 'jest-fetch-mock';
 
@@ -13,16 +13,16 @@ import FirebaseStub, { DatabaseConstants } from 'gatsby-plugin-firebase';
 
 import '../../../../i18n/index';
 import '../../../../utils/dayjs';
-import { dataTestId as loadingScreenTestId } from '../../../../components/router/LoadingScreen';
-import { unsplashPhotoRequestUrl, delay } from '../../../../utils/index';
-import { SettingsProvider } from '../../../../contexts/SettingsContext';
-import { ModalProvider } from '../../../../contexts/ModalContext';
-import { UserProvider } from '../../../../contexts/UserContext';
 import { DatabaseProvider } from '../../../../contexts/DatabaseContext';
+import { ModalProvider } from '../../../../contexts/ModalContext';
 import { ResumeProvider } from '../../../../contexts/ResumeContext';
+import { SettingsProvider } from '../../../../contexts/SettingsContext';
 import { StorageProvider } from '../../../../contexts/StorageContext';
-import Wrapper from '../../../../components/shared/Wrapper';
+import { UserProvider } from '../../../../contexts/UserContext';
+import { delay, unsplashPhotoRequestUrl } from '../../../../utils/index';
+import { dataTestId as loadingScreenTestId } from '../../../../components/router/LoadingScreen';
 import Dashboard from '../../dashboard';
+import Wrapper from '../../../../components/shared/Wrapper';
 
 const waitForResumeToBeRenderedInPreview = async (resumeName) => {
   await screen.findByText(resumeName);

src/pages/app/builder.js

@@ -1,15 +1,15 @@
 import { navigate } from 'gatsby';
-import React, { memo, useContext, useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useTranslation } from 'react-i18next';
-import Artboard from '../../components/builder/center/Artboard';
-import LeftSidebar from '../../components/builder/left/LeftSidebar';
-import RightSidebar from '../../components/builder/right/RightSidebar';
-import LoadingScreen from '../../components/router/LoadingScreen';
-import DatabaseContext from '../../contexts/DatabaseContext';
+import React, { memo, useContext, useEffect, useMemo, useState } from 'react';
+import * as styles from './builder.module.css';
 import { useDispatch } from '../../contexts/ResumeContext';
+import Artboard from '../../components/builder/center/Artboard';
 import Button from '../../components/shared/Button';
-import styles from './builder.module.css';
+import DatabaseContext from '../../contexts/DatabaseContext';
+import LeftSidebar from '../../components/builder/left/LeftSidebar';
+import LoadingScreen from '../../components/router/LoadingScreen';
+import RightSidebar from '../../components/builder/right/RightSidebar';
 
 const Builder = ({ id }) => {
   const dispatch = useDispatch();

src/pages/app/dashboard.js

@@ -1,11 +1,11 @@
-import firebase from 'gatsby-plugin-firebase';
-import React, { useEffect, useState } from 'react';
 import { Helmet } from 'react-helmet';
 import { useTranslation } from 'react-i18next';
+import React, { useEffect, useState } from 'react';
+import firebase from 'gatsby-plugin-firebase';
 import CreateResume from '../../components/dashboard/CreateResume';
+import LoadingScreen from '../../components/router/LoadingScreen';
 import ResumePreview from '../../components/dashboard/ResumePreview';
 import TopNavbar from '../../components/dashboard/TopNavbar';
-import LoadingScreen from '../../components/router/LoadingScreen';
 
 const Dashboard = ({ user }) => {
   const { t } = useTranslation();

src/pages/faq.js

@@ -1,7 +1,7 @@
-import { Link } from '@reach/router';
-import React from 'react';
 import { Helmet } from 'react-helmet';
+import { Link } from '@reach/router';
 import { MdKeyboardArrowLeft } from 'react-icons/md';
+import React from 'react';
 import Wrapper from '../components/shared/Wrapper';
 
 const FrequentlyAskedQuestions = () => (

src/pages/index.js

@@ -1,10 +1,10 @@
-import { Link } from '@reach/router';
-import React, { memo } from 'react';
-import { Helmet } from 'react-helmet';
-import { useTranslation } from 'react-i18next';
 import { FaUserSecret, FaWalking } from 'react-icons/fa';
+import { Helmet } from 'react-helmet';
 import { IoIosRocket } from 'react-icons/io';
+import { Link } from '@reach/router';
 import { RiRefreshLine } from 'react-icons/ri';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
 import Hero from '../components/landing/Hero';
 import Screenshots from '../components/landing/Screenshots';
 import Wrapper from '../components/shared/Wrapper';

src/pages/r.js

@@ -1,8 +1,8 @@
 import { Redirect, Router } from '@reach/router';
 import React, { memo } from 'react';
-import Wrapper from '../components/shared/Wrapper';
-import ResumeViewer from './r/view';
 import NotFound from './404';
+import ResumeViewer from './r/view';
+import Wrapper from '../components/shared/Wrapper';
 
 const ResumeRouter = () => (
   <Wrapper>

src/pages/r/view.js

@@ -1,19 +1,19 @@
-import { Link, navigate } from '@reach/router';
-import React, { memo, useContext, useEffect, useMemo, useState } from 'react';
 import { Helmet } from 'react-helmet';
+import { Link, navigate } from '@reach/router';
 import { toast } from 'react-toastify';
 import { useTranslation } from 'react-i18next';
-import LoadingScreen from '../../components/router/LoadingScreen';
-import DatabaseContext from '../../contexts/DatabaseContext';
+import React, { memo, useContext, useEffect, useMemo, useState } from 'react';
+import * as styles from './view.module.css';
+import { scaler } from '../../utils';
 import Castform from '../../templates/Castform';
+import Celebi from '../../templates/Celebi';
+import DatabaseContext from '../../contexts/DatabaseContext';
 import Gengar from '../../templates/Gengar';
 import Glalie from '../../templates/Glalie';
+import LoadingScreen from '../../components/router/LoadingScreen';
 import Onyx from '../../templates/Onyx';
 import Pikachu from '../../templates/Pikachu';
-import styles from './view.module.css';
-import Celebi from '../../templates/Celebi';
 import fontSizeOptions from '../../data/fontSizeOptions';
-import { scaler } from '../../utils';
 
 const ResumeViewer = ({ id }) => {
   const { t, i18n } = useTranslation();