Showing
3 changed files
with
28 additions
and
7 deletions
| ... | @@ -74,8 +74,7 @@ const GifEditor = ({ previewURL }) => { | ... | @@ -74,8 +74,7 @@ const GifEditor = ({ previewURL }) => { |
| 74 | const res = await postGif(formData); | 74 | const res = await postGif(formData); |
| 75 | 75 | ||
| 76 | setIsUploadLoading(false); | 76 | setIsUploadLoading(false); |
| 77 | - // https://gif-generator.bu.to | 77 | + setViewLink(`https://gif-generator.bu.to/${res.id}`); |
| 78 | - setViewLink(`http://localhost:3000/${res.id}`); | ||
| 79 | }; | 78 | }; |
| 80 | 79 | ||
| 81 | return ( | 80 | return ( |
| ... | @@ -84,7 +83,9 @@ const GifEditor = ({ previewURL }) => { | ... | @@ -84,7 +83,9 @@ const GifEditor = ({ previewURL }) => { |
| 84 | {((isMakeStarted && !download) || isUploadLoading) && ( | 83 | {((isMakeStarted && !download) || isUploadLoading) && ( |
| 85 | <> | 84 | <> |
| 86 | <div className="background" /> | 85 | <div className="background" /> |
| 87 | - <div className="download">loading... {percent}%</div> | 86 | + <div className="download"> |
| 87 | + loading... {!isUploadLoading && percent}% | ||
| 88 | + </div> | ||
| 88 | </> | 89 | </> |
| 89 | )} | 90 | )} |
| 90 | {!isUploadLoading && viewLink && ( | 91 | {!isUploadLoading && viewLink && ( |
| ... | @@ -132,7 +133,7 @@ const Wrapper = styled.div` | ... | @@ -132,7 +133,7 @@ const Wrapper = styled.div` |
| 132 | .make { | 133 | .make { |
| 133 | font: 800 11.5px Arial; | 134 | font: 800 11.5px Arial; |
| 134 | position: absolute; | 135 | position: absolute; |
| 135 | - right: 0; | 136 | + left: 0; |
| 136 | top: 0; | 137 | top: 0; |
| 137 | width: 120px; | 138 | width: 120px; |
| 138 | height: 40px; | 139 | height: 40px; |
| ... | @@ -145,6 +146,9 @@ const Wrapper = styled.div` | ... | @@ -145,6 +146,9 @@ const Wrapper = styled.div` |
| 145 | align-items: center; | 146 | align-items: center; |
| 146 | justify-content: center; | 147 | justify-content: center; |
| 147 | cursor: pointer; | 148 | cursor: pointer; |
| 149 | + :hover { | ||
| 150 | + text-decoration: underline; | ||
| 151 | + } | ||
| 148 | } | 152 | } |
| 149 | .background { | 153 | .background { |
| 150 | position: fixed; | 154 | position: fixed; |
| ... | @@ -169,6 +173,9 @@ const Wrapper = styled.div` | ... | @@ -169,6 +173,9 @@ const Wrapper = styled.div` |
| 169 | :last-child { | 173 | :last-child { |
| 170 | margin-left: 1rem; | 174 | margin-left: 1rem; |
| 171 | } | 175 | } |
| 176 | + :hover { | ||
| 177 | + text-decoration: underline; | ||
| 178 | + } | ||
| 172 | } | 179 | } |
| 173 | } | 180 | } |
| 174 | .tui-image-editor-container { | 181 | .tui-image-editor-container { |
| ... | @@ -184,6 +191,9 @@ const Wrapper = styled.div` | ... | @@ -184,6 +191,9 @@ const Wrapper = styled.div` |
| 184 | .tui-image-editor-header-buttons { | 191 | .tui-image-editor-header-buttons { |
| 185 | display: none; | 192 | display: none; |
| 186 | } | 193 | } |
| 194 | + .tui-image-editor-help-menu { | ||
| 195 | + display: none; | ||
| 196 | + } | ||
| 187 | `; | 197 | `; |
| 188 | 198 | ||
| 189 | export default GifEditor; | 199 | export default GifEditor; | ... | ... |
| ... | @@ -2,6 +2,7 @@ | ... | @@ -2,6 +2,7 @@ |
| 2 | import ImageEditor from "@toast-ui/react-image-editor"; | 2 | import ImageEditor from "@toast-ui/react-image-editor"; |
| 3 | import { useState } from "react"; | 3 | import { useState } from "react"; |
| 4 | import styled from "styled-components"; | 4 | import styled from "styled-components"; |
| 5 | +import { media } from "styles/theme"; | ||
| 5 | import "tui-image-editor/dist/tui-image-editor.css"; | 6 | import "tui-image-editor/dist/tui-image-editor.css"; |
| 6 | 7 | ||
| 7 | const ToastEditor = ({ setPreviewURL, setIsImgAdded, setIsEditorOpened }) => { | 8 | const ToastEditor = ({ setPreviewURL, setIsImgAdded, setIsEditorOpened }) => { |
| ... | @@ -69,11 +70,10 @@ const Container = styled.div` | ... | @@ -69,11 +70,10 @@ const Container = styled.div` |
| 69 | .move { | 70 | .move { |
| 70 | font: 800 11.5px Arial; | 71 | font: 800 11.5px Arial; |
| 71 | position: absolute; | 72 | position: absolute; |
| 72 | - right: 0; | ||
| 73 | top: 0; | 73 | top: 0; |
| 74 | + left: 7.8rem; | ||
| 74 | width: 120px; | 75 | width: 120px; |
| 75 | height: 40px; | 76 | height: 40px; |
| 76 | - background: red; | ||
| 77 | z-index: 10; | 77 | z-index: 10; |
| 78 | border-radius: 20px; | 78 | border-radius: 20px; |
| 79 | margin: 8px; | 79 | margin: 8px; |
| ... | @@ -82,6 +82,12 @@ const Container = styled.div` | ... | @@ -82,6 +82,12 @@ const Container = styled.div` |
| 82 | align-items: center; | 82 | align-items: center; |
| 83 | justify-content: center; | 83 | justify-content: center; |
| 84 | cursor: pointer; | 84 | cursor: pointer; |
| 85 | + :hover { | ||
| 86 | + text-decoration: underline; | ||
| 87 | + } | ||
| 88 | + ${media.tablet} { | ||
| 89 | + left: 12.3rem; | ||
| 90 | + } | ||
| 85 | } | 91 | } |
| 86 | .alert { | 92 | .alert { |
| 87 | position: fixed; | 93 | position: fixed; |
| ... | @@ -99,6 +105,12 @@ const Container = styled.div` | ... | @@ -99,6 +105,12 @@ const Container = styled.div` |
| 99 | .tui-image-editor-header-logo { | 105 | .tui-image-editor-header-logo { |
| 100 | display: none; | 106 | display: none; |
| 101 | } | 107 | } |
| 108 | + .tui-image-editor-help-menu { | ||
| 109 | + display: none; | ||
| 110 | + } | ||
| 111 | + .tui-image-editor-header-buttons { | ||
| 112 | + position: absolute; | ||
| 113 | + } | ||
| 102 | `; | 114 | `; |
| 103 | 115 | ||
| 104 | export default ToastEditor; | 116 | export default ToastEditor; | ... | ... |
-
Please register or login to post a comment