Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): update core deps #1054

Closed
wants to merge 13 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(src/): fix chakra removal of isFullWidth and new react root
chore(workspace): removed wip ode

fix(button): changed buttons that have the isFullWidth prop to using w=100%
seaerchin committed Sep 15, 2022
commit f111c6431c9049da92f8a2d03f8bf999b6c4f194
2 changes: 1 addition & 1 deletion public/mockServiceWorker.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
/* tslint:disable */

/**
* Mock Service Worker (0.42.1).
* Mock Service Worker (0.42.3).
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
6 changes: 1 addition & 5 deletions src/components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
@@ -184,11 +184,7 @@ export const Sidebar = (): JSX.Element => {
</LinkBox>
<Divider color="secondary.100" />
<VStack spacing="2rem" pt="0.5rem">
<SidebarButton
isFullWidth
display="block"
onClick={setRedirectToLogout}
>
<SidebarButton w="100%" display="block" onClick={setRedirectToLogout}>
<Flex w="100%">
<Text textStyle="body-1">Logout</Text>
<Spacer />
2 changes: 1 addition & 1 deletion src/components/contact-us/ContactCard.jsx
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ const EditorContactCard = ({
<div className={`${elementStyles.inputGroup} pt-5`}>
<Button
colorScheme="danger"
isFullWidth
w="100%"
id={`${sectionId}-${cardIndex}`}
onClick={deleteHandler}
>
2 changes: 1 addition & 1 deletion src/components/contact-us/LocationCard.jsx
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ const EditorLocationSection = ({
<div className={`${elementStyles.inputGroup} pt-5`}>
<Button
colorScheme="danger"
isFullWidth
w="100%"
id={`${sectionId}-${cardIndex}`}
onClick={deleteHandler}
>
4 changes: 2 additions & 2 deletions src/components/contact-us/LocationFields.jsx
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ const LocationHoursFields = ({
<Button
my="24px"
colorScheme="danger"
isFullWidth
w="100%"
id={`${sectionId}-${cardIndex}-remove_operating_hours-${operationsIndex}`}
onClick={onFieldChange}
>
@@ -96,7 +96,7 @@ const LocationHoursFields = ({
<Box mt={3}>
{operatingHours.length < DEFAULT_NUM_OPERATING_FIELDS ? (
<Button
isFullWidth
w="100%"
onClick={onFieldChange}
id={`${sectionId}-${cardIndex}-add_operating_hours`}
>
8 changes: 3 additions & 5 deletions src/components/contact-us/Section.jsx
Original file line number Diff line number Diff line change
@@ -112,11 +112,9 @@ const EditorSection = ({
)}
</Droppable>
<div className={`${elementStyles.inputGroup} pt-5`}>
<Button
isFullWidth
id={`${sectionId}`}
onClick={createHandler}
>{`Add ${sectionId === "contacts" ? "Contact" : "Location"}`}</Button>
<Button w="100%" id={`${sectionId}`} onClick={createHandler}>{`Add ${
sectionId === "contacts" ? "Contact" : "Location"
}`}</Button>
seaerchin marked this conversation as resolved.
Show resolved Hide resolved
</div>
</>
) : null}
3 changes: 1 addition & 2 deletions src/components/homepage/HeroDropdown.jsx
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ const HeroDropdownElem = ({
</div>
<div className={elementStyles.inputGroup}>
<Button
isFullWidth
w="100%"
colorScheme="danger"
id={`dropdownelem-${dropdownsIndex}-delete`}
onClick={deleteHandler}
@@ -143,7 +143,6 @@ const HeroDropdown = ({
) : null}
{droppableProvided.placeholder}
<Button
isFullWidth
id={`dropdownelem-${options.length}-create`}
onClick={createHandler}
>
2 changes: 1 addition & 1 deletion src/components/homepage/HeroSection.jsx
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ const EditorHeroSection = ({
onClick={createHandler}
id={`highlight-${highlights.length}-create`}
isDisabled={highlights.length >= MAX_NUM_KEY_HIGHLIGHTS}
isFullWidth
w="100%"
>
Add highlight
</Button>
2 changes: 1 addition & 1 deletion src/components/homepage/InfobarSection.jsx
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ const EditorInfobarSection = ({
<div className={elementStyles.inputGroup}>
<Button
colorScheme="danger"
isFullWidth
w="100%"
id={`section-${sectionIndex}`}
onClick={deleteHandler}
>
2 changes: 1 addition & 1 deletion src/components/homepage/InfopicSection.jsx
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ const EditorInfopicSection = ({
<div className={elementStyles.inputGroup}>
<Button
colorScheme="danger"
isFullWidth
w="100%"
id={`section-${sectionIndex}`}
onClick={deleteHandler}
>
2 changes: 1 addition & 1 deletion src/components/homepage/KeyHighlight.jsx
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ const KeyHighlight = ({
onClick={deleteHandler}
colorScheme="danger"
key={`${highlightIndex}-delete`}
isFullWidth
w="100%"
>
Delete highlight
</Button>
2 changes: 1 addition & 1 deletion src/components/homepage/ResourcesSection.jsx
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ const EditorResourcesSection = ({
<div className={elementStyles.inputGroup}>
<Button
colorScheme="danger"
isFullWidth
w="100%"
id={`section-${sectionIndex}`}
onClick={deleteHandler}
>
2 changes: 1 addition & 1 deletion src/components/move/MoveMenuItem.tsx
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ export const DirMenuItem = ({
return (
<>
<Button
isFullWidth
w="100%"
variant="clear"
paddingStart="1.5rem"
display="flex"
2 changes: 1 addition & 1 deletion src/components/navbar/NavSection.jsx
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ const NavElem = ({
onClick={deleteHandler}
id={`link-${linkIndex}-delete`}
colorScheme="danger"
isFullWidth
w="100%"
>
Delete menu
</Button>
3 changes: 1 addition & 2 deletions src/components/navbar/NavSublinkSection.jsx
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ const SublinkElem = ({
onClick={deleteHandler}
id={`sublink-${linkIndex}-${sublinkIndex}-delete`}
colorScheme="danger"
isFullWidth
w="100%"
>
Delete submenu
</Button>
@@ -134,7 +134,6 @@ const NavSublinkSection = ({
{droppableProvided.placeholder}
<Button
mt={4}
isFullWidth
id={`sublink-${linkIndex}-${sublinks.length}-create`}
onClick={createHandler}
>
13 changes: 10 additions & 3 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import * as Sentry from "@sentry/react"
import { Integrations } from "@sentry/tracing"
import ReactDOM from "react-dom"
import React from "react"
import { createRoot } from "react-dom/client"

import "styles/index.scss"
import "styles/isomer-template.scss"

import App from "App"

if (
@@ -19,5 +21,10 @@ if (
tracesSampleRate: 1.0,
})
}

ReactDOM.render(<App />, document.getElementById("root"))
const container = document.getElementById("root")
const root = createRoot(container)
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
)
6 changes: 4 additions & 2 deletions src/layouts/Settings/SocialMediaSettings.tsx
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import {
TELEGRAM_REGEX,
} from "utils/validators"

import { SiteSettings } from "types/settings"
import { SiteSettings, SiteSocialMediaSettings } from "types/settings"

interface SocialMediaField {
label: StringKeyOf<SiteSettings["socialMediaContent"]>
@@ -68,7 +68,9 @@ const ValidatedFormInput = ({
}: ValidatedFormInputProps) => {
const displayedLabel = upperFirst(label)
const { register } = useFormContext()
const { errors } = useFormState()
const { errors } = useFormState<{
socialMediaContent: SiteSocialMediaSettings
}>()
const isInvalid =
errors.socialMediaContent && !!errors.socialMediaContent[label]

1 change: 1 addition & 0 deletions src/theme/foundations/colours.ts
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ export const colours: { [k in IsomerColorScheme]: NestedRecord } = {
light: "#E9E9E9",
},
divider: {
default: "#F9F9F9",
alt: "#E9E9E9",
active: "#276EF1",
disabled: "#BFBFBF",