Skip to content

Commit

Permalink
Merge pull request #260 from ODOICHON/fix/#259
Browse files Browse the repository at this point in the history
Fix/#259 CloudFront CDN ์„œ๋ฒ„์—์„œ ๊ฐ€์ ธ์˜ค๋Š” ์ด๋ฏธ์ง€๋ฅผ S3์—์„œ ์ง์ ‘ ๊ฐ€์ ธ์˜ค๋„๋ก ์ˆ˜์ •ํ•ฉ๋‹ˆ๋‹ค.
  • Loading branch information
JunJongHun committed May 6, 2024
2 parents 910bde6 + 7a94974 commit f5ea422
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 5 additions & 3 deletions src/components/Introduce/Quill/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ import useModalState from '@/hooks/useModalState';
import useQuillModules from '@/hooks/useQuillModules';
import useToastMessageType from '@/hooks/useToastMessageType';
import { checkBeforePost } from '@/utils/utils';
import { DEFAULT_OPTIONS } from '@/constants/image';
// import { DEFAULT_OPTIONS } from '@/constants/image';
import styles from './styles.module.scss';

// TODO: ์ด๋ฏธ์ง€ 10๊ฐœ ์ด์ƒ ๋“ฑ๋ก ๋ถˆ๊ฐ€

const { VITE_S3_DOMAIN, VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
// const { VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
const { VITE_S3_DOMAIN } = import.meta.env;

export default function IntroduceQuill() {
const navigate = useNavigate();
Expand Down Expand Up @@ -82,7 +83,8 @@ export default function IntroduceQuill() {
const res = await uploadFile(file);
const url = res || '';
const imageName = url.split(VITE_S3_DOMAIN)[1];
const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
// const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
const imageUrl = VITE_S3_DOMAIN + imageName;
setThumbnail(imageUrl);
} catch (error) {
const err = error as AxiosError;
Expand Down
8 changes: 5 additions & 3 deletions src/pages/Trade/Write/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ import {
import { uploadFile } from '@/apis/uploadS3';
import userStore from '@/store/userStore';
import { getRentalPriceType } from '@/utils/utils';
import { DEFAULT_OPTIONS } from '@/constants/image';
// import { DEFAULT_OPTIONS } from '@/constants/image';
import { specialCategory, tradeCategory } from '@/constants/trade';
import { opacityVariants } from '@/constants/variants';
import styles from './styles.module.scss';

const { VITE_S3_DOMAIN, VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
// const { VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
const { VITE_S3_DOMAIN } = import.meta.env;

export default function TradeWritePage() {
const { user } = userStore();
Expand Down Expand Up @@ -77,7 +78,8 @@ export default function TradeWritePage() {
const res = await uploadFile(file);
const url = res || '';
const imageName = url.split(VITE_S3_DOMAIN)[1];
const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
// const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
const imageUrl = VITE_S3_DOMAIN + imageName;
setThumbnail(imageUrl);
} catch (error) {
const err = error as AxiosError;
Expand Down
8 changes: 5 additions & 3 deletions src/utils/Quill/imageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import ReactQuill from 'react-quill';
import { AxiosError } from 'axios';
import { uploadFile } from '@/apis/uploadS3';
import { ApiResponseType } from '@/types/apiResponseType';
import { DEFAULT_OPTIONS } from '@/constants/image';
// import { DEFAULT_OPTIONS } from '@/constants/image';

const { VITE_S3_DOMAIN, VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
// const { VITE_CLOUD_FRONT_DOMAIN } = import.meta.env;
const { VITE_S3_DOMAIN } = import.meta.env;

const imageHandler = (
QuillRef: React.MutableRefObject<ReactQuill | undefined>,
Expand All @@ -22,7 +23,8 @@ const imageHandler = (
const res = await uploadFile(file);
const url = res || '';
const imageName = url.split(VITE_S3_DOMAIN)[1];
const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
// const imageUrl = VITE_CLOUD_FRONT_DOMAIN + imageName + DEFAULT_OPTIONS;
const imageUrl = VITE_S3_DOMAIN + imageName;

const range = QuillRef.current?.getEditor().getSelection()?.index;
if (range !== null && range !== undefined) {
Expand Down

0 comments on commit f5ea422

Please sign in to comment.