diff --git a/src/components/builder/right/RightSidebar.js b/src/components/builder/right/RightSidebar.js
index 76005b06..d3c99df3 100644
--- a/src/components/builder/right/RightSidebar.js
+++ b/src/components/builder/right/RightSidebar.js
@@ -1,16 +1,16 @@
-import React, { Fragment, memo } from 'react';
import { Element } from 'react-scroll';
-import sections from '../../../data/rightSections';
-import RightNavbar from './RightNavbar';
-import styles from './RightSidebar.module.css';
+import React, { Fragment, memo } from 'react';
+import * as styles from './RightSidebar.module.css';
import About from './sections/About';
import Actions from './sections/Actions';
import Colors from './sections/Colors';
+import FontSize from './sections/FontSize';
import Fonts from './sections/Fonts';
import Layout from './sections/Layout';
+import RightNavbar from './RightNavbar';
import Settings from './sections/Settings';
import Templates from './sections/Templates';
-import FontSize from './sections/FontSize';
+import sections from '../../../data/rightSections';
const getComponent = (id) => {
switch (id) {
diff --git a/src/components/builder/right/SyncIndicator.js b/src/components/builder/right/SyncIndicator.js
index 23868575..c64fe880 100644
--- a/src/components/builder/right/SyncIndicator.js
+++ b/src/components/builder/right/SyncIndicator.js
@@ -1,6 +1,6 @@
-import cx from 'classnames';
-import React, { memo, useContext } from 'react';
import { MdSync } from 'react-icons/md';
+import React, { memo, useContext } from 'react';
+import cx from 'classnames';
import DatabaseContext from '../../../contexts/DatabaseContext';
const SyncIndicator = () => {
diff --git a/src/components/builder/right/sections/About.js b/src/components/builder/right/sections/About.js
index 78ce9102..094b2ef7 100644
--- a/src/components/builder/right/sections/About.js
+++ b/src/components/builder/right/sections/About.js
@@ -1,11 +1,11 @@
-import React, { memo } from 'react';
-import { FaCoffee, FaBug, FaExternalLinkAlt } from 'react-icons/fa';
+import { FaBug, FaCoffee, FaExternalLinkAlt } from 'react-icons/fa';
import { MdCode } from 'react-icons/md';
import { Trans, useTranslation } from 'react-i18next';
-import { useStaticQuery, graphql } from 'gatsby';
+import { graphql, useStaticQuery } from 'gatsby';
+import React, { memo } from 'react';
import Button from '../../../shared/Button';
import Heading from '../../../shared/Heading';
-import styles from './About.module.css';
+import * as styles from './About.module.css';
const About = ({ id }) => {
const { t } = useTranslation();
diff --git a/src/components/builder/right/sections/Actions.js b/src/components/builder/right/sections/Actions.js
index a968e261..4801e517 100644
--- a/src/components/builder/right/sections/Actions.js
+++ b/src/components/builder/right/sections/Actions.js
@@ -1,12 +1,12 @@
-import React, { memo, useContext, useState } from 'react';
import { FaFileExport, FaFileImport } from 'react-icons/fa';
import { useTranslation } from 'react-i18next';
-import ModalContext from '../../../../contexts/ModalContext';
+import React, { memo, useContext, useState } from 'react';
+import * as styles from './Actions.module.css';
import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
import Button from '../../../shared/Button';
import Heading from '../../../shared/Heading';
import Input from '../../../shared/Input';
-import styles from './Actions.module.css';
+import ModalContext from '../../../../contexts/ModalContext';
const Actions = ({ id }) => {
const { t } = useTranslation();
diff --git a/src/components/builder/right/sections/Colors.js b/src/components/builder/right/sections/Colors.js
index b1c2c198..9ed03478 100644
--- a/src/components/builder/right/sections/Colors.js
+++ b/src/components/builder/right/sections/Colors.js
@@ -1,12 +1,12 @@
/* eslint-disable jsx-a11y/control-has-associated-label */
-import React, { memo } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch } from '../../../../contexts/ResumeContext';
-import colorOptions from '../../../../data/colorOptions';
+import React, { memo } from 'react';
+import * as styles from './Colors.module.css';
import { handleKeyUp } from '../../../../utils';
+import { useDispatch } from '../../../../contexts/ResumeContext';
import Heading from '../../../shared/Heading';
import Input from '../../../shared/Input';
-import styles from './Colors.module.css';
+import colorOptions from '../../../../data/colorOptions';
const Colors = ({ id }) => {
const dispatch = useDispatch();
diff --git a/src/components/builder/right/sections/FontSize.js b/src/components/builder/right/sections/FontSize.js
index dd796915..03ece535 100644
--- a/src/components/builder/right/sections/FontSize.js
+++ b/src/components/builder/right/sections/FontSize.js
@@ -1,9 +1,9 @@
/* eslint-disable jsx-a11y/control-has-associated-label */
import React, { memo, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
-import fontSizeOptions from '../../../../data/fontSizeOptions';
import { scaler } from '../../../../utils';
+import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
import Heading from '../../../shared/Heading';
+import fontSizeOptions from '../../../../data/fontSizeOptions';
const FontSizes = ({ id }) => {
const steps = 20;
diff --git a/src/components/builder/right/sections/Fonts.js b/src/components/builder/right/sections/Fonts.js
index 3bb1b0ab..81d5603b 100644
--- a/src/components/builder/right/sections/Fonts.js
+++ b/src/components/builder/right/sections/Fonts.js
@@ -1,10 +1,10 @@
-import cx from 'classnames';
import React, { memo } from 'react';
-import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
-import fontOptions from '../../../../data/fontOptions';
+import cx from 'classnames';
+import * as styles from './Fonts.module.css';
import { handleKeyUp } from '../../../../utils';
+import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
import Heading from '../../../shared/Heading';
-import styles from './Fonts.module.css';
+import fontOptions from '../../../../data/fontOptions';
const Fonts = ({ id }) => {
const dispatch = useDispatch();
diff --git a/src/components/builder/right/sections/Layout.js b/src/components/builder/right/sections/Layout.js
index e2ff2a15..36729486 100644
--- a/src/components/builder/right/sections/Layout.js
+++ b/src/components/builder/right/sections/Layout.js
@@ -1,11 +1,11 @@
-import React, { memo, useState } from 'react';
import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
+import React, { memo, useState } from 'react';
+import * as styles from './Layout.module.css';
import { move, reorder } from '../../../../utils';
+import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
import Button from '../../../shared/Button';
import Heading from '../../../shared/Heading';
-import styles from './Layout.module.css';
const Layout = ({ id }) => {
const { t } = useTranslation();
diff --git a/src/components/builder/right/sections/Settings.js b/src/components/builder/right/sections/Settings.js
index dacc6fcb..20009b78 100644
--- a/src/components/builder/right/sections/Settings.js
+++ b/src/components/builder/right/sections/Settings.js
@@ -1,16 +1,16 @@
-import React, { memo, useContext, useState } from 'react';
import { FaAngleDown } from 'react-icons/fa';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { toast } from 'react-toastify';
-import UserContext from '../../../../contexts/UserContext';
-import Button from '../../../shared/Button';
-import Heading from '../../../shared/Heading';
-import styles from './Settings.module.css';
-import Input from '../../../shared/Input';
-import SettingsContext from '../../../../contexts/SettingsContext';
-import themeConfig from '../../../../data/themeConfig';
+import React, { memo, useContext, useState } from 'react';
+import * as styles from './Settings.module.css';
import { languages } from '../../../../i18n';
import { useDispatch } from '../../../../contexts/ResumeContext';
+import Button from '../../../shared/Button';
+import Heading from '../../../shared/Heading';
+import Input from '../../../shared/Input';
+import SettingsContext from '../../../../contexts/SettingsContext';
+import UserContext from '../../../../contexts/UserContext';
+import themeConfig from '../../../../data/themeConfig';
const Settings = ({ id }) => {
const { t } = useTranslation();
@@ -18,15 +18,13 @@ const Settings = ({ id }) => {
const [deleteText, setDeleteText] = useState(
t('builder.settings.dangerZone.button'),
);
- const [isDeleteAccountInProgress, setDeleteAccountInProgress] = useState(
- false,
- );
+ const [isDeleteAccountInProgress, setDeleteAccountInProgress] =
+ useState(false);
const dispatch = useDispatch();
const { deleteAccount } = useContext(UserContext);
- const { theme, setTheme, language, setLanguage } = useContext(
- SettingsContext,
- );
+ const { theme, setTheme, language, setLanguage } =
+ useContext(SettingsContext);
const handleChangeTheme = (e) => {
setTheme(e.target.value);
diff --git a/src/components/builder/right/sections/Templates.js b/src/components/builder/right/sections/Templates.js
index 2ed6f5d6..111a8bff 100644
--- a/src/components/builder/right/sections/Templates.js
+++ b/src/components/builder/right/sections/Templates.js
@@ -1,12 +1,12 @@
-import cx from 'classnames';
import { graphql, useStaticQuery } from 'gatsby';
-import GatsbyImage from 'gatsby-image';
+import { GatsbyImage } from 'gatsby-plugin-image';
import React, { memo } from 'react';
-import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
-import templateOptions from '../../../../data/templateOptions';
+import cx from 'classnames';
+import * as styles from './Templates.module.css';
import { handleKeyUp } from '../../../../utils';
+import { useDispatch, useSelector } from '../../../../contexts/ResumeContext';
import Heading from '../../../shared/Heading';
-import styles from './Templates.module.css';
+import templateOptions from '../../../../data/templateOptions';
const Templates = ({ id }) => {
const dispatch = useDispatch();
@@ -16,44 +16,32 @@ const Templates = ({ id }) => {
query {
onyx: file(relativePath: { eq: "templates/onyx.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
pikachu: file(relativePath: { eq: "templates/pikachu.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
gengar: file(relativePath: { eq: "templates/gengar.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
castform: file(relativePath: { eq: "templates/castform.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
glalie: file(relativePath: { eq: "templates/glalie.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
celebi: file(relativePath: { eq: "templates/celebi.png" }) {
childImageSharp {
- fluid(maxHeight: 400) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED, height: 240)
}
}
}
@@ -87,10 +75,7 @@ const Templates = ({ id }) => {
>
{x.name}
diff --git a/src/components/dashboard/CreateResume.js b/src/components/dashboard/CreateResume.js
index a1ec0b4e..534dd05e 100644
--- a/src/components/dashboard/CreateResume.js
+++ b/src/components/dashboard/CreateResume.js
@@ -1,9 +1,9 @@
-import React, { memo, useContext } from 'react';
import { MdAdd } from 'react-icons/md';
import { useTranslation } from 'react-i18next';
-import ModalContext from '../../contexts/ModalContext';
+import React, { memo, useContext } from 'react';
+import * as styles from './CreateResume.module.css';
import { handleKeyUp } from '../../utils';
-import styles from './CreateResume.module.css';
+import ModalContext from '../../contexts/ModalContext';
const createResumeButtonDataTestId = 'create-resume-button';
diff --git a/src/components/dashboard/ResumePreview.js b/src/components/dashboard/ResumePreview.js
index 52fca468..a1b46a5e 100644
--- a/src/components/dashboard/ResumePreview.js
+++ b/src/components/dashboard/ResumePreview.js
@@ -1,13 +1,13 @@
+import { MdMoreHoriz, MdOpenInNew } from 'react-icons/md';
import { Menu, MenuItem } from '@material-ui/core';
import { navigate } from 'gatsby';
-import React, { useContext, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { MdMoreHoriz, MdOpenInNew } from 'react-icons/md';
import { toast } from 'react-toastify';
+import { useTranslation } from 'react-i18next';
+import React, { useContext, useState } from 'react';
import dayjs from 'dayjs';
import DatabaseContext from '../../contexts/DatabaseContext';
import ModalContext from '../../contexts/ModalContext';
-import styles from './ResumePreview.module.css';
+import * as styles from './ResumePreview.module.css';
const menuToggleDataTestIdPrefix = 'resume-preview-menu-toggle-';
diff --git a/src/components/dashboard/TopNavbar.js b/src/components/dashboard/TopNavbar.js
index 08fb46c5..c585d973 100644
--- a/src/components/dashboard/TopNavbar.js
+++ b/src/components/dashboard/TopNavbar.js
@@ -1,8 +1,8 @@
import { Link } from 'gatsby';
import React, { memo } from 'react';
+import * as styles from './TopNavbar.module.css';
import Avatar from '../shared/Avatar';
import Logo from '../shared/Logo';
-import styles from './TopNavbar.module.css';
const TopNavbar = () => (
diff --git a/src/components/landing/Hero.js b/src/components/landing/Hero.js
index 183600c0..15ec3eaa 100644
--- a/src/components/landing/Hero.js
+++ b/src/components/landing/Hero.js
@@ -1,11 +1,11 @@
import { Link } from '@reach/router';
import { navigate } from 'gatsby';
-import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
-import ModalContext from '../../contexts/ModalContext';
-import UserContext from '../../contexts/UserContext';
+import React, { memo, useContext } from 'react';
import Button from '../shared/Button';
import Logo from '../shared/Logo';
+import ModalContext from '../../contexts/ModalContext';
+import UserContext from '../../contexts/UserContext';
const Hero = () => {
const { t } = useTranslation();
diff --git a/src/components/landing/Screenshots.js b/src/components/landing/Screenshots.js
index f4a5ed4d..059bcd99 100644
--- a/src/components/landing/Screenshots.js
+++ b/src/components/landing/Screenshots.js
@@ -1,7 +1,7 @@
+import { graphql, useStaticQuery } from 'gatsby';
+import { GatsbyImage } from 'gatsby-plugin-image';
import React from 'react';
-import { useStaticQuery, graphql } from 'gatsby';
-import GatsbyImage from 'gatsby-image';
-import styles from './Screenshots.module.css';
+import * as styles from './Screenshots.module.css';
const Screenshots = () => {
const screenshots = useStaticQuery(graphql`
@@ -11,9 +11,7 @@ const Screenshots = () => {
original {
src
}
- fixed(width: 320) {
- ...GatsbyImageSharpFixed
- }
+ gatsbyImageData(layout: FIXED, width: 400)
}
}
screen2: file(relativePath: { eq: "screenshots/screen-2.png" }) {
@@ -21,9 +19,7 @@ const Screenshots = () => {
original {
src
}
- fixed(width: 320) {
- ...GatsbyImageSharpFixed
- }
+ gatsbyImageData(layout: FIXED, width: 400)
}
}
screen3: file(relativePath: { eq: "screenshots/screen-3.png" }) {
@@ -31,9 +27,7 @@ const Screenshots = () => {
original {
src
}
- fixed(width: 320) {
- ...GatsbyImageSharpFixed
- }
+ gatsbyImageData(layout: FIXED, width: 400)
}
}
screen4: file(relativePath: { eq: "screenshots/screen-4.png" }) {
@@ -41,9 +35,7 @@ const Screenshots = () => {
original {
src
}
- fixed(width: 320) {
- ...GatsbyImageSharpFixed
- }
+ gatsbyImageData(layout: FIXED, width: 400)
}
}
screen5: file(relativePath: { eq: "screenshots/screen-5.png" }) {
@@ -51,9 +43,7 @@ const Screenshots = () => {
original {
src
}
- fixed(width: 320) {
- ...GatsbyImageSharpFixed
- }
+ gatsbyImageData(layout: FIXED, width: 400)
}
}
}
@@ -74,7 +64,7 @@ const Screenshots = () => {
>
Reactive Resume Screenshot
diff --git a/src/components/router/PrivateRoute.js b/src/components/router/PrivateRoute.js
index d78c66e3..abbfd9ac 100644
--- a/src/components/router/PrivateRoute.js
+++ b/src/components/router/PrivateRoute.js
@@ -1,7 +1,7 @@
import { navigate } from 'gatsby';
import React, { memo, useContext } from 'react';
-import UserContext from '../../contexts/UserContext';
import LoadingScreen from './LoadingScreen';
+import UserContext from '../../contexts/UserContext';
const PrivateRoute = ({ component: Component, ...props }) => {
const { user, loading } = useContext(UserContext);
diff --git a/src/components/shared/Avatar.js b/src/components/shared/Avatar.js
index e04cb202..2199c222 100644
--- a/src/components/shared/Avatar.js
+++ b/src/components/shared/Avatar.js
@@ -1,11 +1,11 @@
-import cx from 'classnames';
-import { toUrl } from 'gatsby-source-gravatar';
-import React, { memo, useContext, useMemo, useState } from 'react';
import { Menu, MenuItem } from '@material-ui/core';
+import { toUrl } from 'gatsby-source-gravatar';
import { useTranslation } from 'react-i18next';
+import React, { memo, useContext, useMemo, useState } from 'react';
+import cx from 'classnames';
import UserContext from '../../contexts/UserContext';
-import styles from './Avatar.module.css';
import { handleKeyUp } from '../../utils';
+import * as styles from './Avatar.module.css';
const Avatar = ({ className }) => {
const { t } = useTranslation();
@@ -20,9 +20,10 @@ const Avatar = ({ className }) => {
handleClose();
};
- const photoURL = useMemo(() => toUrl(user.email || '', 'size=128&d=retro'), [
- user.email,
- ]);
+ const photoURL = useMemo(
+ () => toUrl(user.email || '', 'size=128&d=retro'),
+ [user.email],
+ );
return (
diff --git a/src/components/shared/Button.js b/src/components/shared/Button.js
index 000879b7..7c84e1e1 100644
--- a/src/components/shared/Button.js
+++ b/src/components/shared/Button.js
@@ -1,8 +1,8 @@
-import cx from 'classnames';
-import React, { memo } from 'react';
import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
+import cx from 'classnames';
import { handleKeyUp } from '../../utils';
-import styles from './Button.module.css';
+import * as styles from './Button.module.css';
const Button = ({
icon,
@@ -22,7 +22,7 @@ const Button = ({
onClick={isLoading ? undefined : onClick}
className={cx(styles.container, className, {
[styles.outline]: outline,
- [styles.delete]: isDelete,
+ [styles.remove]: isDelete,
})}
>
{icon && }
diff --git a/src/components/shared/Button.module.css b/src/components/shared/Button.module.css
index a428b66c..5d5225c1 100644
--- a/src/components/shared/Button.module.css
+++ b/src/components/shared/Button.module.css
@@ -31,14 +31,14 @@
@apply outline-none;
}
-.container.delete {
+.container.remove {
@apply bg-red-600 border-red-600 text-white;
}
-.container.delete:hover {
+.container.remove:hover {
@apply bg-red-700 border-red-700;
}
-.container.delete:focus {
+.container.remove:focus {
@apply outline-none;
}
diff --git a/src/components/shared/Heading.js b/src/components/shared/Heading.js
index e57f0eb0..d773168f 100644
--- a/src/components/shared/Heading.js
+++ b/src/components/shared/Heading.js
@@ -1,5 +1,5 @@
-import React, { memo } from 'react';
import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { useSelector } from '../../contexts/ResumeContext';
const Heading = ({ id }) => {
diff --git a/src/components/shared/Input.js b/src/components/shared/Input.js
index f1b1cc7b..021635e1 100644
--- a/src/components/shared/Input.js
+++ b/src/components/shared/Input.js
@@ -1,13 +1,13 @@
-import cx from 'classnames';
-import { isFunction } from 'lodash';
-import React, { memo, useEffect, useState } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
import { FaAngleDown } from 'react-icons/fa';
import { MdOpenInNew } from 'react-icons/md';
+import { Trans, useTranslation } from 'react-i18next';
+import { isFunction } from 'lodash';
import { v4 as uuidv4 } from 'uuid';
+import React, { memo, useEffect, useState } from 'react';
+import cx from 'classnames';
import { useDispatch, useSelector } from '../../contexts/ResumeContext';
import { handleKeyUp } from '../../utils';
-import styles from './Input.module.css';
+import * as styles from './Input.module.css';
const Input = ({
name,
diff --git a/src/components/shared/Logo.js b/src/components/shared/Logo.js
index 71350940..965d0a61 100644
--- a/src/components/shared/Logo.js
+++ b/src/components/shared/Logo.js
@@ -1,17 +1,15 @@
-import cx from 'classnames';
import { graphql, useStaticQuery } from 'gatsby';
-import GatsbyImage from 'gatsby-image';
+import { GatsbyImage } from 'gatsby-plugin-image';
import React, { memo } from 'react';
-import styles from './Logo.module.css';
+import cx from 'classnames';
+import * as styles from './Logo.module.css';
const Logo = ({ size = '256px', className }) => {
const { file } = useStaticQuery(graphql`
query {
file(relativePath: { eq: "logo.png" }) {
childImageSharp {
- fluid(maxWidth: 512) {
- ...GatsbyImageSharpFluid
- }
+ gatsbyImageData(layout: FIXED)
}
}
}
@@ -20,9 +18,10 @@ const Logo = ({ size = '256px', className }) => {
return (
);
};
diff --git a/src/components/shared/PhotoUpload.js b/src/components/shared/PhotoUpload.js
index dadad31c..f80452cb 100644
--- a/src/components/shared/PhotoUpload.js
+++ b/src/components/shared/PhotoUpload.js
@@ -1,11 +1,11 @@
-import { Tooltip } from '@material-ui/core';
-import React, { memo, useContext, useRef } from 'react';
import { MdFileUpload } from 'react-icons/md';
+import { Tooltip } from '@material-ui/core';
import { useTranslation } from 'react-i18next';
-import StorageContext from '../../contexts/StorageContext';
+import React, { memo, useContext, useRef } from 'react';
import { handleKeyUp } from '../../utils';
import Input from './Input';
-import styles from './PhotoUpload.module.css';
+import * as styles from './PhotoUpload.module.css';
+import StorageContext from '../../contexts/StorageContext';
const PhotoUpload = () => {
const fileInputRef = useRef(null);
diff --git a/src/components/shared/SectionIcon.js b/src/components/shared/SectionIcon.js
index a6f9dbf2..ac90d562 100644
--- a/src/components/shared/SectionIcon.js
+++ b/src/components/shared/SectionIcon.js
@@ -1,8 +1,8 @@
-import { Tooltip } from '@material-ui/core';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import { Link } from 'react-scroll';
-import styles from './SectionIcon.module.css';
+import { Tooltip } from '@material-ui/core';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
+import * as styles from './SectionIcon.module.css';
const SectionIcon = ({ section, containerId, tooltipPlacement }) => {
const { t } = useTranslation();
diff --git a/src/components/shared/Wrapper.js b/src/components/shared/Wrapper.js
index 522a5fd7..ced2108a 100644
--- a/src/components/shared/Wrapper.js
+++ b/src/components/shared/Wrapper.js
@@ -1,6 +1,6 @@
-import React, { memo, useEffect } from 'react';
-import { Slide, toast } from 'react-toastify';
import { Helmet } from 'react-helmet';
+import { Slide, toast } from 'react-toastify';
+import React, { memo, useEffect } from 'react';
import ModalRegistrar from '../../modals/ModalRegistrar';
const Wrapper = ({ children }) => {
diff --git a/src/contexts/DatabaseContext.js b/src/contexts/DatabaseContext.js
index f0b3ab55..bc38b811 100644
--- a/src/contexts/DatabaseContext.js
+++ b/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;
diff --git a/src/contexts/ResumeContext.js b/src/contexts/ResumeContext.js
index c8c020cb..7bc89620 100644
--- a/src/contexts/ResumeContext.js
+++ b/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({});
diff --git a/src/contexts/SettingsContext.js b/src/contexts/SettingsContext.js
index a3277a53..62efd1b1 100644
--- a/src/contexts/SettingsContext.js
+++ b/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';
diff --git a/src/contexts/StorageContext.js b/src/contexts/StorageContext.js
index 28d4237d..d5d43960 100644
--- a/src/contexts/StorageContext.js
+++ b/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';
diff --git a/src/contexts/UserContext.js b/src/contexts/UserContext.js
index 5132927c..314ba58d 100644
--- a/src/contexts/UserContext.js
+++ b/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 = {
diff --git a/src/data/rightSections.js b/src/data/rightSections.js
index ab14c858..74c0ed9a 100644
--- a/src/data/rightSections.js
+++ b/src/data/rightSections.js
@@ -2,11 +2,11 @@ import {
MdColorLens,
MdDashboard,
MdFontDownload,
+ MdFormatSize,
MdImportExport,
MdInfo,
MdSettings,
MdStyle,
- MdFormatSize,
} from 'react-icons/md';
export default [
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 95718e45..15eb87f8 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -1,5 +1,5 @@
-import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
+import i18n from 'i18next';
import resources from './locales';
const languages = [
diff --git a/src/i18n/locales/index.js b/src/i18n/locales/index.js
index 55504c05..423c22f3 100644
--- a/src/i18n/locales/index.js
+++ b/src/i18n/locales/index.js
@@ -14,8 +14,8 @@ import it from './it.json';
import ja from './ja.json';
import kn from './kn.json';
import lt from './lt.json';
-import nl from './nl.json';
import nb from './nb.json';
+import nl from './nl.json';
import pl from './pl.json';
import ptBr from './pt-br.json';
import ptPt from './pt-pt.json';
diff --git a/src/modals/AuthModal.js b/src/modals/AuthModal.js
index 716668b3..01852193 100644
--- a/src/modals/AuthModal.js
+++ b/src/modals/AuthModal.js
@@ -1,10 +1,10 @@
import { navigate } from 'gatsby';
-import React, { memo, useContext, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import React, { memo, useContext, useEffect, useState } from 'react';
+import BaseModal from './BaseModal';
import Button from '../components/shared/Button';
import ModalContext from '../contexts/ModalContext';
import UserContext from '../contexts/UserContext';
-import BaseModal from './BaseModal';
const AuthModal = () => {
const { t } = useTranslation();
@@ -13,9 +13,8 @@ const AuthModal = () => {
const [isLoadingAnonymous, setLoadingAnonymous] = useState(false);
const { emitter, events } = useContext(ModalContext);
- const { user, loginWithGoogle, loginAnonymously, logout } = useContext(
- UserContext,
- );
+ const { user, loginWithGoogle, loginAnonymously, logout } =
+ useContext(UserContext);
useEffect(() => {
const unbind = emitter.on(events.AUTH_MODAL, () => setOpen(true));
diff --git a/src/modals/BaseModal.js b/src/modals/BaseModal.js
index 2a7dc2f0..67acdc76 100644
--- a/src/modals/BaseModal.js
+++ b/src/modals/BaseModal.js
@@ -1,11 +1,11 @@
import { Backdrop, Fade, Modal } from '@material-ui/core';
-import { isFunction } from 'lodash';
-import React, { forwardRef, memo, useImperativeHandle } from 'react';
-import { useTranslation } from 'react-i18next';
import { MdClose } from 'react-icons/md';
+import { isFunction } from 'lodash';
+import { useTranslation } from 'react-i18next';
+import React, { forwardRef, memo, useImperativeHandle } from 'react';
import Button from '../components/shared/Button';
import { handleKeyUp } from '../utils';
-import styles from './BaseModal.module.css';
+import * as styles from './BaseModal.module.css';
const BaseModal = forwardRef(
({ title, state, children, action, hideActions = false, onDestroy }, ref) => {
diff --git a/src/modals/DataModal.js b/src/modals/DataModal.js
index 9f26a994..f34ed3ac 100644
--- a/src/modals/DataModal.js
+++ b/src/modals/DataModal.js
@@ -1,14 +1,14 @@
-import { useFormikContext } from 'formik';
import { isEmpty, isFunction } from 'lodash';
-import React, { memo, useContext, useEffect, useRef, useState } from 'react';
-import { v4 as uuidv4 } from 'uuid';
-import { useTranslation } from 'react-i18next';
import { toast } from 'react-toastify';
+import { useFormikContext } from 'formik';
+import { useTranslation } from 'react-i18next';
+import { v4 as uuidv4 } from 'uuid';
+import React, { memo, useContext, useEffect, useRef, useState } from 'react';
+import { useDispatch } from '../contexts/ResumeContext';
+import BaseModal from './BaseModal';
import Button from '../components/shared/Button';
import ModalContext from '../contexts/ModalContext';
-import { useDispatch } from '../contexts/ResumeContext';
import { getModalText } from '../utils';
-import BaseModal from './BaseModal';
const DataModal = ({
name,
diff --git a/src/modals/ModalRegistrar.js b/src/modals/ModalRegistrar.js
index 15156ee6..3009d152 100644
--- a/src/modals/ModalRegistrar.js
+++ b/src/modals/ModalRegistrar.js
@@ -1,6 +1,5 @@
import React, { memo } from 'react';
import AuthModal from './AuthModal';
-import ResumeModal from './ResumeModal';
import AwardModal from './sections/AwardModal';
import CertificateModal from './sections/CertificateModal';
import EducationModal from './sections/EducationModal';
@@ -10,6 +9,7 @@ import ImportModal from './sections/ImportModal';
import LanguageModal from './sections/LanguageModal';
import ProjectModal from './sections/ProjectModal';
import ReferenceModal from './sections/ReferenceModal';
+import ResumeModal from './ResumeModal';
import SkillModal from './sections/SkillModal';
import SocialModal from './sections/SocialModal';
import WorkModal from './sections/WorkModal';
diff --git a/src/modals/ResumeModal.js b/src/modals/ResumeModal.js
index 77a7ce68..177de061 100644
--- a/src/modals/ResumeModal.js
+++ b/src/modals/ResumeModal.js
@@ -1,12 +1,12 @@
-import { Formik } from 'formik';
-import React, { memo, useContext } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../components/shared/Input';
-import ModalEvents from '../constants/ModalEvents';
-import DatabaseContext from '../contexts/DatabaseContext';
+import React, { memo, useContext } from 'react';
import { getFieldProps } from '../utils';
import DataModal from './DataModal';
+import DatabaseContext from '../contexts/DatabaseContext';
+import Input from '../components/shared/Input';
+import ModalEvents from '../constants/ModalEvents';
const initialValues = {
name: '',
diff --git a/src/modals/sections/AwardModal.js b/src/modals/sections/AwardModal.js
index e80852cc..be5a4a4e 100644
--- a/src/modals/sections/AwardModal.js
+++ b/src/modals/sections/AwardModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import { Formik } from 'formik';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
title: '',
diff --git a/src/modals/sections/CertificateModal.js b/src/modals/sections/CertificateModal.js
index 32801b14..36133819 100644
--- a/src/modals/sections/CertificateModal.js
+++ b/src/modals/sections/CertificateModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import { Formik } from 'formik';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
title: '',
diff --git a/src/modals/sections/EducationModal.js b/src/modals/sections/EducationModal.js
index 709de53a..8dbd6744 100644
--- a/src/modals/sections/EducationModal.js
+++ b/src/modals/sections/EducationModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
institution: '',
diff --git a/src/modals/sections/ExportModal.js b/src/modals/sections/ExportModal.js
index a2c49e85..c40f3376 100644
--- a/src/modals/sections/ExportModal.js
+++ b/src/modals/sections/ExportModal.js
@@ -1,15 +1,15 @@
+import { FaPrint } from 'react-icons/fa';
+import { clone } from 'lodash';
+import { toast } from 'react-toastify';
+import { useTranslation } from 'react-i18next';
+import React, { memo, useContext, useEffect, useState } from 'react';
import download from 'downloadjs';
import firebase from 'gatsby-plugin-firebase';
-import { clone } from 'lodash';
-import React, { memo, useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { FaPrint } from 'react-icons/fa';
-import { toast } from 'react-toastify';
+import { useSelector } from '../../contexts/ResumeContext';
+import BaseModal from '../BaseModal';
import Button from '../../components/shared/Button';
import ModalContext from '../../contexts/ModalContext';
-import { useSelector } from '../../contexts/ResumeContext';
import { b64toBlob } from '../../utils';
-import BaseModal from '../BaseModal';
const ExportModal = () => {
const state = useSelector();
diff --git a/src/modals/sections/HobbyModal.js b/src/modals/sections/HobbyModal.js
index 85e4a902..051b8cc6 100644
--- a/src/modals/sections/HobbyModal.js
+++ b/src/modals/sections/HobbyModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
name: '',
diff --git a/src/modals/sections/ImportModal.js b/src/modals/sections/ImportModal.js
index 219f2c2d..29b9acef 100644
--- a/src/modals/sections/ImportModal.js
+++ b/src/modals/sections/ImportModal.js
@@ -1,10 +1,10 @@
import { Tooltip } from '@material-ui/core';
-import React, { memo, useContext, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import Button from '../../components/shared/Button';
-import ModalContext from '../../contexts/ModalContext';
+import React, { memo, useContext, useEffect, useRef, useState } from 'react';
import { useDispatch } from '../../contexts/ResumeContext';
import BaseModal from '../BaseModal';
+import Button from '../../components/shared/Button';
+import ModalContext from '../../contexts/ModalContext';
const ImportModal = () => {
const { t } = useTranslation();
diff --git a/src/modals/sections/LanguageModal.js b/src/modals/sections/LanguageModal.js
index 72fb8c93..20970b10 100644
--- a/src/modals/sections/LanguageModal.js
+++ b/src/modals/sections/LanguageModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import { Formik } from 'formik';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
name: '',
diff --git a/src/modals/sections/ProjectModal.js b/src/modals/sections/ProjectModal.js
index e3e83164..05788bae 100644
--- a/src/modals/sections/ProjectModal.js
+++ b/src/modals/sections/ProjectModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
title: '',
diff --git a/src/modals/sections/ReferenceModal.js b/src/modals/sections/ReferenceModal.js
index 0fd89858..836e70ed 100644
--- a/src/modals/sections/ReferenceModal.js
+++ b/src/modals/sections/ReferenceModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
name: '',
diff --git a/src/modals/sections/SkillModal.js b/src/modals/sections/SkillModal.js
index ae5e4d30..362d557f 100644
--- a/src/modals/sections/SkillModal.js
+++ b/src/modals/sections/SkillModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import { Formik } from 'formik';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
name: '',
diff --git a/src/modals/sections/SocialModal.js b/src/modals/sections/SocialModal.js
index e6d5bdd6..deceb466 100644
--- a/src/modals/sections/SocialModal.js
+++ b/src/modals/sections/SocialModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
import * as Yup from 'yup';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import { Formik } from 'formik';
+import { useTranslation } from 'react-i18next';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
url: '',
diff --git a/src/modals/sections/WorkModal.js b/src/modals/sections/WorkModal.js
index 481e8033..9d28e72f 100644
--- a/src/modals/sections/WorkModal.js
+++ b/src/modals/sections/WorkModal.js
@@ -1,11 +1,11 @@
-import { Formik } from 'formik';
-import React, { memo } from 'react';
import * as Yup from 'yup';
+import { Formik } from 'formik';
import { useTranslation } from 'react-i18next';
-import Input from '../../components/shared/Input';
-import ModalEvents from '../../constants/ModalEvents';
+import React, { memo } from 'react';
import { getFieldProps } from '../../utils';
import DataModal from '../DataModal';
+import Input from '../../components/shared/Input';
+import ModalEvents from '../../constants/ModalEvents';
const initialValues = {
company: '',
diff --git a/src/pages/404.js b/src/pages/404.js
index be8a164e..2fe484a3 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,5 +1,5 @@
-import { navigate } from 'gatsby';
import { memo, useEffect } from 'react';
+import { navigate } from 'gatsby';
const NotFound = () => {
useEffect(() => {
diff --git a/src/pages/app.js b/src/pages/app.js
index e77557f8..cca2c62d 100644
--- a/src/pages/app.js
+++ b/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 = () => (
diff --git a/src/pages/app/__tests__/builder.dataPersistence.test.js b/src/pages/app/__tests__/builder.dataPersistence.test.js
index 9f1fef64..978e34dd 100644
--- a/src/pages/app/__tests__/builder.dataPersistence.test.js
+++ b/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;
diff --git a/src/pages/app/__tests__/builder.errorHandling.test.js b/src/pages/app/__tests__/builder.errorHandling.test.js
index f573f9b5..37a2bcf2 100644
--- a/src/pages/app/__tests__/builder.errorHandling.test.js
+++ b/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';
diff --git a/src/pages/app/__tests__/builder.settings.test.js b/src/pages/app/__tests__/builder.settings.test.js
index 7db8a1c1..c17514a6 100644
--- a/src/pages/app/__tests__/builder.settings.test.js
+++ b/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;
diff --git a/src/pages/app/__tests__/builder.skills.test.js b/src/pages/app/__tests__/builder.skills.test.js
index 1677ac36..fc44dfb1 100644
--- a/src/pages/app/__tests__/builder.skills.test.js
+++ b/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;
diff --git a/src/pages/app/__tests__/dashboard.createResume.test.js b/src/pages/app/__tests__/dashboard.createResume.test.js
index 17a5d616..c41ad979 100644
--- a/src/pages/app/__tests__/dashboard.createResume.test.js
+++ b/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';
diff --git a/src/pages/app/__tests__/dashboard.deleteResume.test.js b/src/pages/app/__tests__/dashboard.deleteResume.test.js
index 1b84ac1d..fe9e1801 100644
--- a/src/pages/app/__tests__/dashboard.deleteResume.test.js
+++ b/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();
diff --git a/src/pages/app/__tests__/dashboard.duplicateResume.test.js b/src/pages/app/__tests__/dashboard.duplicateResume.test.js
index 9b9c254c..73304fdd 100644
--- a/src/pages/app/__tests__/dashboard.duplicateResume.test.js
+++ b/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;
diff --git a/src/pages/app/__tests__/dashboard.rendering.test.js b/src/pages/app/__tests__/dashboard.rendering.test.js
index 83873677..671dc9cc 100644
--- a/src/pages/app/__tests__/dashboard.rendering.test.js
+++ b/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';
diff --git a/src/pages/app/__tests__/helpers/builder.js b/src/pages/app/__tests__/helpers/builder.js
index e63c9346..b2a9f9fa 100644
--- a/src/pages/app/__tests__/helpers/builder.js
+++ b/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,
diff --git a/src/pages/app/__tests__/helpers/dashboard.js b/src/pages/app/__tests__/helpers/dashboard.js
index 884ec0ed..caf8b95d 100644
--- a/src/pages/app/__tests__/helpers/dashboard.js
+++ b/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);
diff --git a/src/pages/app/builder.js b/src/pages/app/builder.js
index 880b4868..afd3ea32 100644
--- a/src/pages/app/builder.js
+++ b/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();
diff --git a/src/pages/app/dashboard.js b/src/pages/app/dashboard.js
index 9ef46657..cde51d5d 100644
--- a/src/pages/app/dashboard.js
+++ b/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();
diff --git a/src/pages/faq.js b/src/pages/faq.js
index 80424a77..1e4aebf0 100644
--- a/src/pages/faq.js
+++ b/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 = () => (
diff --git a/src/pages/index.js b/src/pages/index.js
index 2855393b..8a2f635a 100644
--- a/src/pages/index.js
+++ b/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';
diff --git a/src/pages/r.js b/src/pages/r.js
index 5392c59a..358b46e2 100644
--- a/src/pages/r.js
+++ b/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 = () => (
diff --git a/src/pages/r/view.js b/src/pages/r/view.js
index 5ac529a8..ce08f9f6 100644
--- a/src/pages/r/view.js
+++ b/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();
diff --git a/src/styles/global.css b/src/styles/global.css
index 370b94e2..f18504f9 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -46,7 +46,7 @@ section {
}
.markdown {
- @apply leading-relaxed whitespace-pre-wrap;
+ @apply leading-relaxed;
}
.markdown ul {
diff --git a/src/templates/Castform.js b/src/templates/Castform.js
index 3c32798e..ad16693a 100644
--- a/src/templates/Castform.js
+++ b/src/templates/Castform.js
@@ -1,5 +1,4 @@
import React from 'react';
-import PageContext from '../contexts/PageContext';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
import ContactC from './blocks/Contact/ContactC';
@@ -8,6 +7,7 @@ import HeadingD from './blocks/Heading/HeadingD';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesA from './blocks/Languages/LanguagesA';
import ObjectiveA from './blocks/Objective/ObjectiveA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesA from './blocks/References/ReferencesA';
import SkillsA from './blocks/Skills/SkillsA';
diff --git a/src/templates/Celebi.js b/src/templates/Celebi.js
index 85d4e862..9a94b948 100644
--- a/src/templates/Celebi.js
+++ b/src/templates/Celebi.js
@@ -1,6 +1,5 @@
-import React from 'react';
import { useTranslation } from 'react-i18next';
-import PageContext from '../contexts/PageContext';
+import React from 'react';
import { hexToRgb } from '../utils';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
@@ -10,6 +9,7 @@ import HeadingE from './blocks/Heading/HeadingE';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesB from './blocks/Languages/LanguagesB';
import ObjectiveA from './blocks/Objective/ObjectiveA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesA from './blocks/References/ReferencesA';
import SkillsA from './blocks/Skills/SkillsA';
diff --git a/src/templates/Gengar.js b/src/templates/Gengar.js
index dd21b20d..48408781 100644
--- a/src/templates/Gengar.js
+++ b/src/templates/Gengar.js
@@ -1,6 +1,5 @@
-import React from 'react';
import { useTranslation } from 'react-i18next';
-import PageContext from '../contexts/PageContext';
+import React from 'react';
import { hasAddress, hexToRgb } from '../utils';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
@@ -10,6 +9,7 @@ import HeadingC from './blocks/Heading/HeadingC';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesA from './blocks/Languages/LanguagesA';
import ObjectiveA from './blocks/Objective/ObjectiveA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesB from './blocks/References/ReferencesB';
import SkillsA from './blocks/Skills/SkillsA';
diff --git a/src/templates/Glalie.js b/src/templates/Glalie.js
index 597813b7..639c764a 100644
--- a/src/templates/Glalie.js
+++ b/src/templates/Glalie.js
@@ -1,5 +1,4 @@
import React from 'react';
-import PageContext from '../contexts/PageContext';
import { hexToRgb } from '../utils';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
@@ -9,6 +8,7 @@ import HeadingB from './blocks/Heading/HeadingB';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesA from './blocks/Languages/LanguagesA';
import ObjectiveA from './blocks/Objective/ObjectiveA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesA from './blocks/References/ReferencesA';
import SkillsA from './blocks/Skills/SkillsA';
diff --git a/src/templates/Onyx.js b/src/templates/Onyx.js
index 148958a2..4cd96bae 100644
--- a/src/templates/Onyx.js
+++ b/src/templates/Onyx.js
@@ -1,6 +1,6 @@
-import React, { memo } from 'react';
import { useTranslation } from 'react-i18next';
-import PageContext from '../contexts/PageContext';
+import React, { memo } from 'react';
+import { hasAddress } from '../utils';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
import Contact from './blocks/Contact/ContactA';
@@ -9,11 +9,11 @@ import HeadingA from './blocks/Heading/HeadingA';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesA from './blocks/Languages/LanguagesA';
import ObjectiveA from './blocks/Objective/ObjectiveA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesA from './blocks/References/ReferencesA';
import SkillsA from './blocks/Skills/SkillsA';
import WorkA from './blocks/Work/WorkA';
-import { hasAddress } from '../utils';
const Blocks = {
objective: ObjectiveA,
diff --git a/src/templates/Pikachu.js b/src/templates/Pikachu.js
index 5b30a68e..f9b1984c 100644
--- a/src/templates/Pikachu.js
+++ b/src/templates/Pikachu.js
@@ -1,13 +1,13 @@
import React from 'react';
import ReactMarkdown from 'react-markdown';
-import PageContext from '../contexts/PageContext';
-import ContactA from './blocks/Contact/ContactA';
-import HeadingB from './blocks/Heading/HeadingB';
import AwardsA from './blocks/Awards/AwardsA';
import CertificationsA from './blocks/Certifications/CertificationsA';
+import ContactA from './blocks/Contact/ContactA';
import EducationA from './blocks/Education/EducationA';
+import HeadingB from './blocks/Heading/HeadingB';
import HobbiesA from './blocks/Hobbies/HobbiesA';
import LanguagesA from './blocks/Languages/LanguagesA';
+import PageContext from '../contexts/PageContext';
import ProjectsA from './blocks/Projects/ProjectsA';
import ReferencesA from './blocks/References/ReferencesA';
import SkillsA from './blocks/Skills/SkillsA';
@@ -77,10 +77,9 @@ const Pikachu = ({ data }) => {
style={{ borderColor: data.metadata.colors.background }}
/>
-
+
+ {data.objective.body}
+
)}
@@ -17,7 +17,9 @@ const CertificationItem = ({ item, language }) => (
)}
{item.summary && (
-