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

Merged in feature/2021-06-18 (pull request #104)

Browse Source 
Update documents transformations + crisp.
This commit is contained in:
Patrick Fic
2021-06-11 15:10:19 +00:00
parent 0615e46d8a 75606559c6
commit 21a1791e7a
4 changed files with 21 additions and 43905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43887
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
client/src/App/App.container.jsx
View File

@@ -26,14 +26,6 @@ export default function AppContainer() {
s.async = 1; s.async = 1;
d.getElementsByTagName("head")[0].appendChild(s); d.getElementsByTagName("head")[0].appendChild(s);
//Release Notes
// var rs = d.createElement("script");
// rs.src = "https://sdk.noticeable.io/s.js";
// //rs.async = 1;
// d.getElementsByTagName("head")[0].appendChild(rs);
// // window.noticeable.render("widget", "IABVNO4scRKY11XBQkNr");
return () => { return () => {
d.getElementsByTagName("head")[0].removeChild(s); d.getElementsByTagName("head")[0].removeChild(s);
}; };

15
client/src/components/jobs-documents-gallery/job-documents.utility.js
View File

@@ -9,9 +9,18 @@ export const GenerateSrcUrl = (value) => {
)}/upload/${value.key}${extension ? `.${extension}` : ""}`; )}/upload/${value.key}${extension ? `.${extension}` : ""}`;
}; };
export const GenerateThumbUrl = (value) => export const GenerateThumbUrl = (value) => {
`${process.env.REACT_APP_CLOUDINARY_ENDPOINT}/${DetermineFileType( let extension = value.extension;
if (extension && extension.toLowerCase().includes("heic")) extension = "jpg";
else if (
DetermineFileType(value.type) !== "image" ||
(value.type && value.type.includes("application"))
)
extension = "jpg";
return `${process.env.REACT_APP_CLOUDINARY_ENDPOINT}/${DetermineFileType(
value.type value.type
)}/upload/${process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS}/${ )}/upload/${process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS}/${
value.key value.key
}`; }${extension ? `.${extension}` : ""}`;
};

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

@@ -230,17 +230,10 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
try { try {
const userEmail = yield select((state) => state.user.currentUser.email); const userEmail = yield select((state) => state.user.currentUser.email);
window.$crisp.push(["set", "user:company", [payload.shopname]]);
const authRecord = payload.associations.filter( const authRecord = payload.associations.filter(
(a) => a.useremail === userEmail (a) => a.useremail === userEmail
); );
if (authRecord[0] && authRecord[0].user.validemail) {
console.log("$crisp user email", authRecord[0].user.email);
window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
}
yield put(setAuthlevel(authRecord[0] ? authRecord[0].authlevel : 0)); yield put(setAuthlevel(authRecord[0] ? authRecord[0].authlevel : 0));
yield put( yield put(
updateUserDetailsSuccess( updateUserDetailsSuccess(
@@ -249,6 +242,15 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
: { validemail: false } : { validemail: false }
) )
); );
try {
window.$crisp.push(["set", "user:company", [payload.shopname]]);
if (authRecord[0] && authRecord[0].user.validemail) {
console.log("$crisp user email", authRecord[0].user.email);
window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
}
} catch (error) {
console.error("Couldnt find $crisp.");
}
} catch (error) { } catch (error) {
yield put(signInFailure(error.message)); yield put(signInFailure(error.message));
} }