From 3f364db8175abdd3622c9a1e0ee620027fe065de Mon Sep 17 00:00:00 2001 From: Ryczko Date: Mon, 15 Jan 2024 20:41:58 +0100 Subject: [PATCH] Feature/Account module preparation --- .env.example | 4 +- README.md | 2 +- i18n.js | 4 +- locales/en/{settings.json => account.json} | 5 +- public/images/creator.webp | Bin 11686 -> 23840 bytes .../accountManager.ts} | 2 +- .../application/components/MainSection.tsx | 2 +- .../QuestionBlockWrapper.tsx | 8 +- .../surveys/managers/surveyAnswerManager.ts | 2 +- src/layout/Navigation/Navigation.tsx | 70 +++++------ src/pages/account/index.tsx | 111 ++++++++++++++++++ src/pages/settings/index.tsx | 91 -------------- src/pages/survey/[surveyId]/thank-you.tsx | 2 +- src/pages/survey/answer/[surveyId]/index.tsx | 1 + src/pages/surveys/index.tsx | 1 + src/shared/components/Avatar/Avatar.tsx | 22 ++++ .../components/ButtonLink/ButtonLink.tsx | 9 +- .../IconButtonLink/IconButtonLink.tsx | 46 -------- src/shared/constants/surveysConfig.ts | 6 +- 19 files changed, 191 insertions(+), 197 deletions(-) rename locales/en/{settings.json => account.json} (87%) rename src/features/{settings/settingsManager.ts => account/accountManager.ts} (93%) create mode 100644 src/pages/account/index.tsx delete mode 100644 src/pages/settings/index.tsx create mode 100644 src/shared/components/Avatar/Avatar.tsx delete mode 100644 src/shared/components/IconButtonLink/IconButtonLink.tsx diff --git a/.env.example b/.env.example index 29a19777..474bc57e 100644 --- a/.env.example +++ b/.env.example @@ -13,8 +13,10 @@ GOOGLE_SECRET= # Feature toogles +NEXT_PUBLIC_PROFILE_SETTINGS= NEXT_PUBLIC_REMOVE_ACCOUNT= -NEXT_PUBLIC_BLOCK_MULTIPLE_ANSWERS= +NEXT_PUBLIC_ALLOW_MULTIPLE_ANSWERS= + # Others diff --git a/README.md b/README.md index fd62977d..d1fc50fb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## 🌟 About FormsLab -formslab create form +formslab create form

FormsLab is an open source tool that can be used as a feedback app to collect feedback from customers, create polls for voting, or as a survey creator. Thanks to the ability to create any forms with many types of questions, nothing limits you, and your forms will always look unique 😍

