From d5158648bccc33a2a31b3c971b21621251ae6198 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 8 Oct 2020 18:37:14 +0300 Subject: [PATCH] Rename to MarkdownEditorWIdget & use for event content --- ...ignupEmailContentWidget.tsx => MarkdownEditorWidget.tsx} | 6 +++--- src/pages/admin/EventCreatePage.tsx | 6 ++++-- src/pages/admin/SignupCreatePage.tsx | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) rename src/components/{SignupEmailContentWidget.tsx => MarkdownEditorWidget.tsx} (78%) diff --git a/src/components/SignupEmailContentWidget.tsx b/src/components/MarkdownEditorWidget.tsx similarity index 78% rename from src/components/SignupEmailContentWidget.tsx rename to src/components/MarkdownEditorWidget.tsx index e2ba364..a40e8ac 100644 --- a/src/components/SignupEmailContentWidget.tsx +++ b/src/components/MarkdownEditorWidget.tsx @@ -5,7 +5,7 @@ import "react-mde/lib/styles/css/react-mde-all.css"; import ReactMarkdown from "react-markdown"; import { WidgetProps } from "react-jsonschema-form"; -type SignupEmailContentWidgetProps = Omit & { +type MarkdownEditorWidgetProps = Omit & { options: any; }; @@ -18,7 +18,7 @@ const Container = styled.div` } `; -const SignupEmailContentWidget: React.FC = ({ value, onChange }) => { +const MarkdownEditorWidget: React.FC = ({ value, onChange }) => { const [selectedTab, setSelectedTab] = React.useState<"write" | "preview">("write"); return ( @@ -35,4 +35,4 @@ const SignupEmailContentWidget: React.FC = ({ val ) } -export default SignupEmailContentWidget; +export default MarkdownEditorWidget; diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx index e05d1ba..be0eda0 100644 --- a/src/pages/admin/EventCreatePage.tsx +++ b/src/pages/admin/EventCreatePage.tsx @@ -7,10 +7,12 @@ import { SignupForm, getForms } from "@models/SignupForm"; import { createEvent, getEvent, updateEvent, Event } from "@models/Event"; import DatetimeWidget from "@components/DatetimeWidget"; import SectionDividerWidget from "@components/SectionDividerWidget"; +import MarkdownEditorWidget from "@components/MarkdownEditorWidget"; const widgets = { datetime: DatetimeWidget, section_divider: SectionDividerWidget, + markdownEditor: MarkdownEditorWidget }; export interface EventCreatePageProps { @@ -262,10 +264,10 @@ class EventCreatePage extends React.Component { const uiSchema = { content_fi: { - "ui:widget": "textarea", + "ui:widget": "markdownEditor", }, content_en: { - "ui:widget": "textarea", + "ui:widget": "markdownEditor", }, start_time: { "ui:widget": "datetime", diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx index effa3a8..f81df6d 100644 --- a/src/pages/admin/SignupCreatePage.tsx +++ b/src/pages/admin/SignupCreatePage.tsx @@ -6,13 +6,13 @@ import Form from "react-jsonschema-form"; import { createForm, getForm, updateForm, SignupForm } from "@models/SignupForm"; import DatetimeWidget from "@components/DatetimeWidget"; import SignupQuestionsWidget from "@components/SignupQuestionsWidget"; -import SignupEmailContentWidget from "@components/SignupEmailContentWidget"; +import MarkdownEditorWidget from "@components/MarkdownEditorWidget"; import { buildValidationSchema } from "@views/SignUpPage/FormUtils"; const widgets = { datetime: DatetimeWidget, signup: SignupQuestionsWidget, - markdownEditor: SignupEmailContentWidget + markdownEditor: MarkdownEditorWidget }; const DEFAULT_EMAIL = `Moikka,