diff --git a/.gitignore b/.gitignore index 5f6ad05d4..216f3077e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -*.iml -*.tfstate -.terraform -yootheme - # Logs logs *.log @@ -14,9 +9,6 @@ pids *.pid *.seed -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - # Coverage directory used by tools like istanbul coverage @@ -58,21 +50,10 @@ dist # env vars .env -# Google Cloud Credentials -credentials.json - # unique for each install yarn states .yarn/build-state.yml .yarn/install-state.gz -# local -.ini -.ignore - -# Exclude all wp themes except current one -wp-content/themes -wp-content/themes/!misik!/ - # tgsnake cache files myapp.cache myapp.session diff --git a/fragments/footer-fragment/src/footer-component.tsx b/fragments/footer-fragment/src/footer-component.tsx index 334f9a97a..ba48bacd3 100644 --- a/fragments/footer-fragment/src/footer-component.tsx +++ b/fragments/footer-fragment/src/footer-component.tsx @@ -38,12 +38,14 @@ export const Footer: FC = memo(({ const navigationItems = extractFragments(navigationItemsType, 'contentAddons', navigation) const mainPage = extractFragment('contentAddons', 'main', navigation) + const telegramContanctsObj = extractFragment('contactAddons', 'linkTelegram', contactsData) + const appointmentPhone = footerObj?.title const telephone = contactsObj?.telephone const address = contactsObj?.address const workingHours = contactsObj?.workinghours const linkVk = contactsObj?.linkVk - const linkFb = contactsObj?.linkFb + const linkTelegram = telegramContanctsObj?.address const by = new Map() by.set('title', byObj?.title) by.set('content', byObj?.highlightedtext) @@ -81,7 +83,7 @@ export const Footer: FC = memo(({ - + diff --git a/fragments/footer-fragment/src/footer.interface.ts b/fragments/footer-fragment/src/footer.interface.ts index 623b1d928..e6c68109e 100644 --- a/fragments/footer-fragment/src/footer.interface.ts +++ b/fragments/footer-fragment/src/footer.interface.ts @@ -4,7 +4,6 @@ import type { ContactsDataType } from '@globals/data' export interface ContactAddons { address: string email: string - linkFb: string linkVk: string fragmentId: string telephone: string diff --git a/globals/data/src/queries/get-contacts-data/get-contacts-data.query.ts b/globals/data/src/queries/get-contacts-data/get-contacts-data.query.ts index 6708cd13d..a5e4856fd 100644 --- a/globals/data/src/queries/get-contacts-data/get-contacts-data.query.ts +++ b/globals/data/src/queries/get-contacts-data/get-contacts-data.query.ts @@ -7,7 +7,6 @@ const GET_CONTACTS = gql` contactAddons { address email - linkFb linkVk telephone workinghours diff --git a/site/fragments/contacts-fragment/src/contacts-information/contacts-information.component.tsx b/site/fragments/contacts-fragment/src/contacts-information/contacts-information.component.tsx index 16a2d7ca7..c5c491bae 100644 --- a/site/fragments/contacts-fragment/src/contacts-information/contacts-information.component.tsx +++ b/site/fragments/contacts-fragment/src/contacts-information/contacts-information.component.tsx @@ -26,8 +26,8 @@ export const ContactsInformation: FC = memo((props) => contactsTitle, telephone, email, + linkTelegram, linkVk, - linkFb, } = contactsData return ( @@ -74,8 +74,8 @@ export const ContactsInformation: FC = memo((props) => - - + + ) diff --git a/site/fragments/contacts-fragment/src/contacts.interface.ts b/site/fragments/contacts-fragment/src/contacts.interface.ts index c691b83d1..947578ba7 100644 --- a/site/fragments/contacts-fragment/src/contacts.interface.ts +++ b/site/fragments/contacts-fragment/src/contacts.interface.ts @@ -14,6 +14,6 @@ export type ContactsDataType = { contactsTitle: string telephone: string email: string + linkTelegram: string linkVk: string - linkFb: string } diff --git a/site/fragments/contacts-fragment/src/hooks/use-contacts.hook.ts b/site/fragments/contacts-fragment/src/hooks/use-contacts.hook.ts index 18cb3408c..8b676247b 100644 --- a/site/fragments/contacts-fragment/src/hooks/use-contacts.hook.ts +++ b/site/fragments/contacts-fragment/src/hooks/use-contacts.hook.ts @@ -11,12 +11,14 @@ export const useContacts: UseContactsType = (props) => { const contactsObj = extractFragment('contactAddons', 'info', contactsData) + const telegramContanctsObj = extractFragment('contactAddons', 'linkTelegram', contactsData) + const address = contactsObj?.address const workingHours = contactsObj?.workinghours const telephone = contactsObj?.telephone const email = contactsObj?.email const linkVk = contactsObj?.linkVk - const linkFb = contactsObj?.linkFb + const linkTelegram = telegramContanctsObj?.address return { addressTitle, @@ -27,6 +29,6 @@ export const useContacts: UseContactsType = (props) => { telephone, email, linkVk, - linkFb, + linkTelegram, } } diff --git a/site/fragments/hero-fragment/src/hero.component.tsx b/site/fragments/hero-fragment/src/hero.component.tsx index 332f513d9..409b0d583 100644 --- a/site/fragments/hero-fragment/src/hero.component.tsx +++ b/site/fragments/hero-fragment/src/hero.component.tsx @@ -41,6 +41,8 @@ const Hero = forwardRef(( const contactsObj = extractFragment('contactAddons', 'info', contactsData) const backgroundObj = extractFragment('contentAddons', 'hero', uiData) + const telegramContanctsObj = extractFragment('contactAddons', 'linkTelegram', contactsData) + const title = new Map([ ['title', leadObj?.title], ['highlighted', leadObj?.highlightedtext], @@ -53,7 +55,7 @@ const Hero = forwardRef(( const anchor = anchorObj?.title const phone = contactsObj?.telephone const linkVk = contactsObj?.linkVk - const linkFb = contactsObj?.linkFb + const linkTelegram = telegramContanctsObj?.address return ( <> @@ -155,7 +157,7 @@ const Hero = forwardRef(( - + diff --git a/ui/icons/src/TelegramIcon.tsx b/ui/icons/src/TelegramIcon.tsx new file mode 100644 index 000000000..a7be8dbbe --- /dev/null +++ b/ui/icons/src/TelegramIcon.tsx @@ -0,0 +1,24 @@ +import { useTheme } from '@emotion/react' +/* eslint-disable */ +import React from 'react' + +import { IconProps } from '../icons.interfaces.js' + +export const TelegramIcon = React.memo((props: IconProps) => { + const theme: any = useTheme() + return ( + + + + ) +}) diff --git a/ui/icons/src/index.ts b/ui/icons/src/index.ts index 6b226afa7..b3f72366f 100644 --- a/ui/icons/src/index.ts +++ b/ui/icons/src/index.ts @@ -11,4 +11,5 @@ export * from './FooterLogoIcon.js' export * from './LogoIcon.js' export * from './MenuIcon.js' export * from './VkIcon.js' +export * from './TelegramIcon.js' export * from './WheelIcon.js' diff --git a/ui/social-links/src/social-links-dark.component.tsx b/ui/social-links/src/social-links-dark.component.tsx index 206f6f266..33749671a 100644 --- a/ui/social-links/src/social-links-dark.component.tsx +++ b/ui/social-links/src/social-links-dark.component.tsx @@ -5,29 +5,29 @@ import type { SocialLinksProps } from './social-links.interface.js' import React from 'react' import { Button } from '@ui/button' +import { TelegramIcon } from '@ui/icons' import { VkIcon } from '@ui/icons' -import { FacebookIcon } from '@ui/icons' import { Box } from '@ui/layout' import { Layout } from '@ui/layout' import { Link } from '@ui/link' -const SocialLinksDark: FC = ({ linkVk, linkFb }) => ( +const SocialLinksDark: FC = ({ linkTelegram, linkVk }) => ( - + - + diff --git a/ui/social-links/src/social-links.component.tsx b/ui/social-links/src/social-links.component.tsx index 43473bf49..eb49e5a59 100644 --- a/ui/social-links/src/social-links.component.tsx +++ b/ui/social-links/src/social-links.component.tsx @@ -5,34 +5,34 @@ import type { SocialLinksProps } from './social-links.interface.js' import React from 'react' import { Button } from '@ui/button' -import { FacebookIcon } from '@ui/icons' import { VkIcon } from '@ui/icons' +import { TelegramIcon } from '@ui/icons' import { Box } from '@ui/layout' import { Layout } from '@ui/layout' import { Link } from '@ui/link' import { useHover } from '@ui/utils' -const SocialLinks: FC = ({ linkVk, linkFb }) => { +const SocialLinks: FC = ({ linkTelegram, linkVk }) => { + const [hoverTelegram, hoverTelegramProps] = useHover() const [hoverVk, hoverVkProps] = useHover() - const [hoverFb, hoverFbProps] = useHover() return ( - - + + - - + + diff --git a/ui/social-links/src/social-links.interface.ts b/ui/social-links/src/social-links.interface.ts index ef9426b56..ba982a803 100644 --- a/ui/social-links/src/social-links.interface.ts +++ b/ui/social-links/src/social-links.interface.ts @@ -1,4 +1,4 @@ export interface SocialLinksProps { + linkTelegram: string linkVk: string - linkFb: string }