From ac2d91d320b69856c55dabd62787a6d0f3185209 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 18 Jan 2024 04:56:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5,=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BE=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development.local | 2 ++ .env.production.local | 2 ++ .gitignore | 2 -- src/App.tsx | 6 +++--- src/api/auth.ts | 5 +---- src/api/contactForm.ts | 7 ++----- src/api/question.ts | 5 +---- src/api/quiz.ts | 10 ++-------- src/api/quizRelase.ts | 7 ++----- src/pages/Landing/FooterLanding.tsx | 10 +++++++++- src/pages/Tariffs/Tariffs.tsx | 18 +++++++++--------- src/pages/ViewPublicationPage/ContactForm.tsx | 4 ++-- src/pages/createQuize/QuizCard.tsx | 2 +- src/stores/questions/actions.ts | 2 +- src/stores/quizes.ts | 2 +- src/stores/quizes/actions.ts | 2 +- 16 files changed, 39 insertions(+), 47 deletions(-) create mode 100644 .env.development.local create mode 100644 .env.production.local diff --git a/.env.development.local b/.env.development.local new file mode 100644 index 00000000..992c76e4 --- /dev/null +++ b/.env.development.local @@ -0,0 +1,2 @@ +REACT_APP_DOMAIN="https://squiz.pena.digital" +REACT_APP_HUB_DOMAIN="https://shub.pena.digital" \ No newline at end of file diff --git a/.env.production.local b/.env.production.local new file mode 100644 index 00000000..992c76e4 --- /dev/null +++ b/.env.production.local @@ -0,0 +1,2 @@ +REACT_APP_DOMAIN="https://squiz.pena.digital" +REACT_APP_HUB_DOMAIN="https://shub.pena.digital" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3a1bea68..d034022c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,9 +14,7 @@ # misc .DS_Store .env.local -.env.development.local .env.test.local -.env.production.local npm-debug.log* yarn-debug.log* diff --git a/src/App.tsx b/src/App.tsx index 9e4e57ef..f092e854 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -124,7 +124,7 @@ export default function App() { const navigate = useNavigate(); useUserFetcher({ - url: `https://squiz.pena.digital/user/${userId}`, + url: process.env.REACT_APP_DOMAIN + `/user/${userId}`, userId, onNewUser: setUser, onError: (error) => { @@ -138,7 +138,7 @@ export default function App() { }); useUserAccountFetcher({ - url: "https://squiz.pena.digital/customer/account", + url: process.env.REACT_APP_DOMAIN + "/customer/account", userId, onNewUserAccount: setCustomerAccount, onError: (error) => { @@ -153,7 +153,7 @@ export default function App() { }); useUserAccountFetcher({ - url: "https://squiz.pena.digital/squiz/account/get", + url: process.env.REACT_APP_DOMAIN + "/squiz/account/get", userId, onNewUserAccount: setUserAccount, onError: (error) => { diff --git a/src/api/auth.ts b/src/api/auth.ts index 092897f9..7c729a66 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -8,10 +8,7 @@ import type { } from "@frontend/kitui"; import { parseAxiosError } from "../utils/parse-error"; -const apiUrl = - process.env.NODE_ENV === "production" - ? "/auth" - : "https://squiz.pena.digital/auth"; +const apiUrl =process.env.REACT_APP_DOMAIN + "/auth"; export async function register( login: string, diff --git a/src/api/contactForm.ts b/src/api/contactForm.ts index f46bff5d..f64be0c2 100644 --- a/src/api/contactForm.ts +++ b/src/api/contactForm.ts @@ -1,15 +1,12 @@ import axios from "axios"; -const domen = - window.location.hostname === "localhost" - ? "squiz.pena.digital" - : window.location.hostname; +const domen = process.env.REACT_APP_HUB_DOMAIN export function sendContactFormRequest(body: { contact: string; whoami: string; }) { - return axios(`https://${domen}/feedback/callme`, { + return axios(`${domen}/feedback/callme`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/api/question.ts b/src/api/question.ts index 2b5ebd28..797976f6 100644 --- a/src/api/question.ts +++ b/src/api/question.ts @@ -19,10 +19,7 @@ import { } from "@model/question/copy"; import { replaceSpacesToEmptyLines } from "../utils/replaceSpacesToEmptyLines"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/squiz" - : "https://squiz.pena.digital/squiz"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/squiz"; function createQuestion(body: CreateQuestionRequest) { return makeRequest({ diff --git a/src/api/quiz.ts b/src/api/quiz.ts index b41c8857..0e3ec210 100644 --- a/src/api/quiz.ts +++ b/src/api/quiz.ts @@ -8,14 +8,8 @@ import { GetQuizRequest, GetQuizResponse } from "model/quiz/get"; import { GetQuizListRequest, GetQuizListResponse } from "model/quiz/getList"; import { RawQuiz } from "model/quiz/quiz"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/squiz" - : "https://squiz.pena.digital/squiz"; -const imagesUrl = - process.env.NODE_ENV === "production" - ? "/squizstorer" - : "https://squiz.pena.digital/squizstorer"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/squiz"; +const imagesUrl = process.env.REACT_APP_DOMAIN + "/squizstorer"; function createQuiz(body?: Partial) { return makeRequest({ diff --git a/src/api/quizRelase.ts b/src/api/quizRelase.ts index 7c32de5b..a960f2d5 100644 --- a/src/api/quizRelase.ts +++ b/src/api/quizRelase.ts @@ -18,10 +18,7 @@ import { CopyQuestionResponse, } from "@model/question/copy"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/squiz" - : "https://squiz.pena.digital"; +const baseUrl = process.env.REACT_APP_DOMAIN ; function get(quizId: string) { return makeRequest({ @@ -33,7 +30,7 @@ function get(quizId: string) { function quizRelase(quizId: string, status: "start" | "stop") { return makeRequest({ - url: `https://squiz.pena.digital/answer/quiz/get`, + url: process.env.REACT_APP_DOMAIN + `/answer/quiz/get`, body: { quiz_id: quizId, limit: 100, diff --git a/src/pages/Landing/FooterLanding.tsx b/src/pages/Landing/FooterLanding.tsx index 52ad84f7..b94d8fd9 100644 --- a/src/pages/Landing/FooterLanding.tsx +++ b/src/pages/Landing/FooterLanding.tsx @@ -122,11 +122,19 @@ export default function Component() { + diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index 0dd3e571..bb92d7a1 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -57,7 +57,7 @@ function TariffPage() { GetTariffsResponse >({ method: "GET", - url: "https://squiz.pena.digital/strator/tariff?page=1&limit=100", + url: process.env.REACT_APP_DOMAIN + "/strator/tariff?page=1&limit=100", }); tariffsList.push(...tariffs); @@ -65,7 +65,7 @@ function TariffPage() { for (let page = 2; page <= totalPages; page += 1) { const tariffsResult = await makeRequest({ method: "GET", - url: `https://squiz.pena.digital/strator/tariff?page=${page}&limit=100`, + url: process.env.REACT_APP_DOMAIN + `/strator/tariff?page=${page}&limit=100`, }); console.log(page); @@ -80,12 +80,12 @@ function TariffPage() { const get = async () => { const user = await makeRequest({ method: "GET", - url: "https://squiz.pena.digital/customer/account", + url: process.env.REACT_APP_DOMAIN + "/customer/account", }); const tariffsList = await getTariffsList(); const discounts = await makeRequest({ method: "GET", - url: "https://squiz.pena.digital/price/discounts", + url: process.env.REACT_APP_DOMAIN + "/price/discounts", }); setUser(user); console.log("это то что мы получили в самом конце", tariffsList); @@ -109,14 +109,14 @@ function TariffPage() { //Добавляем желаемый тариф в корзину await makeRequest({ method: "PATCH", - url: `https://hub.pena.digital/customer/cart?id=${id}`, + url: process.env.REACT_APP_HUB_DOMAIN + `/customer/cart?id=${id}`, }); //Если нам хватает денежек - покупаем тариф if (price <= user.wallet.cash) { try { const data = await makeRequest({ method: "POST", - url: "https://squiz.pena.digital/customer/cart/pay", + url: process.env.REACT_APP_DOMAIN + "/customer/cart/pay", }); setCash(currencyFormatter.format(Number(data.wallet.cash) / 100)); enqueueSnackbar("Тариф успешно приобретён"); @@ -130,7 +130,7 @@ function TariffPage() { // history.pushState({}, null, "https://hub.pena.digital/wallet?action=squizpay"); var link = document.createElement("a"); - link.href = `https://hub.pena.digital/payment?action=squizpay&dif=${ + link.href = process.env.REACT_APP_HUB_DOMAIN + `/payment?action=squizpay&dif=${ (price - Number(user.wallet.cash)) * 100 }`; document.body.appendChild(link); @@ -300,7 +300,7 @@ export const inCart = () => { try { await makeRequest({ method: "PATCH", - url: `https://hub.pena.digital/customer/cart?id=${id}`, + url: process.env.REACT_APP_HUB_DOMAIN + `/customer/cart?id=${id}`, }); let index = saveCart.indexOf("green"); @@ -322,7 +322,7 @@ const outCart = (cart: string[]) => { try { await makeRequest({ method: "DELETE", - url: `https://squiz.pena.digital/customer/cart?id=${id}`, + url: process.env.REACT_APP_DOMAIN + `/customer/cart?id=${id}`, }); let saveCart = JSON.parse(localStorage.getItem("saveCart") || "[]"); saveCart = saveCart.push(id); diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index c82333f4..458bd62f 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -222,13 +222,13 @@ export const ContactForm = ({ /> С  - + {" "} Положением об обработке персональных данных{" "}  и  {" "} diff --git a/src/pages/createQuize/QuizCard.tsx b/src/pages/createQuize/QuizCard.tsx index 73fe1776..4bb02088 100755 --- a/src/pages/createQuize/QuizCard.tsx +++ b/src/pages/createQuize/QuizCard.tsx @@ -50,7 +50,7 @@ export default function QuizCard({ try { await makeRequest({ method: "POST", - url: "https://squiz.pena.digital/customer/cart/pay", + url: process.env.REACT_APP_DOMAIN + "/customer/cart/pay", }); inCart(); } catch (e) { diff --git a/src/stores/questions/actions.ts b/src/stores/questions/actions.ts index e2cb3978..123a4c27 100644 --- a/src/stores/questions/actions.ts +++ b/src/stores/questions/actions.ts @@ -413,7 +413,7 @@ export const uploadQuestionImage = async ( } const imageId = values[0]; - const imageUrl = `https://squiz.pena.digital/squizimages/${quizQid}/${imageId}`; + const imageUrl = process.env.REACT_APP_DOMAIN + `/squizimages/${quizQid}/${imageId}`; updateQuestion(questionId, (question) => { updateFn(question, imageUrl); diff --git a/src/stores/quizes.ts b/src/stores/quizes.ts index e3b847c4..4f9103ba 100644 --- a/src/stores/quizes.ts +++ b/src/stores/quizes.ts @@ -129,7 +129,7 @@ export const quizStore = create()( config: { noStartPage: false, type: "", // quiz или form - logo: "hub.pena.digital/img/logo", + logo: process.env.REACT_APP_HUB_DOMAIN + "/img/logo", startpage: { description: "", // приветственный текст опроса button: "", // текст на кнопке начала опроса diff --git a/src/stores/quizes/actions.ts b/src/stores/quizes/actions.ts index 11b61033..fdf1e185 100644 --- a/src/stores/quizes/actions.ts +++ b/src/stores/quizes/actions.ts @@ -269,7 +269,7 @@ export const uploadQuizImage = async ( updateQuiz(quizId, (quiz) => { updateFn( quiz, - `https://squiz.pena.digital/squizimages/${quiz.qid}/${imageId}`, + process.env.REACT_APP_DOMAIN + `/squizimages/${quiz.qid}/${imageId}`, ); }); } catch (error) {