Merge remote-tracking branch 'upstream/develop' into develop

src/contexts/DatabaseContext.js

@@ -1,10 +1,10 @@
-import firebase from 'gatsby-plugin-firebase';
 import { debounce } from 'lodash';
-import ShortUniqueId from 'short-unique-id';
 import React, { createContext, memo, useContext, useState } from 'react';
+import ShortUniqueId from 'short-unique-id';
+import firebase from 'gatsby-plugin-firebase';
 import UserContext from './UserContext';
-import initialState from '../data/initialState.json';
 import { getUnsplashPhoto } from '../utils';
+import initialState from '../data/initialState.json';
 
 const DEBOUNCE_WAIT_TIME = 4000;
 

src/contexts/ResumeContext.js

@@ -1,15 +1,14 @@
-import arrayMove from 'array-move';
-import { v4 as uuidv4 } from 'uuid';
 import {
   clone,
   findIndex,
   get,
+  has,
   isUndefined,
   merge,
-  setWith,
   set,
-  has,
+  setWith,
 } from 'lodash';
+import { v4 as uuidv4 } from 'uuid';
 import React, {
   createContext,
   memo,
@@ -17,10 +16,11 @@ import React, {
   useContext,
   useReducer,
 } from 'react';
+import arrayMove from 'array-move';
 import i18next from 'i18next';
 import demoState from '../data/demoState.json';
-import initialState from '../data/initialState.json';
 import DatabaseContext from './DatabaseContext';
+import initialState from '../data/initialState.json';
 
 const ResumeContext = createContext({});
 

src/contexts/SettingsContext.js

@@ -1,5 +1,5 @@
-import i18next from 'i18next';
 import React, { createContext, memo, useEffect, useState } from 'react';
+import i18next from 'i18next';
 import themeConfig from '../data/themeConfig';
 
 const languageStorageItemKey = 'language';

src/contexts/StorageContext.js

@@ -1,6 +1,6 @@
-import firebase from 'gatsby-plugin-firebase';
-import React, { createContext, memo, useContext, useRef } from 'react';
 import { toast } from 'react-toastify';
+import React, { createContext, memo, useContext, useRef } from 'react';
+import firebase from 'gatsby-plugin-firebase';
 import { isFileImage } from '../utils';
 import { useDispatch, useSelector } from './ResumeContext';
 import UserContext from './UserContext';

src/contexts/UserContext.js

@@ -1,8 +1,8 @@
 import { navigate } from '@reach/router';
-import firebase from 'gatsby-plugin-firebase';
 import { pick } from 'lodash';
-import React, { createContext, memo, useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
+import React, { createContext, memo, useEffect, useState } from 'react';
+import firebase from 'gatsby-plugin-firebase';
 import useAuthState from '../hooks/useAuthState';
 
 const defaultUser = {