From c03d0be0b5b7a5a5edf411a107ca9ab6aa7e8c61 Mon Sep 17 00:00:00 2001 From: Staszek Zajaczkowski Date: Mon, 22 Jul 2024 16:04:59 -0400 Subject: [PATCH 1/8] refactor: Separate atom inputs into separate files for input and textarea --- src/Theme/styles.module.css | 10 +- src/Theme/theme.ts | 19 ++-- .../atoms/add-new-button/add-new-button.tsx | 2 +- src/components/atoms/headers/headers.tsx | 17 ---- .../atoms/headers/styles.module.css | 4 - src/components/atoms/index.ts | 2 - src/components/atoms/title/styles.module.css | 97 ------------------- src/components/atoms/title/title.tsx | 17 ---- src/components/molecules/modals.tsx | 4 +- src/components/molecules/nav-bar-user.tsx | 4 +- .../organizms/forms/note-management-form.tsx | 6 +- .../organizms/forms/todo-management-form.tsx | 2 +- src/components/organizms/table/table.tsx | 4 +- src/index.css | 6 +- src/views/auth/sign-in.tsx | 10 +- src/views/auth/sign-up.tsx | 50 +++++----- src/views/home/home.tsx | 13 ++- src/views/home/login.tsx | 28 +++--- src/views/home/styles.module.css | 30 +----- src/views/pages/notes.tsx | 9 +- src/views/pages/todos.tsx | 9 +- 21 files changed, 92 insertions(+), 251 deletions(-) delete mode 100644 src/components/atoms/headers/headers.tsx delete mode 100644 src/components/atoms/title/styles.module.css delete mode 100644 src/components/atoms/title/title.tsx diff --git a/src/Theme/styles.module.css b/src/Theme/styles.module.css index 2b8c7b8..1c1d21c 100644 --- a/src/Theme/styles.module.css +++ b/src/Theme/styles.module.css @@ -15,11 +15,11 @@ color: var(--white); } } -[data-variant='white'] { +/* [data-variant='white'] { background-color: var(--white); color: var(--secondary); padding: 8px 24px; -} +} */ [data-variant='primary'] { background-color: var(--primary); color: var(--white); @@ -57,12 +57,10 @@ height: var(--size-height-large); width: var(--size-width-large); box-shadow: var(--box-shadow-secondary); - background-color: var(--dark); border: var(--border-large); } [data-size='large'] { box-shadow: var(--box-shadow-primary); - background-color: var(--white); height: var(--size-height-medium); width: var(--size-width-medium); border: var(--border-medium); @@ -79,3 +77,7 @@ width: var(--size-width-small); min-width: fit-content; } +.title { + color: var(--primary); + text-align: center; +} diff --git a/src/Theme/theme.ts b/src/Theme/theme.ts index 14e4672..94d6e35 100644 --- a/src/Theme/theme.ts +++ b/src/Theme/theme.ts @@ -1,4 +1,4 @@ -import { Button } from '@mantine/core'; +import { Button, Title } from '@mantine/core'; import { primary, secondary, dark, grey, red, warning, boxShadow } from '../utils/colors'; import classes from './styles.module.css' @@ -13,6 +13,7 @@ export const theme = { fontFamily: 'Nunito, sans-serif', headings: { fontFamily: 'Nunito, sans-serif', + textWrap: 'wrap', sizes: { h1: { fontSize: '2.5rem', @@ -34,14 +35,6 @@ export const theme = { regular: '400', bold: '600', }, - fontSize: { - xxs: '1rem', - xs: '1.2rem', - s: '1.6rem', - m: '2.1rem', - l: '2.4rem', - xl: '4rem', - }, media: { phone: '@media(max-width: 520px)', tablet: '@media(max-width: 768px)', @@ -53,9 +46,11 @@ export const theme = { ...classes, root: classes.buttonRoot, }, - - - + }), + Title: Title.extend({ + classNames: { + root: classes.title, + } }) } }; diff --git a/src/components/atoms/add-new-button/add-new-button.tsx b/src/components/atoms/add-new-button/add-new-button.tsx index ec30ec1..18c3243 100644 --- a/src/components/atoms/add-new-button/add-new-button.tsx +++ b/src/components/atoms/add-new-button/add-new-button.tsx @@ -8,7 +8,7 @@ export const AddNewButton = ({ openModal }) => {