From 580dbb88e6dfefbe55ab77b564f6b524331c1302 Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Mon, 16 Aug 2021 20:06:17 +1000 Subject: [PATCH] Some clean up --- .../src/components/CaptureButton/CaptureButton.tsx | 13 ++++++------- app/web/src/helpers/hooks/useUpdateProjectImages.ts | 5 +++++ app/web/src/helpers/hooks/useUpdateSocialCard.ts | 4 ---- app/web/src/pages/IdeProjectPage/IdeProjectPage.tsx | 2 +- app/web/src/pages/ProjectPage/ProjectPage.tsx | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 app/web/src/helpers/hooks/useUpdateSocialCard.ts diff --git a/app/web/src/components/CaptureButton/CaptureButton.tsx b/app/web/src/components/CaptureButton/CaptureButton.tsx index c855cd9..f61ed4d 100644 --- a/app/web/src/components/CaptureButton/CaptureButton.tsx +++ b/app/web/src/components/CaptureButton/CaptureButton.tsx @@ -59,35 +59,34 @@ const CaptureButton = ({ setCaptureState(config) async function uploadAndUpdateImage() { - const derp = async () => { + const upload = async () => { const socialCard64 = toJpeg(ref.current, { cacheBust: true, quality: 0.7, }) - const promise1 = updateProjectImages({ + // uploading in two separate mutations because of the 100kb limit of the lambda functions + const imageUploadPromise1 = updateProjectImages({ variables: { id: project?.id, - // socialCard64, mainImage64: await config.image64, }, }) - const promise2 = updateProjectImages({ + const imageUploadPromise2 = updateProjectImages({ variables: { id: project?.id, socialCard64: await socialCard64, }, }) - return Promise.all([promise2, promise1]) + return Promise.all([imageUploadPromise2, imageUploadPromise1]) } - const promise = derp() + const promise = upload() toast.promise(promise, { loading: 'Saving Image/s', success: Image/s saved!, error: Problem saving., }) const [{ data }] = await promise - console.log(data?.updateProjectImages) return data?.updateProjectImages?.mainImage } diff --git a/app/web/src/helpers/hooks/useUpdateProjectImages.ts b/app/web/src/helpers/hooks/useUpdateProjectImages.ts index 70feb59..beea4c6 100644 --- a/app/web/src/helpers/hooks/useUpdateProjectImages.ts +++ b/app/web/src/helpers/hooks/useUpdateProjectImages.ts @@ -29,3 +29,8 @@ export const useUpdateProjectImages = ({ onCompleted = () => {} }) => { return { updateProjectImages, loading, error } } + +export const makeSocialPublicId = ( + userName: string, + projectTitle: string +): string => `u-${userName}-slash-p-${projectTitle}` diff --git a/app/web/src/helpers/hooks/useUpdateSocialCard.ts b/app/web/src/helpers/hooks/useUpdateSocialCard.ts deleted file mode 100644 index 8352e2d..0000000 --- a/app/web/src/helpers/hooks/useUpdateSocialCard.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const makeSocialPublicId = ( - userName: string, - projectTitle: string -): string => `u-${userName}-slash-p-${projectTitle}` diff --git a/app/web/src/pages/IdeProjectPage/IdeProjectPage.tsx b/app/web/src/pages/IdeProjectPage/IdeProjectPage.tsx index aad72f3..1795f57 100644 --- a/app/web/src/pages/IdeProjectPage/IdeProjectPage.tsx +++ b/app/web/src/pages/IdeProjectPage/IdeProjectPage.tsx @@ -1,6 +1,6 @@ import IdeProjectCell from 'src/components/IdeProjectCell' import Seo from 'src/components/Seo/Seo' -import { makeSocialPublicId } from 'src/helpers/hooks/useUpdateSocialCard' +import { makeSocialPublicId } from 'src/helpers/hooks/useUpdateProjectImages' const IdeProjectPage = ({ userName, projectTitle }) => { const socialImageUrl = `http://res.cloudinary.com/irevdev/image/upload/c_scale,w_1200/v1/CadHub/${makeSocialPublicId( diff --git a/app/web/src/pages/ProjectPage/ProjectPage.tsx b/app/web/src/pages/ProjectPage/ProjectPage.tsx index 81309db..4bd6c23 100644 --- a/app/web/src/pages/ProjectPage/ProjectPage.tsx +++ b/app/web/src/pages/ProjectPage/ProjectPage.tsx @@ -5,7 +5,7 @@ import Seo from 'src/components/Seo/Seo' import { useIdeState } from 'src/helpers/hooks/useIdeState' import { IdeContext } from 'src/helpers/hooks/useIdeContext' import { Toaster } from '@redwoodjs/web/toast' -import { makeSocialPublicId } from 'src/helpers/hooks/useUpdateSocialCard' +import { makeSocialPublicId } from 'src/helpers/hooks/useUpdateProjectImages' const ProjectPage = ({ userName, projectTitle }) => { const { currentUser } = useAuth()