diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index 8a1f2dea..e6ccf759 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -222,7 +222,7 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh alignItems: "center", gap: "10px", marginRight: "auto", - color: theme.palette.grey1.main, + // color: theme.palette.grey1.main, }} > {/* Шаг diff --git a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx index 3b129a02..ea2ffccd 100644 --- a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx +++ b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx @@ -112,7 +112,7 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { {quiz.config.info.orgname} - + {quiz.config.info.site} @@ -184,19 +184,19 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { {quiz.config.info.clickable ? ( isMobileDevice ? ( - + {quiz.config.info.phonenumber} ) : ( - + {quiz.config.info.phonenumber} ) ) : ( - + {quiz.config.info.phonenumber} )} diff --git a/src/pages/ViewPublicationPage/index.tsx b/src/pages/ViewPublicationPage/index.tsx index a84851a3..f780e1c4 100644 --- a/src/pages/ViewPublicationPage/index.tsx +++ b/src/pages/ViewPublicationPage/index.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { Box } from "@mui/material"; +import {Box, Button, ThemeProvider} from "@mui/material"; import { StartPageViewPublication } from "./StartPageViewPublication"; import { Question } from "./Question"; @@ -18,6 +18,9 @@ import { useQuestionsStore } from "@root/questions/store"; import { setQuestions } from "@root/questions/actions"; import { questionApi } from "@api/question"; import { ApologyPage } from "./ApologyPage" +import {themesPublication} from "../../utils/themes/themePublication"; + +type themePublic = "StandardTheme" | "PinkTheme" export const ViewPage = () => { const quiz = useCurrentQuiz(); @@ -55,15 +58,24 @@ export const ViewPage = () => { console.log(questions) + const [themeState, setThemeState] = useState("StandardTheme"); + if (visualStartPage === undefined) return <>; if (questions.length === 0 || (questions.length === 1 && questions[0].type === "result")) return return ( - - {!visualStartPage ? ( - - ) : ( - - )} - + + + {!visualStartPage ? ( + + ) : ( + + )} + + + + + + + ); }; diff --git a/src/pages/ViewPublicationPage/questions/Emoji.tsx b/src/pages/ViewPublicationPage/questions/Emoji.tsx index 42b69f6e..8642e3e6 100644 --- a/src/pages/ViewPublicationPage/questions/Emoji.tsx +++ b/src/pages/ViewPublicationPage/questions/Emoji.tsx @@ -55,7 +55,8 @@ export const Emoji = ({ currentQuestion }: EmojiProps) => { key={variant.id} sx={{ borderRadius: "12px", - border: `1px solid ${theme.palette.grey2.main}`, + // border: `1px solid ${theme.palette.grey2.main}`, + border: `1px solid #9A9AAF`, overflow: "hidden", maxWidth: "317px", width: "100%", diff --git a/src/pages/ViewPublicationPage/questions/File.tsx b/src/pages/ViewPublicationPage/questions/File.tsx index e107e9ac..12ebd62f 100644 --- a/src/pages/ViewPublicationPage/questions/File.tsx +++ b/src/pages/ViewPublicationPage/questions/File.tsx @@ -72,7 +72,7 @@ export const File = ({ currentQuestion }: FileProps) => { { alignItems: "center", padding: "33px 44px 33px 55px", backgroundColor: theme.palette.background.default, - border: `1px solid ${theme.palette.grey2.main}`, + border: `1px solid #9A9AAF`, + // border: `1px solid ${theme.palette.grey2.main}`, borderRadius: "8px", }} > @@ -123,7 +124,8 @@ export const File = ({ currentQuestion }: FileProps) => { @@ -134,7 +136,8 @@ export const File = ({ currentQuestion }: FileProps) => { { sx={{ cursor: "pointer", borderRadius: "5px", - border: `1px solid ${theme.palette.grey2.main}`, + border: `1px solid #9A9AAF`, + // border: `1px solid ${theme.palette.grey2.main}`, }} onClick={(event) => { event.preventDefault(); @@ -98,7 +99,8 @@ export const Images = ({ currentQuestion }: ImagesProps) => { sx={{ display: "block", textAlign: "center", - color: theme.palette.grey2.main, + color: "#9A9AAF", + // color: theme.palette.grey2.main, marginTop: "10px", }} value={index} diff --git a/src/pages/ViewPublicationPage/questions/Rating.tsx b/src/pages/ViewPublicationPage/questions/Rating.tsx index 14860935..55330e93 100644 --- a/src/pages/ViewPublicationPage/questions/Rating.tsx +++ b/src/pages/ViewPublicationPage/questions/Rating.tsx @@ -74,7 +74,10 @@ export const Rating = ({ currentQuestion }: RatingProps) => { marginTop: "20px", }} > - + {currentQuestion.content.ratingNegativeDescription} { } sx={{ height: "50px", gap: "15px" }} max={currentQuestion.content.steps} - icon={form?.icon(theme.palette.brightPurple.main)} - emptyIcon={form?.icon(theme.palette.grey2.main)} + icon={form?.icon(theme.palette.primary.main)} + emptyIcon={form?.icon("#9A9AAF")} /> - + {currentQuestion.content.ratingPositiveDescription} diff --git a/src/pages/ViewPublicationPage/questions/Variant.tsx b/src/pages/ViewPublicationPage/questions/Variant.tsx index 1b5276e4..8e0806d7 100644 --- a/src/pages/ViewPublicationPage/questions/Variant.tsx +++ b/src/pages/ViewPublicationPage/questions/Variant.tsx @@ -134,7 +134,7 @@ const VariantItem = ({ margin: "0", borderRadius: "12px", padding: "15px", - border: `1px solid ${theme.palette.grey2.main}`, + border: `1px solid #9A9AAF`, display: "flex", maxWidth: "685px", justifyContent: "space-between", diff --git a/src/pages/ViewPublicationPage/questions/Varimg.tsx b/src/pages/ViewPublicationPage/questions/Varimg.tsx index 5e07766b..5f2d0185 100644 --- a/src/pages/ViewPublicationPage/questions/Varimg.tsx +++ b/src/pages/ViewPublicationPage/questions/Varimg.tsx @@ -57,7 +57,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { borderRadius: "5px", padding: "15px", color: "#4D4D4D", - border: `1px solid ${theme.palette.grey2.main}`, + border: `1px solid #9A9AAF`, display: "flex", }} value={index} diff --git a/src/utils/themes/themePublication.ts b/src/utils/themes/themePublication.ts new file mode 100644 index 00000000..731d9acb --- /dev/null +++ b/src/utils/themes/themePublication.ts @@ -0,0 +1,47 @@ +import { createTheme } from "@mui/material"; +import theme from "./generic"; + + +const StandardTheme = createTheme({ + // ...theme, + palette: { + primary: { + main: "#7E2AEA", + }, + secondary: { + main: "#252734" + }, + text: { + primary: "#333647", + secondary: "#7E2AEA", + }, + + background: { + default: "#FFFFFF", + }, + } +}) + +const PinkTheme = createTheme({ + // ...theme, + palette: { + primary: { + main: "#D34085", + }, + secondary: { + main: "#252734" + }, + text: { + primary: "#333647", + secondary: "#D34085", + }, + + background: { + default: "#FFF9FC", + }, + } +}) +export const themesPublication = { + StandardTheme, + PinkTheme, +} \ No newline at end of file