Ryan/Reactive-Resume
1
0
Fork 0
mirror of https://github.com/AmruthPillai/Reactive-Resume.git synced 2026-07-24 00:43:29 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix_disable_click_outside_modal

Browse Source
This commit is contained in:
Jubair Hossain
2023-08-01 15:38:30 +06:00
committed by GitHub
parent dae142e5ce 95de63f387
commit c455cbb5ca
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/modals/builder/sections/WorkModal.tsx
+10 -16
View File
@@ -151,14 +151,11 @@ const WorkModal: React.FC = () => {
label={t('builder.common.form.start-date.label')} label={t('builder.common.form.start-date.label')}
value={dayjs(field.value)} value={dayjs(field.value)}
views={['year', 'month', 'day']} views={['year', 'month', 'day']}
slots={{ slotProps={{
textField: (params) => ( textField: {
<TextField error: !!fieldState.error,
{...params} helperText: fieldState.error?.message || t('builder.common.form.start-date.help-text')
error={!!fieldState.error} },
helperText={fieldState.error?.message || params.inputProps?.placeholder}
/>
),
}} }}
onChange={(date: dayjs.Dayjs | null) => { onChange={(date: dayjs.Dayjs | null) => {
date && dayjs(date).isValid() && field.onChange(dayjs(date).format('YYYY-MM-DD')); date && dayjs(date).isValid() && field.onChange(dayjs(date).format('YYYY-MM-DD'));
@@ -177,14 +174,11 @@ const WorkModal: React.FC = () => {
label={t('builder.common.form.end-date.label')} label={t('builder.common.form.end-date.label')}
value={dayjs(field.value)} value={dayjs(field.value)}
views={['year', 'month', 'day']} views={['year', 'month', 'day']}
slots={{ slotProps={{
textField: (params) => ( textField: {
<TextField error: !!fieldState.error,
{...params} helperText: fieldState.error?.message || t('builder.common.form.end-date.help-text')
error={!!fieldState.error} },
helperText={fieldState.error?.message || t('builder.common.form.end-date.help-text')}
/>
),
}} }}
onChange={(date: dayjs.Dayjs | null) => { onChange={(date: dayjs.Dayjs | null) => {
date && dayjs(date).isValid() && field.onChange(dayjs(date).format('YYYY-MM-DD')); date && dayjs(date).isValid() && field.onChange(dayjs(date).format('YYYY-MM-DD'));
server/Dockerfile
+1 -1
View File
@@ -26,7 +26,7 @@ ENV TURBO_TOKEN=$TURBO_TOKEN
RUN pnpm exec turbo --filter server build RUN pnpm exec turbo --filter server build
FROM mcr.microsoft.com/playwright:v1.36.1-focal as production FROM mcr.microsoft.com/playwright:v1.36.2-focal as production
WORKDIR /app WORKDIR /app