diff --git a/i18n.js b/i18n.js index b8873500..e7d5bf72 100644 --- a/i18n.js +++ b/i18n.js @@ -9,11 +9,11 @@ module.exports = { '404', 'login', 'signup', - 'settings', + 'account', 'surveys', 'surveyAnswer', 'survey', - 'thankyou' + 'thankyou', ], }, loadLocaleFrom: (lang, ns) => diff --git a/locales/en/settings.json b/locales/en/account.json similarity index 87% rename from locales/en/settings.json rename to locales/en/account.json index 2856fa3c..45f252a6 100644 --- a/locales/en/settings.json +++ b/locales/en/account.json @@ -1,7 +1,6 @@ { - "title": "Settings", - "content": "Settings - FormsLab", - "heading": "Hi", + "title": "Account", + "content": "Account - FormsLab", "deleteAccountButtonTitle": "Delete my account", "deleteAccountButton": "Delete my account", "dialogTitle": "Delete my account", diff --git a/public/images/creator.webp b/public/images/creator.webp index 64959c09a409962ed53bc0a6843f62352d4e1867..ba490ca7d849b797f41fdadee3ec134fb1a6f42a 100644 GIT binary patch literal 23840 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

+x9)hImN>K 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 diff --git a/src/features/settings/settingsManager.ts b/src/features/account/accountManager.ts similarity index 93% rename from src/features/settings/settingsManager.ts rename to src/features/account/accountManager.ts index 6619b62e..819462cf 100644 --- a/src/features/settings/settingsManager.ts +++ b/src/features/account/accountManager.ts @@ -1,7 +1,7 @@ import { useState } from 'react'; import { useApplicationContext } from 'features/application/context'; -export const useSettingsManager = () => { +export const useAccountManager = () => { const { error, user } = useApplicationContext(); const [isOpen, setIsOpen] = useState(false); const [isRemoving] = useState(false); diff --git a/src/features/application/components/MainSection.tsx b/src/features/application/components/MainSection.tsx index b841f467..b5d7959d 100644 --- a/src/features/application/components/MainSection.tsx +++ b/src/features/application/components/MainSection.tsx @@ -37,7 +37,7 @@ export default function MainSection({ alt={alt} src={image} width={500} - height={215} + height={265} priority className="rounded-md border shadow-sm" /> diff --git a/src/features/surveys/components/QuestionBlocks/QuestionBlockWrapper/QuestionBlockWrapper.tsx b/src/features/surveys/components/QuestionBlocks/QuestionBlockWrapper/QuestionBlockWrapper.tsx index db7e379a..ec5b5fa1 100644 --- a/src/features/surveys/components/QuestionBlocks/QuestionBlockWrapper/QuestionBlockWrapper.tsx +++ b/src/features/surveys/components/QuestionBlocks/QuestionBlockWrapper/QuestionBlockWrapper.tsx @@ -79,7 +79,7 @@ export default function QuestionBlockWrapper({

diff --git a/src/features/surveys/managers/surveyAnswerManager.ts b/src/features/surveys/managers/surveyAnswerManager.ts index 475603e7..7ec27655 100644 --- a/src/features/surveys/managers/surveyAnswerManager.ts +++ b/src/features/surveys/managers/surveyAnswerManager.ts @@ -66,7 +66,7 @@ export const useSurveyAnswerManager = (initialData: SurveyWithQuestions) => { setFormData(initialData); } if ( - process.env.NEXT_PUBLIC_BLOCK_MULTIPLE_ANSWERS && + !process.env.NEXT_PUBLIC_ALLOW_MULTIPLE_ANSWERS && localStorageValue.includes(surveyId) && !isAnswering ) { diff --git a/src/layout/Navigation/Navigation.tsx b/src/layout/Navigation/Navigation.tsx index 01017c83..158cf872 100644 --- a/src/layout/Navigation/Navigation.tsx +++ b/src/layout/Navigation/Navigation.tsx @@ -1,17 +1,18 @@ -import { CogIcon, LogoutIcon, MenuIcon } from '@heroicons/react/outline'; +import { LogoutIcon, MenuIcon, UserIcon } from '@heroicons/react/outline'; import { Fragment, useState } from 'react'; import { Menu, Transition } from '@headlessui/react'; -import Image from 'next/image'; import Logo from 'layout/Logo/Logo'; -import ButtonLink from 'shared/components/ButtonLink/ButtonLink'; import BurgerMenu from 'layout/BurgerMenu/BurgerMenu'; -import Button, { ButtonVariant } from 'shared/components/Button/Button'; -import AvatarIcon from '../../../public/images/avatar.svg'; +import Button, { + ButtonSize, + ButtonVariant, +} from 'shared/components/Button/Button'; import GithubCorner from 'layout/GithubCorner/GithubCorner'; import { useApplicationContext } from 'features/application/context'; -import IconButtonLink from 'shared/components/IconButtonLink/IconButtonLink'; import useTranslation from 'next-translate/useTranslation'; import { signOut } from 'next-auth/react'; +import Avatar from 'shared/components/Avatar/Avatar'; +import ButtonLink from 'shared/components/ButtonLink/ButtonLink'; function Navigation() { const { user, loading } = useApplicationContext(); @@ -57,23 +58,7 @@ function Navigation() {

{user.name}

- {user.image ? ( - user photo - ) : ( - user photo - )} + - -
- {process.env.NEXT_PUBLIC_REMOVE_ACCOUNT && ( + +
+ {process.env.NEXT_PUBLIC_PROFILE_SETTINGS && ( - } + sizeType={ButtonSize.FULL} + href={'/account'} + icon={} > - {t('navigation.settingsButton')} - + Account + )} + )} +
+
+ +
+

+ {t('dialogContentFirst')}  + + {t('dialogContentSecond')} + {' '} + {t('dialogContentThird')} +

+
+
+ + +
+ + } + /> + + )} + + ); +} + +export default withFeatureToggles( + withProtectedRoute(withAnimation(AccountPage)), + [process.env.NEXT_PUBLIC_PROFILE_SETTINGS] +); diff --git a/src/pages/settings/index.tsx b/src/pages/settings/index.tsx deleted file mode 100644 index 8015bf73..00000000 --- a/src/pages/settings/index.tsx +++ /dev/null @@ -1,91 +0,0 @@ -import Head from 'next/head'; -import { TrashIcon } from '@heroicons/react/outline'; -import withAnimation from 'shared/HOC/withAnimation'; -import Header from 'shared/components/Header/Header'; -import withProtectedRoute from 'shared/HOC/withProtectedRoute'; - -import Button, { ButtonVariant } from 'shared/components/Button/Button'; -import { useSettingsManager } from 'features/settings/settingsManager'; -import StyledDialog from 'shared/components/StyledDialog/StyledDialog'; -import withFeatureToggles from 'shared/HOC/withFeatureToggles'; -import useTranslation from 'next-translate/useTranslation'; - -function SettingsPage() { - const { - user, - isOpen, - openDeleteModal, - closeDeleteModal, - handleOnAccountDelete, - isRemoving, - } = useSettingsManager(); - const { t } = useTranslation('settings'); - - return ( - <> - - {t('title')} - - - -
- {t('heading')} {user?.name}! -
-
-
- -
-
- -
-

- {t('dialogContentFirst')}  - - {t('dialogContentSecond')} - {' '} - {t('dialogContentThird')} -

-
-
- - -
- - } - /> - - ); -} - -export default withFeatureToggles( - withProtectedRoute(withAnimation(SettingsPage)), - [process.env.NEXT_PUBLIC_REMOVE_ACCOUNT] -); diff --git a/src/pages/survey/[surveyId]/thank-you.tsx b/src/pages/survey/[surveyId]/thank-you.tsx index d853857c..63cc4324 100644 --- a/src/pages/survey/[surveyId]/thank-you.tsx +++ b/src/pages/survey/[surveyId]/thank-you.tsx @@ -16,7 +16,7 @@ const ThankyouPage = () => { thankyou diff --git a/src/pages/survey/answer/[surveyId]/index.tsx b/src/pages/survey/answer/[surveyId]/index.tsx index 4a8931e2..d31b8fdc 100644 --- a/src/pages/survey/answer/[surveyId]/index.tsx +++ b/src/pages/survey/answer/[surveyId]/index.tsx @@ -160,6 +160,7 @@ function SurveyResultsPage({ no answers
{t('noAnswers')}
diff --git a/src/pages/surveys/index.tsx b/src/pages/surveys/index.tsx index b7106321..4690ddec 100644 --- a/src/pages/surveys/index.tsx +++ b/src/pages/surveys/index.tsx @@ -89,6 +89,7 @@ function SurveyListPage({ className="mt-2 w-[160px] -translate-x-1" src={NoSurveys} alt="no surveys" + height={165} />

{t('noSurveys')}

+ ); +} diff --git a/src/shared/components/ButtonLink/ButtonLink.tsx b/src/shared/components/ButtonLink/ButtonLink.tsx index 3a0fca25..4511a8bf 100644 --- a/src/shared/components/ButtonLink/ButtonLink.tsx +++ b/src/shared/components/ButtonLink/ButtonLink.tsx @@ -23,6 +23,7 @@ const ButtonLink = ({ variant = ButtonLinkVariant.SECONDARY, sizeType = ButtonLinkSize.DEFAULT, target, + icon, ...props }: PropsWithChildren) => ( + {!!icon &&
{icon}
} {children} ); diff --git a/src/shared/components/IconButtonLink/IconButtonLink.tsx b/src/shared/components/IconButtonLink/IconButtonLink.tsx deleted file mode 100644 index a8976235..00000000 --- a/src/shared/components/IconButtonLink/IconButtonLink.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import React, { PropsWithChildren } from 'react'; -import clsx from 'clsx'; -import { - ButtonProps, - ButtonSize, - ButtonVariant, -} from 'shared/components/Button/Button'; -import Link from 'next/link'; - -export const IconButtonLinkVariant = ButtonVariant; -export const IconButtonLinkSize = ButtonSize; -interface IconButtonLinkProps extends ButtonProps { - onClick?: () => void; - href: string; -} - -const IconButtonLink = ({ - children, - className, - variant = IconButtonLinkVariant.SECONDARY, - sizeType = IconButtonLinkSize.DEFAULT, - icon, - href, - ...props -}: PropsWithChildren) => { - return ( - -
{icon}
- {children} - - ); -}; - -export default IconButtonLink; diff --git a/src/shared/constants/surveysConfig.ts b/src/shared/constants/surveysConfig.ts index 0d7b89fb..313baa19 100644 --- a/src/shared/constants/surveysConfig.ts +++ b/src/shared/constants/surveysConfig.ts @@ -18,10 +18,10 @@ export const defaultQuestions: Question[] = [ id: v4(), title: '', options: [ - ':smiley:', - ':slightly_smiling_face:', - ':slightly_frowning_face:', ':rage:', + ':slightly_frowning_face:', + ':slightly_smiling_face:', + ':smiley:', ], type: QuestionType.EMOJI, isRequired: true,