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.

Sign up for GitHub

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

[FE] Crear Sesion Estudio - Arreglo titulo (FIX PR 240) #242

Merged
merged 9 commits into from
Nov 7, 2023
Merged

[FE] Crear Sesion Estudio - Arreglo titulo (FIX PR 240) #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a236f5
Merge branch 'develop' into fe-session-modal-visual-changes
Santisantt01 Nov 5, 2023
cb82832
Merge branch 'develop' into fe-session-modal-visual-changes
Santisantt01 Nov 6, 2023
55f6821
Corrección titulo crear sesión
Santisantt01 Nov 6, 2023
545b835
Ahora si
Santisantt01 Nov 6, 2023
a900bbe
Fix espacios error en modal create sesion
Santisantt01 Nov 6, 2023
48dfe51
Mismos cambios para editar sesión
Santisantt01 Nov 6, 2023
ada215d
Merge branch 'develop' into fe-session-modal-visual-changes
Santisantt01 Nov 6, 2023
82b3211
Merge remote-tracking branch 'origin/develop' into fe-session-modal-v…
Santisantt01 Nov 6, 2023
223a5b3
Update schema.rb
Santisantt01 Nov 7, 2023
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
7 changes: 5 additions & 2 deletions client/src/app/(protected)/groups/[id]/Content/Sessions/CreateSessionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ export default function CreateSessionForm({
onSubmit={handleSubmit}
data-testid='create-sesion'
>
<div className='col-span-2'>
<div className='mr-2 mt-2 h-5 w-5' />
<div>
<input
name='title'
type='text'
className='peer h-fit w-[90%] border-b border-gray-300 text-xl focus:border-gray-600 focus:outline-none'
className='peer mt-3 h-fit w-full border-b border-gray-300 text-xl focus:border-gray-600 focus:outline-none'
placeholder={strings.createSession.form.placeholders.title}
value={formData.title}
onChange={handleChange}
Expand Down Expand Up @@ -101,6 +102,7 @@ export default function CreateSessionForm({
validateText={validateHour(formData.startHour)}
pattern='[0-2][0-9]:[0-5][0-9]'
data-testid='startHour'
maxLength={5}
/>
</div>
<div />
Expand Down Expand Up @@ -134,6 +136,7 @@ export default function CreateSessionForm({
pattern='[0-2][0-9]:[0-5][0-9]'
disabled={formData.startTime === ''}
data-testid='endHour'
maxLength={5}
/>
</div>
<LocationIcon className='mr-2 mt-2 h-5 w-5' />
Expand Down
7 changes: 5 additions & 2 deletions client/src/app/(protected)/groups/[id]/Content/Sessions/ViewSession.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,9 @@ export default function ViewSession({
className='m-2 grid grid-cols-[20px,auto] gap-x-3 gap-y-8 sm:gap-y-[10px]'
data-testid='view-sesion'
>
<div className='col-span-2 my-3 flex h-6'>
<h1 className='peer mt-0 h-fit w-[90%] font-poppins text-xl text-primaryBlue'>
<div />
<div className='my-3 flex h-6'>
<h1 className='peer mt-0 h-fit w-[90%] font-poppins text-xl font-medium text-primaryBlue'>
{handleEditMode(
<Input
type='text'
Expand Down Expand Up @@ -402,6 +403,7 @@ export default function ViewSession({
touched={true}
pattern='[0-2][0-9]:[0-5][0-9]'
validateText={validateHour(editData.endTime)}
maxLength={5}
/>
</div>,
<h1 className='font-poppins font-semibold text-blackTextColor'>
Expand Down Expand Up @@ -433,6 +435,7 @@ export default function ViewSession({
touched={true}
pattern='[0-2][0-9]:[0-5][0-9]'
validateText={validateHour(editData.endHour)}
maxLength={5}
/>
</div>,
<h1 className='font-poppins font-semibold text-blackTextColor'>
Expand Down