admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed template blockers for the time being IO-424

Browse Source
This commit is contained in:
Patrick Fic
2020-12-01 16:38:27 -08:00
parent dd69a73079
commit 73ec04705a
7 changed files with 490 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
client/src/components/shop-template-editor-save-button/shop-template-editor-save-button.component.jsx
View File

@@ -4,7 +4,7 @@ import { useMutation } from "@apollo/react-hooks";
import { useTranslation } from "react-i18next";
import { UPDATE_TEMPLATE } from "../../graphql/templates.queries";
import { logImEXEvent } from "../../firebase/firebase.utils";
import inlineCss from "inline-css";
//import inlineCss from "inline-css";
export default function ShopTemplateSaveButton({
templateId,
@@ -16,41 +16,42 @@ export default function ShopTemplateSaveButton({
const [updateTemplate] = useMutation(UPDATE_TEMPLATE);
const handleSave = async () => {
logImEXEvent("shop_template_update");
setLoading(true);
emailEditorRef.current.exportHtml(async (data) => {
inlineCss(data.html, {
url: `${window.location.protocol}://${window.location.host}/`,
}).then(async function (inlineHtml) {
const result = await updateTemplate({
variables: {
templateId: templateId,
template: {
query: gql,
html: inlineHtml,
jsontemplate: data.design,
},
},
});
if (!!!result.errors) {
notification["success"]({
message: t("templates.successes.updated"),
});
} else {
notification["error"]({
message: t("templates.errors.updating", {
error: JSON.stringify(result.errors),
}),
});
}
setLoading(false);
});
});
alert("Outstanding issue IO-424");
// logImEXEvent("shop_template_update");
// setLoading(true);
// emailEditorRef.current.exportHtml(async (data) => {
// inlineCss(data.html, {
// url: `${window.location.protocol}://${window.location.host}/`,
// }).then(async function (inlineHtml) {
// const result = await updateTemplate({
// variables: {
// templateId: templateId,
// template: {
// query: gql,
// html: inlineHtml,
// jsontemplate: data.design,
// },
// },
// });
// if (!!!result.errors) {
// notification["success"]({
// message: t("templates.successes.updated"),
// });
// } else {
// notification["error"]({
// message: t("templates.errors.updating", {
// error: JSON.stringify(result.errors),
// }),
// });
// }
// setLoading(false);
// });
// });
};
return (
<Button disabled={!!!templateId} loading={loading} onClick={handleSave}>
{t("general.actions.save")}
{t("general.actions.save")} <span>IO-424</span>
</Button>
);
}

48
client/src/components/shop-template-test-render/shop-template-test-render.component.jsx
View File

@@ -1,7 +1,7 @@
import { Button } from "antd";
import axios from "axios";
import gql from "graphql-tag";
import inlineCss from "inline-css";
//import inlineCss from "inline-css";
import { JsonEditor as Editor } from "jsoneditor-react";
import "jsoneditor-react/es/editor.min.css";
import React, { useState } from "react";
@@ -32,31 +32,31 @@ export function ShopTemplateTestRender({
const handleTestRender = async () => {
try {
setLoading(true);
alert("IO-424 Blocks this.")
// emailEditorRef.current.exportHtml(async (data) => {
// inlineCss(data.html, {
// url: `${window.location.protocol}://${window.location.host}/`,
// }).then(async function (inlineHtml) {
// try {
// const { data: contextData } = await client.query({
// query: gql(query),
// variables: variables,
// fetchPolicy: "network-only",
// });
emailEditorRef.current.exportHtml(async (data) => {
inlineCss(data.html, {
url: `${window.location.protocol}://${window.location.host}/`,
}).then(async function (inlineHtml) {
try {
const { data: contextData } = await client.query({
query: gql(query),
variables: variables,
fetchPolicy: "network-only",
});
// const { data } = await axios.post("/render", {
// view: inlineHtml,
// context: { ...contextData, bodyshop: bodyshop },
// });
// displayTemplateInWindowNoprint(data);
const { data } = await axios.post("/render", {
view: inlineHtml,
context: { ...contextData, bodyshop: bodyshop },
});
displayTemplateInWindowNoprint(data);
setLoading(false);
} catch (error) {
setLoading(false);
alert(error);
}
});
});
// setLoading(false);
// } catch (error) {
// setLoading(false);
// alert(error);
// }
// });
// });
} catch (error) {
setLoading(false);
alert(error);

2
client/src/redux/user/user.sagas.js
View File

@@ -1,4 +1,4 @@
import Fingerprint2 from "fingerprintjs2";
import Fingerprint2 from "@fingerprintjs/fingerprintjs";
import LogRocket from "logrocket";
import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
import {