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

Update packages #1504

Merged
merged 3 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 6 additions & 6 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"tsc": "npx tsc --noEmit"
},
"dependencies": {
"@react-email/components": "0.0.20",
"@react-email/components": "0.0.21",
"@react-email/font": "0.0.6",
"@react-email/render": "0.0.16",
"@react-email/tailwind": "0.0.18",
"@strapi/plugin-i18n": "^4.25.1",
"@strapi/plugin-sentry": "^4.25.1",
"@strapi/plugin-users-permissions": "^4.25.1",
"@strapi/provider-email-nodemailer": "^4.25.1",
"@strapi/strapi": "^4.25.1",
"@strapi/plugin-i18n": "^4.25.2",
"@strapi/plugin-sentry": "^4.25.2",
"@strapi/plugin-users-permissions": "^4.25.2",
"@strapi/provider-email-nodemailer": "^4.25.2",
"@strapi/strapi": "^4.25.2",
"apify-client": "^2.9.4",
"cheerio": "^1.0.0-rc.12",
"pg": "^8.12.0",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"@fc/types": "*",
"@fc/ui": "*",
"@hookform/resolvers": "^3.7.0",
"@sentry/nextjs": "^8.13.0",
"@sentry/nextjs": "^8.14.0",
"@sindresorhus/slugify": "^2.2.1",
"@splidejs/react-splide": "^0.7.12",
"@tanstack/react-query": "^5.49.2",
"@tanstack/react-query-devtools": "^5.49.2",
"@uppy/compressor": "^1.1.4",
"@uppy/core": "^3.13.0",
"@uppy/core": "^3.13.1",
"@uppy/dashboard": "^3.9.1",
"@uppy/drag-drop": "^3.1.0",
"@uppy/drag-drop": "^3.1.1",
"@uppy/file-input": "^3.1.2",
"@uppy/image-editor": "^2.4.6",
"@uppy/progress-bar": "^3.1.1",
Expand All @@ -54,12 +54,12 @@
"@vercel/og": "^0.6.2",
"ai": "^3.2.16",
"axios": "^1.7.2",
"chakra-react-select": "4.8.0",
"chakra-react-select": "4.9.1",
"cookies-next": "^4.2.1",
"date-fns": "^3.6.0",
"date-fns-tz": "^3.1.3",
"file-saver": "^2.0.5",
"framer-motion": "11.2.12",
"framer-motion": "11.2.13",
"i18next": "^23.11.5",
"iron-session": "^8.0.2",
"jspdf": "^2.5.1",
Expand All @@ -75,7 +75,7 @@
"next-recaptcha-v3": "^1.4.1",
"next-seo": "^6.5.0",
"next-share": "^0.27.0",
"openai": "^4.52.2",
"openai": "^4.52.3",
"pluralize": "^8.0.0",
"qs": "^6.12.2",
"react": "^18.3.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/components/AcademyCard/AcademyCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ export const AcademyCard: FC<AcademyCardProps> = ({
description,
title,
}) => {
const baseTranslate = description ? 'translateY(5rem)' : 'translateY(2rem)'

return (
<LinkBox as="article">
<LinkOverlay as={Link} href={href}>
Expand All @@ -30,7 +28,7 @@ export const AcademyCard: FC<AcademyCardProps> = ({
position="relative"
role="group"
overflow="hidden"
w="100%"
w="full"
>
<WImage
src={image}
Expand All @@ -39,13 +37,15 @@ export const AcademyCard: FC<AcademyCardProps> = ({
transitionDuration={'0.2s'}
/>
<Stack
transform={baseTranslate}
p={6}
color="white"
position="absolute"
justify={'end'}
top={0}
bottom={0}
left={0}
w={'full'}
transform={description ? 'translateY(4rem)' : 'translateY(0)'}
_groupHover={{ transform: 'translateY(0)' }}
transition="all"
transitionDuration="0.3s"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react'

import { FilePicker } from './FilePicker'
import FilePicker from './FilePicker'
import { FilePickerProps } from './types'

export default {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/FilePicker/FilePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ const FilePicker: FC<FilePickerProps> = ({
}, [uppy])

uppy.on('preprocess-complete', file => {
if (!file?.data || !file?.preview) return
if (!file?.data) return

onLoaded([file.data as File], [file.preview])
onLoaded([file.data as File], file.preview ? [file.preview] : [])
})

uppy.on('files-added', result => {
Expand Down
13 changes: 1 addition & 12 deletions packages/ui/src/components/ModelEditForm/ModelEditForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,18 +346,7 @@ export const ModelEditForm = <T extends StrapiModel>({
{Object.values(fields || {})?.map((field, index) => {
const label = t(field.name as keyof I18nNamespaces['common'])

if (
field.type === 'file' &&
[
'image',
'avatar',
'video',
'caps',
'invoice',
'images',
'volunteerForm',
].includes(field.name as string)
) {
if (field.type === 'file') {
return (
<FormControl
key={index}
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/ModelMedia/ModelMedia.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const ModelMedia = <T extends FieldValues = FieldValues>({

const mediaUrl = getMediaUrl(media)
const isMediaFile = mime?.includes('video') || mime?.includes('image')

const renderMedia = () => {
if (isChangingMedia || (isEditing && !media)) {
return (
Expand Down
Loading