Merge pull request #85 from boostcamp-2020/dev

[COMMON] 5주차 데모버전 배포
boostcamp-2020 · Dec 18, 2020 · d1c21b0 · d1c21b0
2 parents 4c50056 + 33ff22a
commit d1c21b0
Show file tree

Hide file tree

Showing 54 changed files with 1,947 additions and 298 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -50,12 +50,15 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
+    "@ffmpeg/core": "^0.8.5",
+    "@ffmpeg/ffmpeg": "^0.9.6",
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
     "@types/react-redux": "^7.1.11",
     "axios": "^0.21.0",
     "clean-webpack-plugin": "^3.0.0",
     "gl-matrix": "^3.3.0",
     "html-webpack-plugin": "^4.5.0",
+    "mediainfo.js": "^0.1.4",
     "mp4-h264": "^1.0.4",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

diff --git a/client/src/components/atoms/Button/Button.tsx b/client/src/components/atoms/Button/Button.tsx
@@ -2,8 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import color from '@/theme/colors';
-import style from './style';
-import { ButtonType } from '.';
+import style, { ButtonType } from './style';
 
 interface StyledProps {
   buttonType: ButtonType;
@@ -35,13 +34,29 @@ interface Props {
   children?: React.ReactChild;
   message: string;
   onClick?: () => void;
+  onMouseEnter?: () => void;
+  onMouseLeave?: () => void;
   type: ButtonType;
   disabled: boolean;
 }
 
 const Button: React.FC<Props> = React.memo(
-  ({ children, message, onClick, type, disabled }) => (
-    <StyledButton buttonType={type} onClick={onClick} disabled={disabled}>
+  ({
+    children,
+    message,
+    onClick,
+    onMouseEnter,
+    onMouseLeave,
+    type,
+    disabled,
+  }) => (
+    <StyledButton
+      buttonType={type}
+      onClick={onClick}
+      onMouseEnter={onMouseEnter}
+      onMouseLeave={onMouseLeave}
+      disabled={disabled}
+    >
       {children}
       {children && <br />}
       {message}

diff --git a/client/src/components/atoms/Button/index.ts b/client/src/components/atoms/Button/index.ts
@@ -1,3 +1 @@
 export { default } from './Button';
-
-export type ButtonType = 'default' | 'transparent' | 'selected';
diff --git a/client/src/components/atoms/Button/style.ts b/client/src/components/atoms/Button/style.ts
@@ -1,6 +1,6 @@
 import color from '@/theme/colors';
 
-import { ButtonType } from '.';
+export type ButtonType = 'default' | 'transparent' | 'selected';
 
 export default (type: ButtonType) => {
   switch (type) {
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		export { default } from './Button';

		export type ButtonType = 'default' \| 'transparent' \| 'selected';