Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2021-1-capstone-design1
/
MAC_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
이정민
2021-05-26 01:35:41 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
454744977d82ce33ba5bead40bf986a934764ce6
45474497
1 parent
223c0116
ui 수정
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
7 deletions
src/components/GifEditor.tsx
src/components/ToastEditor/index.tsx
src/gif-generator/src/index.js
src/components/GifEditor.tsx
View file @
4547449
...
...
@@ -74,8 +74,7 @@ const GifEditor = ({ previewURL }) => {
const res = await postGif(formData);
setIsUploadLoading(false);
// https://gif-generator.bu.to
setViewLink(`http://localhost:3000/${res.id}`);
setViewLink(`https://gif-generator.bu.to/${res.id}`);
};
return (
...
...
@@ -84,7 +83,9 @@ const GifEditor = ({ previewURL }) => {
{((isMakeStarted && !download) || isUploadLoading) && (
<>
<div className="background" />
<div className="download">loading... {percent}%</div>
<div className="download">
loading... {!isUploadLoading && percent}%
</div>
</>
)}
{!isUploadLoading && viewLink && (
...
...
@@ -132,7 +133,7 @@ const Wrapper = styled.div`
.make {
font: 800 11.5px Arial;
position: absolute;
righ
t: 0;
lef
t: 0;
top: 0;
width: 120px;
height: 40px;
...
...
@@ -145,6 +146,9 @@ const Wrapper = styled.div`
align-items: center;
justify-content: center;
cursor: pointer;
:hover {
text-decoration: underline;
}
}
.background {
position: fixed;
...
...
@@ -169,6 +173,9 @@ const Wrapper = styled.div`
:last-child {
margin-left: 1rem;
}
:hover {
text-decoration: underline;
}
}
}
.tui-image-editor-container {
...
...
@@ -184,6 +191,9 @@ const Wrapper = styled.div`
.tui-image-editor-header-buttons {
display: none;
}
.tui-image-editor-help-menu {
display: none;
}
`;
export default GifEditor;
...
...
src/components/ToastEditor/index.tsx
View file @
4547449
...
...
@@ -2,6 +2,7 @@
import ImageEditor from "@toast-ui/react-image-editor";
import { useState } from "react";
import styled from "styled-components";
import { media } from "styles/theme";
import "tui-image-editor/dist/tui-image-editor.css";
const ToastEditor = ({ setPreviewURL, setIsImgAdded, setIsEditorOpened }) => {
...
...
@@ -69,11 +70,10 @@ const Container = styled.div`
.move {
font: 800 11.5px Arial;
position: absolute;
right: 0;
top: 0;
left: 7.8rem;
width: 120px;
height: 40px;
background: red;
z-index: 10;
border-radius: 20px;
margin: 8px;
...
...
@@ -82,6 +82,12 @@ const Container = styled.div`
align-items: center;
justify-content: center;
cursor: pointer;
:hover {
text-decoration: underline;
}
${media.tablet} {
left: 12.3rem;
}
}
.alert {
position: fixed;
...
...
@@ -99,6 +105,12 @@ const Container = styled.div`
.tui-image-editor-header-logo {
display: none;
}
.tui-image-editor-help-menu {
display: none;
}
.tui-image-editor-header-buttons {
position: absolute;
}
`;
export default ToastEditor;
...
...
src/gif-generator/src/index.js
View file @
4547449
import
GIF
from
"@dhdbstjr98/gif.js"
;
import
{
fabric
}
from
"fabric"
;
import
Component
from
"./components"
;
export
class
GifGenerator
{
...
...
Please
register
or
login
to post a comment