From dd81ed763b1cd3a56bb2e30c5c9819969bc19c2c Mon Sep 17 00:00:00 2001 From: joker Date: Mon, 3 Apr 2023 10:45:45 +0300 Subject: [PATCH] modified: competition/regulations.mdx renamed: components/RegistrationForm copy.tsx -> components/RegistrationForm_old.tsx modified: components/UserForm.tsx modified: pages/competition/registration.tsx modified: tailwind.config.js --- competition/regulations.mdx | 6 +++--- ...strationForm copy.tsx => RegistrationForm_old.tsx} | 4 ++-- components/UserForm.tsx | 4 +++- pages/competition/registration.tsx | 11 ++++++++--- tailwind.config.js | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) rename components/{RegistrationForm copy.tsx => RegistrationForm_old.tsx} (98%) diff --git a/competition/regulations.mdx b/competition/regulations.mdx index b8628de..22c295f 100644 --- a/competition/regulations.mdx +++ b/competition/regulations.mdx @@ -13,9 +13,9 @@ image: '/images/robottop.png' priority /> -

Соревнования проводятся в двух номинациях

-1. **"Робот - Сортировщик" роботы собраны на произвольной платформе** -2. **"Робот - Грузчик" роботы собраны на произвольной платформе** +### Соревнования проводятся в двух номинациях +1. "Робот - Сортировщик" роботы собраны на произвольной платформе +2. "Робот - Грузчик" роботы собраны на произвольной платформе ## Участники

Команда состоит из 2-x учащихся с 1 по 11 класс. Каждая команда на соревнованиях должна привезти с собой одного **уникального робота**. diff --git a/components/RegistrationForm copy.tsx b/components/RegistrationForm_old.tsx similarity index 98% rename from components/RegistrationForm copy.tsx rename to components/RegistrationForm_old.tsx index 99d67f4..03bc715 100644 --- a/components/RegistrationForm copy.tsx +++ b/components/RegistrationForm_old.tsx @@ -34,7 +34,7 @@ const defaultValues = { third_part_class: 0, }; -export const RegistrationForm = (props): JSX.Element => { +export const RegistrationForm_old = (props): JSX.Element => { const form = useRef(null); const methods = useForm({ defaultValues }); @@ -134,4 +134,4 @@ export const RegistrationForm = (props): JSX.Element => { ); }; -export default RegistrationForm; +export default RegistrationForm_old; diff --git a/components/UserForm.tsx b/components/UserForm.tsx index 0dc1dcc..f7097cf 100644 --- a/components/UserForm.tsx +++ b/components/UserForm.tsx @@ -1,6 +1,8 @@ import React,{useRef} from 'react'; import { useForm, SubmitHandler, FormProvider } from "react-hook-form"; -import { Select, Input, Link_str, SelectNominations } from "./UX"; +import { Select, Input, + //Link_str, + SelectNominations } from "./UX"; interface IFormInputs { name_team_coach: string, diff --git a/pages/competition/registration.tsx b/pages/competition/registration.tsx index fa90ffb..2e9254e 100644 --- a/pages/competition/registration.tsx +++ b/pages/competition/registration.tsx @@ -1,7 +1,8 @@ import React, {useEffect, useState} from 'react'; import Layout from '../../components/Layout'; -import RegistrationForm from '../../components/RegistrationForm'; -import UserForm from '../../components/UserForm'; +//import RegistrationForm from '../../components/RegistrationForm'; +import RegistrationForm_old from '../../components/RegistrationForm_old' +//import UserForm from '../../components/UserForm'; import LoadingTeamsForm from '../../components/LoadingTeamsForm'; import { useSelector } from 'react-redux'; import { useAppDispatch } from '../../redux/store'; @@ -29,7 +30,11 @@ export const Registration = (): JSX.Element => { title: 'Регистрация на соревнования', }} > - + { + // + } + + { // } diff --git a/tailwind.config.js b/tailwind.config.js index 524b8b0..89d9917 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -71,5 +71,5 @@ module.exports = { variants: { typography: ['dark'], }, - plugins: [require("daisyui")], + plugins: [require("daisyui"), require('@tailwindcss/typography')], }; \ No newline at end of file