Merge pull request #48 from ananjaemin/46-url-개편

feat: url 변경(미완성
tempfiles-team · Nov 10, 2022 · 1f2839e · 1f2839e
2 parents 57f4308 + 64afb14
commit 1f2839e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/pages/download/index.tsx b/src/pages/download/index.tsx
@@ -31,7 +31,7 @@ export const DownloadPage: React.FC = () => {
       </FileBox>
       <S.DownloadPageButtonSection>
         <a
-          href={`${process.env.REACT_APP_BACKEND_BASEURL}/dl/${downloadFileProps.filename}${
+          href={`${downloadFileProps.download_url}${
             downloadFileProps.token != null ? `?${downloadFileProps.token}` : ''
           }`}
         >

diff --git a/src/pages/main/index.tsx b/src/pages/main/index.tsx
@@ -16,12 +16,11 @@ export const MainPage: React.FC = () => {
   const [typingCount, setTypingCount] = useState(0);
   const [uploading, setUploading] = useState(true);
   const [progressValue, serProgressValue] = useState(0);
-  // eslint-disable-next-line
+
   const [retentionPeriod, setRetentionPeriod] = useState(false);
-  // eslint-disable-next-line
   const [downloadCount, setDownloadCount] = useState(false);
-  // eslint-disable-next-line
   const [passwordBoolean, setPasswordBoolean] = useState(false);
+
   const [password, setPassword] = useState('');
   const [fileProps, setFileProps] = useState({
     filename: '',
@@ -75,6 +74,7 @@ export const MainPage: React.FC = () => {
               size: getFileSize(res.data.size),
               lastModified: res.data.lastModified,
               token: res.data.token,
+              download_url: res.data.download_url,
               //추후에 기한,다운로드횟수 추가예정
             });
           } else {

diff --git a/src/state/reducers/DeleteFileProps.ts b/src/state/reducers/DeleteFileProps.ts
@@ -1,7 +1,10 @@
 import { ActionType } from '../action-types';
 import { Action } from '../actions';
 
-const reducer = (state: any = { filename: null, token: null }, action: Action): any => {
+const reducer = (
+  state: any = { filename: null, token: null, delete_url: null },
+  action: Action,
+): any => {
   switch (action.type) {
     case ActionType.DeleteFileProps:
       return action.props;

diff --git a/src/state/reducers/DownloadFileProps.ts b/src/state/reducers/DownloadFileProps.ts
@@ -2,7 +2,7 @@ import { ActionType } from '../action-types';
 import { Action } from '../actions';
 
 const reducer = (
-  state: any = { filename: null, size: null, lastModified: null, token: null },
+  state: any = { filename: null, size: null, lastModified: null, token: null, donwload_url: null },
   action: Action,
 ): any => {
   switch (action.type) {