From 37117616718c5a76d19221641c477e6ea0ca5936 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Mon, 18 Jan 2021 01:24:18 +0100 Subject: [PATCH 1/2] Finish up reporting --- src/api/upload.ts | 1 + src/forms/report.tsx | 38 +++++++++++++++- src/management/api/internship.ts | 13 +++--- src/management/edition/internship/list.tsx | 51 +++++++++++++++++++--- src/management/edition/settings.tsx | 2 +- src/pages/main.tsx | 17 ++++++-- src/pages/steps/grade.tsx | 22 ++++++++++ src/pages/steps/report.tsx | 15 ++++--- src/state/actions/proposal.ts | 1 + src/state/reducer/proposal.ts | 3 ++ src/state/reducer/report.ts | 5 ++- translations/pl.yaml | 7 ++- 12 files changed, 149 insertions(+), 26 deletions(-) create mode 100644 src/pages/steps/grade.tsx diff --git a/src/api/upload.ts b/src/api/upload.ts index 43aab7a..1733d91 100644 --- a/src/api/upload.ts +++ b/src/api/upload.ts @@ -8,6 +8,7 @@ export enum UploadType { Ipp = "IppScan", DeanConsent = "DeanConsent", Insurance = "NnwInsurance", + InternshipEvaluation = "InternshipEvaluation" } export interface DocumentFileInfo extends Identifiable { diff --git a/src/forms/report.tsx b/src/forms/report.tsx index 9982ad5..7ef6cc7 100644 --- a/src/forms/report.tsx +++ b/src/forms/report.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useState } from "react"; import { emptyReport, sampleReportSchema } from "@/provider/dummy/report"; import { Button, @@ -12,7 +12,7 @@ import { Radio, InputLabel, Select, - MenuItem + MenuItem, FormHelperText } from "@material-ui/core"; import { Actions } from "@/components"; import { Link as RouterLink } from "react-router-dom"; @@ -26,6 +26,13 @@ import { Transformer } from "@/serialization"; import api from "@/api"; import { useCurrentEdition } from "@/hooks"; import { Edition } from "@/data/edition"; +import { Description as DescriptionIcon } from "@material-ui/icons"; +import { DropzoneArea } from "material-ui-dropzone"; +import { InternshipDocument } from "@/api/dto/internship-registration"; +import { UploadType } from "@/api/upload"; +import { InternshipPlanActions, InternshipReportActions, useDispatch } from "@/state/actions"; +import { useSelector } from "react-redux"; +import { AppState } from "@/state/reducer"; export type ReportFieldProps = { field: TField; @@ -120,11 +127,26 @@ export default function ReportForm() { const edition = useCurrentEdition() as Edition; const report = emptyReport; const schema = edition.schema; + const dispatch = useDispatch(); const { t } = useTranslation(); + const [file, setFile] = useState(); + const document = useSelector(state => state.report.evaluation); const handleSubmit = async (values: ReportFormValues) => { + if (!file) { + return; + } + const result = reportFormValuesTransformer.reverseTransform(values, { report }); await api.report.save(result); + + let destination: InternshipDocument = document as any; + + if (!destination) { + destination = await api.upload.create(UploadType.InternshipEvaluation); + } + + await api.upload.upload(destination, file); }; return @@ -133,6 +155,18 @@ export default function ReportForm() { { t('forms.report.instructions') } + + + + + setFile(files[0]) }/> + { t('forms.report.dropzone-help') } + + + { t('forms.report.report') } + { schema.map(field => ) } diff --git a/src/management/api/internship.ts b/src/management/api/internship.ts index aaed4c3..1bfa9cb 100644 --- a/src/management/api/internship.ts +++ b/src/management/api/internship.ts @@ -11,7 +11,7 @@ import { InternshipInfoDTO, internshipReportDtoTransformer, submissionStateDtoTransformer } from "@/api/dto/internship-registration"; -import { Transformer } from "@/serialization"; +import { OneWayTransformer, Transformer } from "@/serialization"; import { mentorDtoTransformer } from "@/api/dto/mentor"; import { internshipTypeDtoTransformer } from "@/api/dto/type"; import { studentDtoTransfer } from "@/api/dto/student"; @@ -24,6 +24,7 @@ export type InternshipSubmission = Nullable & { changed: Moment | null, ipp: InternshipDocument | null, report: Report | null, + evaluation: InternshipDocument, grade: number | null, approvals: InternshipDocument[], } @@ -34,10 +35,12 @@ const INTERNSHIP_GRADE_ENDPOINT = "/management/internship/:id/grade"; const INTERNSHIP_ACCEPT_ENDPOINT = "/management/internship/:id/registration/accept"; const INTERNSHIP_REJECT_ENDPOINT = "/management/internship/:id/registration/reject"; -const internshipInfoDtoTransformer: Transformer = { +const internshipInfoDtoTransformer: OneWayTransformer = { transform(subject: InternshipInfoDTO, context?: never): InternshipSubmission { // @ts-ignore const ipp = subject.documentation.find(doc => doc.type === UploadType.Ipp); + // @ts-ignore + const evaluation = subject.documentation.find(doc => doc.type === UploadType.InternshipEvaluation); const report = subject.report; return { @@ -58,12 +61,10 @@ const internshipInfoDtoTransformer: Transformer doc.type === UploadType.DeanConsent).map(subject => internshipDocumentDtoTransformer.transform(subject))) + approvals: (subject.documentation.filter(doc => doc.type === UploadType.DeanConsent).map(subject => internshipDocumentDtoTransformer.transform(subject))), + evaluation: evaluation && internshipDocumentDtoTransformer.transform(evaluation), }; }, - reverseTransform(subject: InternshipSubmission, context: undefined): InternshipInfoDTO { - return {} as any; - }, } export async function all(edition: Identifiable): Promise { diff --git a/src/management/edition/internship/list.tsx b/src/management/edition/internship/list.tsx index d29af92..4d44d69 100644 --- a/src/management/edition/internship/list.tsx +++ b/src/management/edition/internship/list.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useContext, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { useAsyncState } from "@/hooks"; import { useSpacing } from "@/styles"; @@ -22,7 +22,7 @@ import { Actions } from "@/components"; import { BulkActions } from "@/management/common/BulkActions"; import { Async } from "@/components/async"; import { MaterialTableTitle } from "@/management/common/MaterialTableTitle"; -import { EditionManagement, EditionManagementProps } from "@/management/edition/manage"; +import { EditionContext, EditionManagement, EditionManagementProps } from "@/management/edition/manage"; import { InternshipSubmission } from "@/management/api/internship"; import { createPortal } from "react-dom"; import { FileInfo } from "@/components/fileinfo"; @@ -34,6 +34,8 @@ import { AcceptanceActions } from "@/components/acceptance-action"; import { InternshipDocument } from "@/api/dto/internship-registration"; import { StudentPreview } from "@/pages/user/profile"; import { SubmissionStatus } from "@/state/reducer/submission"; +import { ReportPreview } from "@/pages/steps/report"; +import { Report, ReportSchema } from "@/data/report"; const title = "edition.internships.title"; @@ -54,7 +56,9 @@ const ProposalAction = ({ internship, children }: { internship: InternshipSubmis } return <> -
setOpen(true) } style={{ display: "inline-block", cursor: "pointer" }}>{ children || }
+ { internship.state + ?
setOpen(true) } style={{ display: "inline-block", cursor: "pointer" }}>{ children }
+ : children } { createPortal( setOpen(false) }/>, document.getElementById("modals") as Element, @@ -95,6 +99,41 @@ const IPPAction = ({ internship, children }: { internship: InternshipSubmission, ; } +const ReportAction = ({ internship, children }: { internship: InternshipSubmission, children: React.ReactChild }) => { + const { t } = useTranslation(); + const [open, setOpen] = useState(false); + const edition = useContext(EditionContext); + + const handleDiscard = (comment: string) => { + setOpen(false); + api.document.discard(internship.evaluation as InternshipDocument, comment); + } + + const handleAccept = (comment?: string) => { + setOpen(false); + api.document.accept(internship.evaluation as InternshipDocument, comment); + } + + return <> + { internship.report + ?
setOpen(true) } style={{ display: "inline-block", cursor: "pointer" }}>{ children }
+ : children } + { createPortal( + setOpen(false) }> + { fullname(internship.intern as Student) } + + { internship.evaluation && } + + + + + + , + document.getElementById("modals") as Element, + ) } + ; +} + const StudentAction = ({ internship, children }: { internship: InternshipSubmission, children: React.ReactChild }) => { const { t } = useTranslation(); const [open, setOpen] = useState(false); @@ -117,7 +156,7 @@ export const InternshipState = ({ internship }: { internship: InternshipSubmissi const studentDataState = internship.intern && isStudentDataComplete(internship.intern) ? "accepted" : null; const proposalState = internship.state; const ippState = internship.ipp?.state || null; - const reportState = internship.report?.state || null; + const reportState = internship.evaluation?.state || null; const gradeState = internship.grade ? "accepted" : null; const approvalState = internship.approvals.reduce((status, document) => { switch (status) { @@ -145,7 +184,9 @@ export const InternshipState = ({ internship }: { internship: InternshipSubmissi } /> - } /> + + } /> + } /> } style={ approvalState ? {} : { opacity: 0.2 } } diff --git a/src/management/edition/settings.tsx b/src/management/edition/settings.tsx index 085f3a3..a20c1cd 100644 --- a/src/management/edition/settings.tsx +++ b/src/management/edition/settings.tsx @@ -33,7 +33,7 @@ export function EditionSettings() { await api.edition.save(result); - history.push("management:edition_manage", { edition: edition.id as string }) + history.push("management:edition_manage", { edition: edition.value.id as string }) }; return diff --git a/src/pages/main.tsx b/src/pages/main.tsx index a88404c..7a80444 100644 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -15,9 +15,15 @@ import { InsuranceStep } from "@/pages/steps/insurance"; import { StudentStep } from "@/pages/steps/student"; import api from "@/api"; import { AppDispatch, InternshipPlanActions, InternshipProposalActions, InternshipReportActions, useDispatch } from "@/state/actions"; -import { internshipDocumentDtoTransformer, internshipRegistrationDtoTransformer, internshipReportDtoTransformer } from "@/api/dto/internship-registration"; +import { + internshipDocumentDtoTransformer, + internshipRegistrationDtoTransformer, + internshipReportDtoTransformer, SubmissionState, + submissionStateDtoTransformer +} from "@/api/dto/internship-registration"; import { UploadType } from "@/api/upload"; import { ReportStep } from "@/pages/steps/report"; +import { GradeStep } from "@/pages/steps/grade"; export const updateInternshipInfo = async (dispatch: AppDispatch) => { const internship = await api.internship.get(); @@ -27,9 +33,11 @@ export const updateInternshipInfo = async (dispatch: AppDispatch) => { state: internship.internshipRegistration.state, comment: internship.internshipRegistration.changeStateComment, internship: internshipRegistrationDtoTransformer.transform(internship.internshipRegistration), + grade: internship.grade, }) const plan = internship.documentation.find(doc => doc.type === UploadType.Ipp); + const evaluation = internship.documentation.find(doc => doc.type === UploadType.InternshipEvaluation); const report = internship.report; if (plan) { @@ -49,8 +57,9 @@ export const updateInternshipInfo = async (dispatch: AppDispatch) => { dispatch({ type: InternshipReportActions.Receive, report: internshipReportDtoTransformer.transform(report), - state: report.state, - comment: report.changeStateComment, + state: evaluation?.state || SubmissionState.Draft, + comment: evaluation?.changeStateComment || "", + evaluation: evaluation, }) } else { dispatch({ @@ -84,7 +93,7 @@ export const MainPage = () => { yield ; yield ; - yield + yield ; } return diff --git a/src/pages/steps/grade.tsx b/src/pages/steps/grade.tsx new file mode 100644 index 0000000..28c8cc8 --- /dev/null +++ b/src/pages/steps/grade.tsx @@ -0,0 +1,22 @@ +import React from "react"; +import { StepProps, Typography } from "@material-ui/core"; +import { useTranslation } from "react-i18next"; +import { useSelector } from "react-redux"; +import { AppState } from "@/state/reducer"; +import { Actions, Step } from "@/components"; +import { ContactButton } from "@/pages/steps/common"; + + +export const GradeStep = (props: StepProps) => { + const { t } = useTranslation(); + const grade = useSelector(state => state.proposal.grade); + + return + { grade ? <> + { grade } + + + + : <>{ t("steps.grade.wait") } } + +} diff --git a/src/pages/steps/report.tsx b/src/pages/steps/report.tsx index a5703c2..d23c9da 100644 --- a/src/pages/steps/report.tsx +++ b/src/pages/steps/report.tsx @@ -16,6 +16,8 @@ import { MultiChoiceValue, Report, ReportSchema, SingleChoiceValue, TextFieldVal import { createPortal } from "react-dom"; import { getInternshipReport } from "@/state/reducer/report"; import { Edition } from "@/data/edition"; +import { FileInfo } from "@/components/fileinfo"; +import { InternshipDocument } from "@/api/dto/internship-registration"; export type ReportPreviewProps = { schema: ReportSchema, @@ -36,7 +38,7 @@ export const ReportPreview = ({ schema, report }: ReportPreviewProps) => { return
{ (value as SingleChoiceValue).pl }
case "long-text": case "short-text": - return

{ value as TextFieldValue }

+ return

{ value as TextFieldValue }

} } @@ -115,13 +117,13 @@ const ReportActions = () => { } } -export const PlanComment = (props: HTMLProps) => { - const { comment, declined } = useSelector(state => state.plan); +export const ReportComment = (props: HTMLProps) => { + const { comment, declined } = useSelector(state => state.report); const { t } = useTranslation(); return comment ? { t('comments') } - { comment } +
: null } @@ -129,6 +131,7 @@ export const ReportStep = (props: StepProps) => { const { t } = useTranslation(); const submission = useSelector(state => state.report); + const evaluation = useSelector(state => state.report.evaluation); const spacing = useSpacing(2); const edition = useCurrentEdition(); @@ -146,8 +149,8 @@ export const ReportStep = (props: StepProps) => {

{ t(`steps.report.info.${ status }`) }

- { comment && } - + + { evaluation && }
; diff --git a/src/state/actions/proposal.ts b/src/state/actions/proposal.ts index 8d91d57..16524e0 100644 --- a/src/state/actions/proposal.ts +++ b/src/state/actions/proposal.ts @@ -29,6 +29,7 @@ export interface ReceiveProposalUpdateAction extends ReceiveSubmissionUpdateActi internship: Internship; state: SubmissionState; comment?: string; + grade?: number; } export interface SaveProposalAction extends SaveSubmissionAction { diff --git a/src/state/reducer/proposal.ts b/src/state/reducer/proposal.ts index 2ed2ff9..9398878 100644 --- a/src/state/reducer/proposal.ts +++ b/src/state/reducer/proposal.ts @@ -15,12 +15,14 @@ import { SubmissionState as ApiSubmissionState } from "@/api/dto/internship-regi export type InternshipProposalState = SubmissionState & MayRequireDeanApproval & { proposal: Serializable | null; + grade: number | null; } const defaultInternshipProposalState: InternshipProposalState = { ...defaultDeanApprovalsState, ...defaultSubmissionState, proposal: null, + grade: null, } export const getInternshipProposal = ({ proposal }: InternshipProposalState): Internship | null => @@ -59,6 +61,7 @@ const internshipProposalReducer = (state: InternshipProposalState = defaultInter ].includes(action.state), proposal: internshipSerializationTransformer.transform(action.internship), comment: action.comment || "", + grade: action.grade || null, } default: return state; diff --git a/src/state/reducer/report.ts b/src/state/reducer/report.ts index 560a41f..493789d 100644 --- a/src/state/reducer/report.ts +++ b/src/state/reducer/report.ts @@ -8,18 +8,20 @@ import { } from "@/state/reducer/submission"; import { Reducer } from "react"; import { SubmissionAction } from "@/state/actions/submission"; -import { SubmissionState as ApiSubmissionState } from "@/api/dto/internship-registration"; +import { InternshipDocument, SubmissionState as ApiSubmissionState } from "@/api/dto/internship-registration"; import { Report } from "@/data/report"; import { reportSerializationTransformer } from "@/serialization/report"; export type InternshipReportState = SubmissionState & { report: Serializable | null; + evaluation: InternshipDocument | null; } const defaultInternshipReportState: InternshipReportState = { ...defaultDeanApprovalsState, ...defaultSubmissionState, report: null, + evaluation: null, } export const getInternshipReport = ({ report }: InternshipReportState): Report | null => @@ -60,6 +62,7 @@ const internshipReportReducer = (state: InternshipReportState = defaultInternshi ].includes(action.state), report: reportSerializationTransformer.transform(action.report), comment: action.comment, + evaluation: action.evaluation, } default: return state; diff --git a/translations/pl.yaml b/translations/pl.yaml index 53edf25..71ac106 100644 --- a/translations/pl.yaml +++ b/translations/pl.yaml @@ -112,8 +112,11 @@ forms: key: Klucz dostępu do edycji report: + report: Raport + dropzone-help: Skan karty oceny w formacie PDF instructions: > - Wypełnij wszystkie pola formularza w celu sfinalizowania praktyki. + Poproś swojego opiekuna o wypełnienie karty oceny praktyki - następnie zeskanuj ją i zamieść wynikowy plik poniże. + Dodatkowo wypełnij wszystkie pola formularza raportu praktyki w celu sfinalizowania praktyki. student: name: imię @@ -235,8 +238,10 @@ steps: Twój raport został zweryfikowany i odrzucony. Popraw zgłoszone uwagi i wyślij raport ponownie. W razie pytań możesz również skontaktować się z pełnomocnikiem ds. praktyk Twojego kierunku. submit: Uzupełnij raport + template: "Szablon karty oceny prakyki" grade: header: "Ocena z praktyki" + wait: "W tym miejscu pojawi się ocena z praktyki, po wystawieniu jej przez pełnomocnika praktyk ds. Twojego kierunku" insurance: header: "Ubezpieczenie NNW" instructions: > From 88b7806d579235ce6e9a7380d3b37bcbf8b1e804 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Mon, 18 Jan 2021 23:40:12 +0100 Subject: [PATCH 2/2] Add readme --- .dockerignore | 3 ++ Dockerfile | 14 +++++ README.md | 76 +++++++++++++-------------- config/nginx.conf.template | 18 +++++++ src/api/index.ts | 2 +- src/components/contact.tsx | 2 +- src/{field => forms}/ckeditor.tsx | 0 src/management/page/form.tsx | 2 +- src/management/report/fields/form.tsx | 2 +- src/management/type/form.tsx | 2 +- 10 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 config/nginx.conf.template rename src/{field => forms}/ckeditor.tsx (100%) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..2320928 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +/node_modules/ +/build/ +/.build/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0296e48 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +FROM node:15.4.0 as build + +WORKDIR /app + +COPY . . + +RUN yarn install +RUN yarn build + +FROM nginx:mainline-alpine + +COPY --from=build /app/public /var/www +COPY --from=build /app/build /var/www +COPY ./config/nginx.conf.template /etc/nginx/templates/default.conf.template diff --git a/README.md b/README.md index 64e343e..a1b7991 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,44 @@ -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). +# System Praktyk - Frontend -## Available Scripts +Projekt oparty o [Create React App](https://create-react-app.dev/) z wyciągniętymi najważniejszymi rzeczami w celu +minimalizacji zależności. -In the project directory, you can run: +## Skrypty +```bash +$ yarn server # uruchomienie serwera +$ yarn watch # uruchomienie budowania assetów +$ yarn build # uruchomienie produkcyjnego builda +``` -### `yarn start` +## Struktura projektu +``` +/.build - skrypty budujace aplikacje na serwerze +/config - konfiguracja +/public - pliki publiczne +/translations - tłumaczenia +/src/api - moduły związane z interfejsowaniem z api +/src/data - modele danych +/src/forms - formularze i pochodne +/src/components - wspólne komponenty +/src/hooks - customowe hooki dla reacta +/src/pages - podstrony +/src/provider - przykładowe dane +/src/serialization - serializacja modeli +/src/state - zarządzanie stanem +/src/management - moduły administracji kursami, struktura analogiczna +/src/styles,ui - style +/src/utils - pomocne funkcje +``` -Runs the app in the development mode.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. +## Docker +Obraz bazuje na nginxie z linii mainline. Budowanie obrazu: +``` +docker build -f Dockerfile -t system-praktyk-front:latest . +``` -The page will reload if you make edits.
-You will also see any lint errors in the console. +Dostępne są wszystkie zmienne środowiskowe typowe dla nginxa oraz dodatkowo `APP_API_BASE` definiującą bazowy adres pod którym dostępne jest api. -### `yarn test` - -Launches the test runner in the interactive watch mode.
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `yarn build` - -Builds the app for production to the `build` folder.
-It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.
-Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `yarn eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). +Przykład uruchomienia: +``` +docker run -e APP_API_BASE="https://system-praktyk.stg.kadet.net" -p 80:80 system-praktyk-front +``` diff --git a/config/nginx.conf.template b/config/nginx.conf.template new file mode 100644 index 0000000..88df8c6 --- /dev/null +++ b/config/nginx.conf.template @@ -0,0 +1,18 @@ +server { + server_name $NGINX_HOST; + root /var/www; + + location ~ ^/api/doc$ { + try_files $uri /index.html; + } + + location /api/ { + proxy_pass $APP_API_BASE/api/; + proxy_intercept_errors on; + add_header Access-Control-Allow-Origin *; + } + + location / { + try_files $uri /index.html; + } +} diff --git a/src/api/index.ts b/src/api/index.ts index 4d8e029..e40214d 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -14,7 +14,7 @@ import * as upload from "./upload"; import * as report from "./report"; export const axios = Axios.create({ - baseURL: process.env.API_BASE_URL || `https://${window.location.hostname}/api/`, + baseURL: process.env.API_BASE_URL || `${window.location.protocol}//${window.location.hostname}/api/`, }) axios.interceptors.request.use(config => { diff --git a/src/components/contact.tsx b/src/components/contact.tsx index 03b5cea..0aea5f0 100644 --- a/src/components/contact.tsx +++ b/src/components/contact.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import { useSpacing } from "@/styles"; import { Field, Form, Formik } from "formik"; import { Button, Dialog, DialogActions, DialogContent, DialogProps, DialogTitle, Typography } from "@material-ui/core"; -import { CKEditorField } from "@/field/ckeditor"; +import { CKEditorField } from "@/forms/ckeditor"; import { Actions } from "@/components/actions"; import { Cancel, Send } from "mdi-material-ui"; import { createPortal } from "react-dom"; diff --git a/src/field/ckeditor.tsx b/src/forms/ckeditor.tsx similarity index 100% rename from src/field/ckeditor.tsx rename to src/forms/ckeditor.tsx diff --git a/src/management/page/form.tsx b/src/management/page/form.tsx index fe28dd6..a8de4a4 100644 --- a/src/management/page/form.tsx +++ b/src/management/page/form.tsx @@ -6,7 +6,7 @@ import { TextField as TextFieldFormik } from "formik-material-ui"; import { Typography } from "@material-ui/core"; import { useTranslation } from "react-i18next"; import { useSpacing } from "@/styles"; -import { CKEditorField } from "@/field/ckeditor"; +import { CKEditorField } from "@/forms/ckeditor"; export type StaticPageFormValues = StaticPage; diff --git a/src/management/report/fields/form.tsx b/src/management/report/fields/form.tsx index 2b8e826..fdf40b8 100644 --- a/src/management/report/fields/form.tsx +++ b/src/management/report/fields/form.tsx @@ -6,7 +6,7 @@ import { useSpacing } from "@/styles"; import { Field, FieldArray, FieldProps, useFormikContext } from "formik"; import { TextField as TextFieldFormik, Select } from "formik-material-ui"; import { FormControl, InputLabel, Typography, MenuItem, Card, Box, Button, CardContent, CardHeader, IconButton } from "@material-ui/core"; -import { CKEditorField } from "@/field/ckeditor"; +import { CKEditorField } from "@/forms/ckeditor"; import { Multilingual } from "@/data"; import { Actions } from "@/components"; import { Add } from "@material-ui/icons"; diff --git a/src/management/type/form.tsx b/src/management/type/form.tsx index 5b7a04c..98bd6b5 100644 --- a/src/management/type/form.tsx +++ b/src/management/type/form.tsx @@ -5,7 +5,7 @@ import { useSpacing } from "@/styles"; import { Field } from "formik"; import { TextField as TextFieldFormik, Checkbox as CheckboxFormik } from "formik-material-ui"; import { FormControlLabel, FormGroup, Typography } from "@material-ui/core"; -import { CKEditorField } from "@/field/ckeditor"; +import { CKEditorField } from "@/forms/ckeditor"; import { AccountCheck, ShieldCheck } from "mdi-material-ui"; import { identityTransformer, Transformer } from "@/serialization"; import { LabelWithIcon } from "@/management/common/LabelWithIcon";