From a5358083bcc17e092a65065693e78962cb02c3c2 Mon Sep 17 00:00:00 2001 From: Alexandr Klykov Date: Tue, 30 Jan 2024 20:02:57 +0300 Subject: [PATCH 01/24] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=82=D1=8B=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 5 +++++ src/shared/config/theme/components.ts | 25 ++++++++++++++++++++++++ src/shared/ui/cancelButton/index.scss | 6 ++++++ src/shared/ui/cancelButton/index.tsx | 12 ++++++++++++ src/shared/ui/primaryButton/index.scss | 7 +++++++ src/shared/ui/primaryButton/index.tsx | 12 ++++++++++++ src/shared/ui/secondaryButton/index.scss | 7 +++++++ src/shared/ui/secondaryButton/index.tsx | 12 ++++++++++++ src/shared/ui/solidButton/index.scss | 5 +++++ src/shared/ui/solidButton/index.tsx | 12 ++++++++++++ 10 files changed, 103 insertions(+) create mode 100644 src/shared/ui/cancelButton/index.scss create mode 100644 src/shared/ui/cancelButton/index.tsx create mode 100644 src/shared/ui/primaryButton/index.scss create mode 100644 src/shared/ui/primaryButton/index.tsx create mode 100644 src/shared/ui/secondaryButton/index.scss create mode 100644 src/shared/ui/secondaryButton/index.tsx create mode 100644 src/shared/ui/solidButton/index.scss create mode 100644 src/shared/ui/solidButton/index.tsx diff --git a/src/index.ts b/src/index.ts index 7a7967e..3e31773 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,3 +6,8 @@ export { useBreakpoint, BreakpointProvider } from "./shared/context/breakpointPr export { default as PageSpin } from "./shared/ui/pageSpin"; export { default as AdaptiveContainer } from "./shared/ui/adaptiveContainer"; +export { default as PrimaryButton } from "./shared/ui/primaryButton" +export { default as SecondaryButton } from "./shared/ui/secondaryButton" +export { default as SolidButton } from "./shared/ui/solidButton" +export { default as CancelButton } from "./shared/ui/cancelButton" + diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index f5dbdf1..cd327cc 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -8,4 +8,29 @@ export const components: ThemeConfig["components"] = { colorBgElevated: "transparent", footerBg: "transparent" }, + Button: { + colorPrimary: "#4EACE8", + colorPrimaryHover: "#075180", + defaultBorderColor: "#757575", + defaultGhostBorderColor: "#757575", + defaultGhostColor: "#464646", + defaultColor: "#464646", + lineWidth: 2, + borderRadius: 50, + borderRadiusLG: 50, + borderRadiusSM: 50, + colorErrorHover: "#E22929", + colorErrorBorderHover: "#F68181", + textHoverBg: "#075180", + dangerColor: "#9E0505", + }, + Input: { + activeBorderColor: "#7BC7F8", + inputFontSize: 14, + colorBorder: "#EBEBEB", + colorErrorBorder: "#F7AAAA", + paddingInline: 16, + lineWidth: 2, + borderRadius: 8 + } }; diff --git a/src/shared/ui/cancelButton/index.scss b/src/shared/ui/cancelButton/index.scss new file mode 100644 index 0000000..1e384e8 --- /dev/null +++ b/src/shared/ui/cancelButton/index.scss @@ -0,0 +1,6 @@ +.cancelButton{ + &:hover{ + color: #E22929; + border-color: #F68181; + } +} \ No newline at end of file diff --git a/src/shared/ui/cancelButton/index.tsx b/src/shared/ui/cancelButton/index.tsx new file mode 100644 index 0000000..ae8bc9c --- /dev/null +++ b/src/shared/ui/cancelButton/index.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import {Button, ConfigProvider} from "antd"; + +function CancelButton({children, htmlType, loading}:{children: React.ReactNode, htmlType?: "button" | "submit" | "reset", loading: boolean}) { + return ( + + + +); +} + +export default React.memo(CancelButton); \ No newline at end of file diff --git a/src/shared/ui/primaryButton/index.scss b/src/shared/ui/primaryButton/index.scss new file mode 100644 index 0000000..9e3539f --- /dev/null +++ b/src/shared/ui/primaryButton/index.scss @@ -0,0 +1,7 @@ +.primaryButton{ + color: aliceblue; + + &:hover{ + border-color: #0B7AC2; + } +} \ No newline at end of file diff --git a/src/shared/ui/primaryButton/index.tsx b/src/shared/ui/primaryButton/index.tsx new file mode 100644 index 0000000..d5a84a1 --- /dev/null +++ b/src/shared/ui/primaryButton/index.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import {Button, ConfigProvider} from "antd"; + +function PrimaryButton({children, htmlType, loading}:{children: React.ReactNode, htmlType?: "button" | "submit" | "reset", loading: boolean}) { + return ( + + + +); +} + +export default React.memo(PrimaryButton); \ No newline at end of file diff --git a/src/shared/ui/secondaryButton/index.scss b/src/shared/ui/secondaryButton/index.scss new file mode 100644 index 0000000..3b81194 --- /dev/null +++ b/src/shared/ui/secondaryButton/index.scss @@ -0,0 +1,7 @@ +.secondaryButton{ + + &:hover{ + color: #757575; + border-color: #B8B8B8; + } +} \ No newline at end of file diff --git a/src/shared/ui/secondaryButton/index.tsx b/src/shared/ui/secondaryButton/index.tsx new file mode 100644 index 0000000..35a7286 --- /dev/null +++ b/src/shared/ui/secondaryButton/index.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import {Button, ConfigProvider} from "antd"; + +function SecondaryButton({children, htmlType, loading}:{children: React.ReactNode, htmlType?: "button" | "submit" | "reset", loading: boolean}) { + return ( + + + +); +} + +export default React.memo(SecondaryButton); \ No newline at end of file diff --git a/src/shared/ui/solidButton/index.scss b/src/shared/ui/solidButton/index.scss new file mode 100644 index 0000000..69e04a7 --- /dev/null +++ b/src/shared/ui/solidButton/index.scss @@ -0,0 +1,5 @@ +.solidButton{ + &:hover{ + box-shadow: 0px 4px 20px 0px #BBE2FB; + } +} \ No newline at end of file diff --git a/src/shared/ui/solidButton/index.tsx b/src/shared/ui/solidButton/index.tsx new file mode 100644 index 0000000..d2daf64 --- /dev/null +++ b/src/shared/ui/solidButton/index.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import {Button, ConfigProvider} from "antd"; + +function SolidButton({children, htmlType, loading}:{children: React.ReactNode, htmlType?: "button" | "submit" | "reset", loading: boolean}) { + return ( + + + +); +} + +export default React.memo(SolidButton); \ No newline at end of file From c43c9544ab717cf42e416e9c38de5c8cfee2a2fa Mon Sep 17 00:00:00 2001 From: TusksAndTasks <86926386+TusksAndTasks@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:33:25 +0300 Subject: [PATCH 02/24] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D0=BB=D0=B8=D1=82=D1=80=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=82=D0=B8=D0=BF=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=B8=20?= =?UTF-8?q?(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexandr Klykov --- src/shared/config/theme/components.ts | 16 ++++ src/shared/config/theme/token.ts | 105 ++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index f5dbdf1..99658f9 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -8,4 +8,20 @@ export const components: ThemeConfig["components"] = { colorBgElevated: "transparent", footerBg: "transparent" }, + Typography: { + fontFamily: 'Roboto, sans-serif', + fontSize: 14, + lineHeight: 1.1428, + fontSizeHeading3: 21, + lineHeightHeading3: 1.1428, + fontSizeHeading2: 32, + lineHeightHeading2: 1.5, + fontSizeHeading1: 47, + lineHeightHeading1: 1.19, + colorLink: "#0B7AC2", + colorLinkHover: "#4EACE8", + colorLinkActive: "#9752E0", + colorSuccess: "#5BBB28", + colorError: "#F68181", + } }; diff --git a/src/shared/config/theme/token.ts b/src/shared/config/theme/token.ts index b7b6069..23ff6d3 100644 --- a/src/shared/config/theme/token.ts +++ b/src/shared/config/theme/token.ts @@ -1,11 +1,102 @@ import { ThemeConfig } from "antd"; export const token: ThemeConfig["token"] = { - colorText: "#313D4C", - colorTextSecondary: "#617894", - colorTextTertiary: "#96A6BA", - colorTextQuaternary: "#D7DDE5", - colorTextPlaceholder: "#617894", - colorBorder: "#96A6BA", - boxShadowTertiary: "0px -40px 48px -16px rgba(34, 60, 80, 0.18)" + colorText: "#000000", + colorTextSecondary: "#2E2E2E", + colorTextTertiary: "#D4D4D4", + colorTextQuaternary: "#FFFFFF", + colorTextPlaceholder: "#757575", + colorBorder: "#EBEBEB", + boxShadowTertiary: "0px -40px 48px -16px rgba(34, 60, 80, 0.18)", + "red-1": "#FED1D1", + "red-2": "#F7AAAA", + "red-3": "#F68181", + "red-4": "#EF5656", + "red-5": "#E22929", + "red-6": "#C20F0F", + "red-7": "#9E0505", + "red-8": "#790404", + "red-9": "#4F0303", + red1: "#FED1D1", + red2: "#F7AAAA", + red3: "#F68181", + red4: "#EF5656", + red5: "#E22929", + red6: "#C20F0F", + red7: "#9E0505", + red8: "#790404", + red9: "#4F0303", + "green-1": "#BEECA6", + "green-2": "#8AD364", + "green-3": "#5BBB28", + "green-4": "#41A10E", + "green-5": "#338707", + "green-6": "#2A7006", + "green-7": "#225905", + "green-8": "#194204", + "green-9": "#102902", + green1: "#BEECA6", + green2: "#8AD364", + green3: "#5BBB28", + green4: "#41A10E", + green5: "#338707", + green6: "#2A7006", + green7: "#225905", + green8: "#194204", + green9: "#102902", + "blue-1": "#BBE2FB", + "blue-2": "#7BC7F8", + "blue-3": "#4EACE8", + "blue-4": "#2493D9", + "blue-5": "#0B7AC2", + "blue-6": "#0965A0", + "blue-7": "#075180", + "blue-8": "#053D60", + "blue-9": "#03273E", + blue1: "#BBE2FB", + blue2: "#7BC7F8", + blue3: "#4EACE8", + blue4: "#2493D9", + blue5: "#0B7AC2", + blue6: "#0965A0", + blue7: "#075180", + blue8: "#053D60", + blue9: "#03273E", + "purple-1": "#E7D8F8", + "purple-2": "#D2B4F2", + "purple-3": "#BD92EC", + "purple-4": "#AA72E6", + "purple-5": "#9752E0", + "purple-6": "#8331DA", + "purple-7": "#6A21B8", + "purple-8": "#51198C", + "purple-9": "#35105B", + purple1: "#E7D8F8", + purple2: "#D2B4F2", + purple3: "#BD92EC", + purple4: "#AA72E6", + purple5: "#9752E0", + purple6: "#8331DA", + purple7: "#6A21B8", + purple8: "#51198C", + purple9: "#35105B", + "yellow-1": "#F8F3D8", + "yellow-2": "#F2E8B4", + "yellow-3": "#ECDD92", + "yellow-4": "#E6D372", + "yellow-5": "#E0C952", + "yellow-6": "#DABE31", + "yellow-7": "#B89F21", + "yellow-8": "#8C7919", + "yellow-9": "#5B4F10", + yellow1: "#F8F3D8", + yellow2: "#F2E8B4", + yellow3: "#ECDD92", + yellow4: "#E6D372", + yellow5: "#E0C952", + yellow6: "#DABE31", + yellow7: "#B89F21", + yellow8: "#8C7919", + yellow9: "#5B4F10", + colorWhite: "#FFFFFF", }; From 759e4ebe1f69eda0cea855d4eaadd3b218e25619 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:11:32 +0300 Subject: [PATCH 03/24] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 10 +++++----- src/shared/ui/button/index.tsx | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 src/shared/ui/button/index.tsx diff --git a/src/index.ts b/src/index.ts index 3e31773..fcdc554 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,8 +6,8 @@ export { useBreakpoint, BreakpointProvider } from "./shared/context/breakpointPr export { default as PageSpin } from "./shared/ui/pageSpin"; export { default as AdaptiveContainer } from "./shared/ui/adaptiveContainer"; -export { default as PrimaryButton } from "./shared/ui/primaryButton" -export { default as SecondaryButton } from "./shared/ui/secondaryButton" -export { default as SolidButton } from "./shared/ui/solidButton" -export { default as CancelButton } from "./shared/ui/cancelButton" - +export { default as PrimaryButton } from "./shared/ui/primaryButton"; +export { default as SecondaryButton } from "./shared/ui/secondaryButton"; +export { default as SolidButton } from "./shared/ui/solidButton"; +export { default as CancelButton } from "./shared/ui/cancelButton"; +export { default as Button } from "./shared/ui/button"; diff --git a/src/shared/ui/button/index.tsx b/src/shared/ui/button/index.tsx new file mode 100644 index 0000000..391826b --- /dev/null +++ b/src/shared/ui/button/index.tsx @@ -0,0 +1,12 @@ +import React from "react"; +import { Button, ButtonProps } from "antd"; + +interface IButton extends ButtonProps { + children: React.ReactNode; +} + +function ButtonWs(props: IButton) { + return ; +} + +export default React.memo(ButtonWs); From e0fe42e05bf005e3dba2513defcb771731d8dad2 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:16:33 +0300 Subject: [PATCH 04/24] 1.1.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index be341e5..aeac712 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.1", + "version": "1.1.2", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index a5d95c4..d42597c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.1", + "version": "1.1.2", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 2890c6a60e85108be6d9134e88f0adecfb6b3cdb Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:22:02 +0300 Subject: [PATCH 05/24] 1.1.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index aeac712..b5925ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.2", + "version": "1.1.3", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index d42597c..26741a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.2", + "version": "1.1.3", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From e6be6c0ae13882f5b9e164060a07d744dc0c4d97 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:22:14 +0300 Subject: [PATCH 06/24] 1.1.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5925ed..1788df0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.3", + "version": "1.1.4", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 26741a6..aae35e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.3", + "version": "1.1.4", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 6d96fe60959f9851b97b50dc4bf2ca7036200754 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:22:15 +0300 Subject: [PATCH 07/24] 1.1.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1788df0..0b06b88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.4", + "version": "1.1.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.4", + "version": "1.1.5", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index aae35e9..fec64c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.4", + "version": "1.1.5", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 6f65c5137b2ebdcedae81141e62173f31eed297d Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 14:22:16 +0300 Subject: [PATCH 08/24] 1.1.6 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b06b88..2f708c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.5", + "version": "1.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.5", + "version": "1.1.6", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index fec64c4..6f417ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.5", + "version": "1.1.6", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 797d20295bccd1cc97e40c6d08f2e8e0580da31f Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 15:32:17 +0300 Subject: [PATCH 09/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 20 ++++++++++++-------- src/shared/ui/button/index.tsx | 11 +++++++++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 0d21be5..89de08f 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -6,10 +6,10 @@ export const components: ThemeConfig["components"] = { headerBg: "transparent", colorBgContainer: "transparent", colorBgElevated: "transparent", - footerBg: "transparent" + footerBg: "transparent", }, Typography: { - fontFamily: 'Roboto, sans-serif', + fontFamily: "Roboto, sans-serif", fontSize: 14, lineHeight: 1.1428, fontSizeHeading3: 21, @@ -25,19 +25,23 @@ export const components: ThemeConfig["components"] = { colorError: "#F68181", }, Button: { - colorPrimary: "#4EACE8", + colorPrimary: "#0B7AC2", colorPrimaryHover: "#075180", + defaultColor: "#464646", defaultBorderColor: "#757575", - defaultGhostBorderColor: "#757575", defaultGhostColor: "#464646", - defaultColor: "#464646", + defaultGhostBorderColor: "#757575", + colorTextSecondary: "#464646", + colorBorderSecondary: "#757575", + colorLink: "#0B7AC2", + colorLinkHover: "#075180", lineWidth: 2, borderRadius: 50, borderRadiusLG: 50, borderRadiusSM: 50, + textHoverBg: "#075180", colorErrorHover: "#E22929", colorErrorBorderHover: "#F68181", - textHoverBg: "#075180", dangerColor: "#9E0505", }, Input: { @@ -47,6 +51,6 @@ export const components: ThemeConfig["components"] = { colorErrorBorder: "#F7AAAA", paddingInline: 16, lineWidth: 2, - borderRadius: 8 - } + borderRadius: 8, + }, }; diff --git a/src/shared/ui/button/index.tsx b/src/shared/ui/button/index.tsx index 391826b..0205a60 100644 --- a/src/shared/ui/button/index.tsx +++ b/src/shared/ui/button/index.tsx @@ -1,12 +1,19 @@ import React from "react"; -import { Button, ButtonProps } from "antd"; +import { Button, ButtonProps, ConfigProvider } from "antd"; + +// eslint-disable-next-line import/no-internal-modules +import { theme } from "../../config/theme"; interface IButton extends ButtonProps { children: React.ReactNode; } function ButtonWs(props: IButton) { - return ; + return ( + + + + ); } export default React.memo(ButtonWs); From 9ae0e48d108757f14865ecd583d857ef8657f34b Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 15:32:35 +0300 Subject: [PATCH 10/24] 1.1.7 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f708c8..d2306a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.6", + "version": "1.1.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.6", + "version": "1.1.7", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 6f417ee..06da21a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.6", + "version": "1.1.7", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 368f27609a4408ba007409bed8f815a9e5f3edfc Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:05:41 +0300 Subject: [PATCH 11/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 89de08f..8741b95 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -25,14 +25,20 @@ export const components: ThemeConfig["components"] = { colorError: "#F68181", }, Button: { - colorPrimary: "#0B7AC2", - colorPrimaryHover: "#075180", - defaultColor: "#464646", - defaultBorderColor: "#757575", - defaultGhostColor: "#464646", - defaultGhostBorderColor: "#757575", - colorTextSecondary: "#464646", - colorBorderSecondary: "#757575", + colorPrimary: "#FFFFFF", + colorPrimaryText: "#0B7AC2", + colorPrimaryTextHover: "#075180", + colorPrimaryBorder: "#4EACE8", + colorPrimaryBorderHover: "#0B7AC2", + // defaultColor: "#464646", + // defaultBorderColor: "#757575", + // defaultGhostColor: "#464646", + // defaultGhostBorderColor: "#757575", + // colorTextSecondary: "#464646", + // colorBorderSecondary: "#757575", + colorText: "#0B7AC2", + colorBorder: "0", + boxShadowSecondary: "0 4px 15px 0 #000", colorLink: "#0B7AC2", colorLinkHover: "#075180", lineWidth: 2, From 67dde79049e1e8e8d5a7ce400c45800823702b64 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:05:54 +0300 Subject: [PATCH 12/24] 1.1.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d2306a2..5b1bbb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.7", + "version": "1.1.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.7", + "version": "1.1.8", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 06da21a..34583ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.7", + "version": "1.1.8", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 5aab590401047a1dd8c1425bcee6df18993a3dc3 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:36:14 +0300 Subject: [PATCH 13/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20primary/d?= =?UTF-8?q?efault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 8741b95..15d04a7 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -1,6 +1,6 @@ -import { ThemeConfig } from "antd"; +// import { ThemeConfig } from "antd"; -export const components: ThemeConfig["components"] = { +export const components = { Layout: { bodyBg: "transparent", headerBg: "transparent", @@ -25,17 +25,16 @@ export const components: ThemeConfig["components"] = { colorError: "#F68181", }, Button: { - colorPrimary: "#FFFFFF", - colorPrimaryText: "#0B7AC2", - colorPrimaryTextHover: "#075180", + colorPrimaryBg: "#FFFFFF", + colorPrimary: "#0B7AC2", + colorPrimaryHover: "#075180", + colorPrimaryBgHover: "#FFFFFF", colorPrimaryBorder: "#4EACE8", colorPrimaryBorderHover: "#0B7AC2", - // defaultColor: "#464646", - // defaultBorderColor: "#757575", - // defaultGhostColor: "#464646", - // defaultGhostBorderColor: "#757575", - // colorTextSecondary: "#464646", - // colorBorderSecondary: "#757575", + defaultColor: "#464646", + defaultBorderColor: "#757575", + defaultHoverColor: "#757575", + defaultHoverBorderColor: "#B8B8B8", colorText: "#0B7AC2", colorBorder: "0", boxShadowSecondary: "0 4px 15px 0 #000", From 076a5af7a32815bc7eb11ed9acabe4d71eb9758c Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:36:24 +0300 Subject: [PATCH 14/24] 1.1.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b1bbb0..4c75c20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.8", + "version": "1.1.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.8", + "version": "1.1.9", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 34583ef..62261c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.8", + "version": "1.1.9", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From f707fcd5ddb4d3875e8cd74cb940d102b2117c19 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:42:17 +0300 Subject: [PATCH 15/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20primary/d?= =?UTF-8?q?efault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 15d04a7..3cbeadd 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -25,10 +25,10 @@ export const components = { colorError: "#F68181", }, Button: { - colorPrimaryBg: "#FFFFFF", - colorPrimary: "#0B7AC2", - colorPrimaryHover: "#075180", - colorPrimaryBgHover: "#FFFFFF", + colorPrimary: "#FFFFFF", + colorPrimaryText: "#0B7AC2", + colorPrimaryTextHover: "#075180", + colorPrimaryHover: "#FFFFFF", colorPrimaryBorder: "#4EACE8", colorPrimaryBorderHover: "#0B7AC2", defaultColor: "#464646", @@ -36,7 +36,7 @@ export const components = { defaultHoverColor: "#757575", defaultHoverBorderColor: "#B8B8B8", colorText: "#0B7AC2", - colorBorder: "0", + colorTextBorder: "0", boxShadowSecondary: "0 4px 15px 0 #000", colorLink: "#0B7AC2", colorLinkHover: "#075180", From 839813666631cc27b7bb0c0f4401acd55e47967f Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:42:20 +0300 Subject: [PATCH 16/24] 1.1.10 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c75c20..cb9db0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.9", + "version": "1.1.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.9", + "version": "1.1.10", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 62261c0..4dd8f64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.9", + "version": "1.1.10", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From fb6f0204413f543a6839f552cba33e1b07f5c7e1 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:45:21 +0300 Subject: [PATCH 17/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20primary/d?= =?UTF-8?q?efault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 3cbeadd..ed72b0a 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -25,10 +25,10 @@ export const components = { colorError: "#F68181", }, Button: { - colorPrimary: "#FFFFFF", + colorPrimaryBg: "#FFFFFF", colorPrimaryText: "#0B7AC2", colorPrimaryTextHover: "#075180", - colorPrimaryHover: "#FFFFFF", + colorPrimaryBgHover: "#FFFFFF", colorPrimaryBorder: "#4EACE8", colorPrimaryBorderHover: "#0B7AC2", defaultColor: "#464646", From b6832d2bc3661015ef709f2de0a7a3e7d8066a28 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:45:30 +0300 Subject: [PATCH 18/24] 1.1.11 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb9db0f..5970810 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.10", + "version": "1.1.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.10", + "version": "1.1.11", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 4dd8f64..7ba9510 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.10", + "version": "1.1.11", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 5d8ee0182b468abdbaa959025d7265bb19815328 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:53:35 +0300 Subject: [PATCH 19/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20primary/d?= =?UTF-8?q?efault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index ed72b0a..76d0ae6 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -1,6 +1,6 @@ -// import { ThemeConfig } from "antd"; +import { ThemeConfig } from "antd"; -export const components = { +export const components: ThemeConfig["components"] = { Layout: { bodyBg: "transparent", headerBg: "transparent", @@ -26,6 +26,7 @@ export const components = { }, Button: { colorPrimaryBg: "#FFFFFF", + colorPrimaryHover: "#FFFFFF", colorPrimaryText: "#0B7AC2", colorPrimaryTextHover: "#075180", colorPrimaryBgHover: "#FFFFFF", @@ -33,10 +34,10 @@ export const components = { colorPrimaryBorderHover: "#0B7AC2", defaultColor: "#464646", defaultBorderColor: "#757575", - defaultHoverColor: "#757575", - defaultHoverBorderColor: "#B8B8B8", + // defaultHoverColor: "#757575", + // defaultHoverBorderColor: "#B8B8B8", + // colorTextBorder: "0", colorText: "#0B7AC2", - colorTextBorder: "0", boxShadowSecondary: "0 4px 15px 0 #000", colorLink: "#0B7AC2", colorLinkHover: "#075180", From 108d4397a434cdbcb6ec29a426f1905bc1608373 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 16:53:42 +0300 Subject: [PATCH 20/24] 1.1.12 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5970810..a5c8dd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.11", + "version": "1.1.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.11", + "version": "1.1.12", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 7ba9510..ab4ecd6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.11", + "version": "1.1.12", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 4de025721489a87b3daa69f592878e9415d279bf Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 17:04:58 +0300 Subject: [PATCH 21/24] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20primary/d?= =?UTF-8?q?efault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 76d0ae6..05c0233 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -26,10 +26,10 @@ export const components: ThemeConfig["components"] = { }, Button: { colorPrimaryBg: "#FFFFFF", - colorPrimaryHover: "#FFFFFF", + primaryColor: "#0B7AC2", + colorPrimaryBgHover: "#FFFFFF", colorPrimaryText: "#0B7AC2", colorPrimaryTextHover: "#075180", - colorPrimaryBgHover: "#FFFFFF", colorPrimaryBorder: "#4EACE8", colorPrimaryBorderHover: "#0B7AC2", defaultColor: "#464646", From 3d8b89653300c15c68dc6e626bc67b8916c0e402 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Mon, 5 Feb 2024 17:05:05 +0300 Subject: [PATCH 22/24] 1.1.13 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5c8dd8..9d31362 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.12", + "version": "1.1.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.12", + "version": "1.1.13", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index ab4ecd6..e48b7b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.12", + "version": "1.1.13", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts", From 377ef91edd5dcb73c87ab34ef8c55dff977f6860 Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Tue, 6 Feb 2024 09:43:21 +0300 Subject: [PATCH 23/24] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6?= =?UTF-8?q?=D1=83=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=20=D1=81=D1=82=D0=B8=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/config/theme/components.ts | 17 +++-------------- src/shared/ui/button/index.tsx | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/shared/config/theme/components.ts b/src/shared/config/theme/components.ts index 05c0233..a643478 100644 --- a/src/shared/config/theme/components.ts +++ b/src/shared/config/theme/components.ts @@ -25,27 +25,16 @@ export const components: ThemeConfig["components"] = { colorError: "#F68181", }, Button: { - colorPrimaryBg: "#FFFFFF", - primaryColor: "#0B7AC2", + primaryShadow: "0px 0px 0px 2px #4EACE8", colorPrimaryBgHover: "#FFFFFF", - colorPrimaryText: "#0B7AC2", - colorPrimaryTextHover: "#075180", - colorPrimaryBorder: "#4EACE8", - colorPrimaryBorderHover: "#0B7AC2", - defaultColor: "#464646", - defaultBorderColor: "#757575", - // defaultHoverColor: "#757575", - // defaultHoverBorderColor: "#B8B8B8", - // colorTextBorder: "0", - colorText: "#0B7AC2", - boxShadowSecondary: "0 4px 15px 0 #000", + colorPrimary: "#FFFFFF", + colorPrimaryTextHover: "#0B7AC2", colorLink: "#0B7AC2", colorLinkHover: "#075180", lineWidth: 2, borderRadius: 50, borderRadiusLG: 50, borderRadiusSM: 50, - textHoverBg: "#075180", colorErrorHover: "#E22929", colorErrorBorderHover: "#F68181", dangerColor: "#9E0505", diff --git a/src/shared/ui/button/index.tsx b/src/shared/ui/button/index.tsx index 0205a60..c59571b 100644 --- a/src/shared/ui/button/index.tsx +++ b/src/shared/ui/button/index.tsx @@ -10,7 +10,7 @@ interface IButton extends ButtonProps { function ButtonWs(props: IButton) { return ( - + ); From ff40c32d45780c1c2c734ad54ae79e09805a6c3e Mon Sep 17 00:00:00 2001 From: dmitrijpetrov Date: Tue, 6 Feb 2024 09:43:45 +0300 Subject: [PATCH 24/24] 1.1.14 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d31362..2d26114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.13", + "version": "1.1.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@worksolutions/antd-react-components", - "version": "1.1.13", + "version": "1.1.14", "license": "ISC", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index e48b7b6..353c5b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@worksolutions/antd-react-components", - "version": "1.1.13", + "version": "1.1.14", "description": "", "main": "dist/index.js", "types": "dist/index.d.ts",