From e5083548abb315d53b77098bba9cdbd7eb003897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Synowiec?= Date: Thu, 16 Mar 2023 12:23:07 +0100 Subject: [PATCH] add: tailwind Automatic class sorting with Prettier --- apps/api/schema.gql | 30 ++++++++----------- apps/web/components/atoms/navbar/navbar.tsx | 2 +- .../molecules/challengeItem/challengeItem.tsx | 8 ++--- .../components/molecules/editor/editor.tsx | 2 +- .../molecules/fileInput/fileInput.tsx | 2 +- apps/web/components/molecules/modal/modal.tsx | 12 ++++---- .../dropDownBurgerMenu/dropDownBurgerMenu.tsx | 4 +-- .../components/organisms/header/header.tsx | 10 +++---- .../headerUserLoggedInContent.tsx | 6 ++-- .../headerUserLoginContent.tsx | 2 +- .../organisms/loginModal/loginModal.tsx | 2 +- .../newChallengeForm/newChallengeForm.tsx | 14 ++++----- .../templates/challenge/new/newChallenge.tsx | 2 +- .../challenge/single/singleChallenge.tsx | 4 +-- apps/web/components/templates/errors/404.tsx | 4 +-- package.json | 1 + .../ui/components/atoms/button/button.tsx | 2 +- packages/ui/components/atoms/card/card.tsx | 2 +- .../atoms/categoryTag/categoryTag.tsx | 2 +- .../ui/components/atoms/divider/divider.tsx | 2 +- .../dropdownMenuContent.tsx | 2 +- .../dropdownMenuItem/dropdownMenuItem.tsx | 2 +- .../dropdownMenuTrigger.tsx | 2 +- .../atoms/imgPreview/imgPreview.tsx | 6 ++-- .../components/atoms/label/label.stories.tsx | 4 +-- packages/ui/components/atoms/label/label.tsx | 2 +- packages/ui/components/atoms/link/link.tsx | 2 +- .../select/selectButton/selectButton.tsx | 2 +- .../select/selectOption/selectOption.tsx | 8 ++--- .../molecules/checkbox/checkbox.tsx | 2 +- .../components/molecules/spinner/spinner.tsx | 2 +- .../ui/components/organisms/select/select.tsx | 2 +- yarn.lock | 5 ++++ 33 files changed, 78 insertions(+), 76 deletions(-) diff --git a/apps/api/schema.gql b/apps/api/schema.gql index f5c4b9e..61a61d9 100644 --- a/apps/api/schema.gql +++ b/apps/api/schema.gql @@ -1,8 +1,6 @@ -""" -Auth0 user info -""" +"""Auth0 user info""" type AuthInfo { - sub: String + sub: String } """ @@ -16,23 +14,21 @@ A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `dat scalar DateTime type Query { - allUsers: [User!]! + allUsers: [User!]! - """ - Auth0 context info - """ - authInfo: AuthInfo + """Auth0 context info""" + authInfo: AuthInfo } type Task { - description: String! - id: ID! - title: String! + description: String! + id: ID! + title: String! } type User { - email: String! - id: ID! - name: String! - postedTasks: [Task!]! -} + email: String! + id: ID! + name: String! + postedTasks: [Task!]! +} \ No newline at end of file diff --git a/apps/web/components/atoms/navbar/navbar.tsx b/apps/web/components/atoms/navbar/navbar.tsx index e26f12c..b41e1a3 100644 --- a/apps/web/components/atoms/navbar/navbar.tsx +++ b/apps/web/components/atoms/navbar/navbar.tsx @@ -7,7 +7,7 @@ type NavbarProps = { export const Navbar = ({ children }: NavbarProps) => { return ( ); }; diff --git a/apps/web/components/molecules/challengeItem/challengeItem.tsx b/apps/web/components/molecules/challengeItem/challengeItem.tsx index 95309ad..c6330c0 100644 --- a/apps/web/components/molecules/challengeItem/challengeItem.tsx +++ b/apps/web/components/molecules/challengeItem/challengeItem.tsx @@ -19,13 +19,13 @@ export const ChallengeItem = ({
  • -
    +
    @@ -37,7 +37,7 @@ export const ChallengeItem = ({
    - + {difficulty} @@ -48,7 +48,7 @@ export const ChallengeItem = ({ return (
    diff --git a/apps/web/components/molecules/modal/modal.tsx b/apps/web/components/molecules/modal/modal.tsx index a4416e4..0f91b41 100644 --- a/apps/web/components/molecules/modal/modal.tsx +++ b/apps/web/components/molecules/modal/modal.tsx @@ -27,28 +27,28 @@ export const Modal = ({ return (
    -
    +
    -
    +
    {title} {!isLoading && !user && } {!isLoading && user && ( -
    +
    {children} diff --git a/apps/web/components/organisms/header/header.tsx b/apps/web/components/organisms/header/header.tsx index df9bca6..df40504 100644 --- a/apps/web/components/organisms/header/header.tsx +++ b/apps/web/components/organisms/header/header.tsx @@ -7,7 +7,7 @@ import { DropDownBurgerMenu } from 'organisms/dropDownBurgerMenu/dropDownBurgerM import { useHamburgerMenu } from 'organisms/dropDownBurgerMenu/useHamburgerMenu'; import { HeaderUserLoginContent } from 'organisms/header/headerUserLoginContent/headerUserLoginContent'; import { HeaderUserLoggedInContent } from 'organisms/header/headerUserLoggedInContent/headerUserLoggedInContent'; -import { VisuallyHidden, Heading } from 'ui'; +import { Heading, VisuallyHidden } from 'ui'; import Link from 'next/link'; export const Header = () => { @@ -15,12 +15,12 @@ export const Header = () => { const { closeBurgerMenu, isBurgerMenuActive, openBurgerMenu } = useHamburgerMenu(); return ( -
    +
    Start-Coding @@ -37,8 +37,8 @@ export const Header = () => { )} -
    -
    +
    +
    diff --git a/apps/web/components/organisms/header/headerUserLoggedInContent/headerUserLoggedInContent.tsx b/apps/web/components/organisms/header/headerUserLoggedInContent/headerUserLoggedInContent.tsx index ccb3676..7b58ef8 100644 --- a/apps/web/components/organisms/header/headerUserLoggedInContent/headerUserLoggedInContent.tsx +++ b/apps/web/components/organisms/header/headerUserLoggedInContent/headerUserLoggedInContent.tsx @@ -17,8 +17,8 @@ export const HeaderUserLoggedInContent = ({ const router = useRouter(); const isOnChallengeNewPage = router.pathname.includes('/challenge/new'); return ( -
    -
    +
    +
    {user.avatarSrc ? ( )}
    -

    Witaj, {user.nickname}!

    +

    Witaj, {user.nickname}!

    Profil diff --git a/apps/web/components/organisms/header/headerUserLoginContent/headerUserLoginContent.tsx b/apps/web/components/organisms/header/headerUserLoginContent/headerUserLoginContent.tsx index 1ebc62e..6a34877 100644 --- a/apps/web/components/organisms/header/headerUserLoginContent/headerUserLoginContent.tsx +++ b/apps/web/components/organisms/header/headerUserLoginContent/headerUserLoginContent.tsx @@ -5,7 +5,7 @@ export const HeaderUserLoginContent = () => { return (
    -
    +
    Zaloguj się diff --git a/apps/web/components/organisms/loginModal/loginModal.tsx b/apps/web/components/organisms/loginModal/loginModal.tsx index e670bbe..ab62b8d 100644 --- a/apps/web/components/organisms/loginModal/loginModal.tsx +++ b/apps/web/components/organisms/loginModal/loginModal.tsx @@ -16,7 +16,7 @@ export const LoginModal = ({ isOpen, onClose }: LoginModalProps) => { isOpen={isOpen} closeHandler={onClickHandler} > -
    +
    Zaloguj się diff --git a/apps/web/components/organisms/newChallengeForm/newChallengeForm.tsx b/apps/web/components/organisms/newChallengeForm/newChallengeForm.tsx index 7596333..0bb8f40 100644 --- a/apps/web/components/organisms/newChallengeForm/newChallengeForm.tsx +++ b/apps/web/components/organisms/newChallengeForm/newChallengeForm.tsx @@ -70,21 +70,21 @@ export const NewChallengeForm = () => { return (
    -
    +
    -
    -
    +
    +
    {!watch('image') ? 'Dodaj miniaturkę dla zadania' : 'Zmień miniaturkę'}
    -
    -
    -
    +
    +
    +
    { return ( -
    +
    diff --git a/apps/web/components/templates/challenge/single/singleChallenge.tsx b/apps/web/components/templates/challenge/single/singleChallenge.tsx index e5707c5..9713867 100644 --- a/apps/web/components/templates/challenge/single/singleChallenge.tsx +++ b/apps/web/components/templates/challenge/single/singleChallenge.tsx @@ -52,9 +52,9 @@ export const SingleChallengePage = ({ alt="" width="1200" height="1200" - className="w-full h-full md:w-1/3 rounded-lg" + className="h-full w-full rounded-lg md:w-1/3" /> -
    +
      {challenge?.tags.map((tag, id) => ( diff --git a/apps/web/components/templates/errors/404.tsx b/apps/web/components/templates/errors/404.tsx index 727832d..a80f813 100644 --- a/apps/web/components/templates/errors/404.tsx +++ b/apps/web/components/templates/errors/404.tsx @@ -2,8 +2,8 @@ import { Heading, Link, Text } from 'ui'; export const Error404 = () => { return ( -
      - +
      + Error 404 diff --git a/package.json b/package.json index 1a279f8..84f664b 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "husky": "^8.0.0", "lint-staged": "^13.0.3", "prettier": "^2.7.1", + "prettier-plugin-tailwindcss": "^0.2.4", "turbo": "^1.7.0" }, "engines": { diff --git a/packages/ui/components/atoms/button/button.tsx b/packages/ui/components/atoms/button/button.tsx index 420f017..12c79fa 100644 --- a/packages/ui/components/atoms/button/button.tsx +++ b/packages/ui/components/atoms/button/button.tsx @@ -26,7 +26,7 @@ export const Button = ({ }: ButtonProps) => { return (