Skip to content

Commit 10a7eb0

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main'
2 parents 0e505ff + 6db5bd3 commit 10a7eb0

File tree

10 files changed

+137
-53
lines changed

10 files changed

+137
-53
lines changed

src/assets/imgs/icon/btn_pause.svg

Lines changed: 8 additions & 0 deletions
Loading

src/assets/imgs/icon/btn_stop.svg

Lines changed: 5 additions & 0 deletions
Loading

src/assets/imgs/icon/live_off.svg

Lines changed: 5 additions & 0 deletions
Loading

src/assets/imgs/icon/live_on.svg

Lines changed: 5 additions & 0 deletions
Loading

src/assets/imgs/icon/mic.svg

Lines changed: 3 additions & 3 deletions
Loading

src/assets/imgs/icon/mic_gray.svg

Lines changed: 8 additions & 0 deletions
Loading

src/views/main/style/side-bar.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
+background('@/assets/imgs/icon/project.svg', no-repeat, center)
7171

7272
.record::before
73-
+background('@/assets/imgs/icon/mic.svg', no-repeat, center)
73+
+background('@/assets/imgs/icon/mic_gray.svg', no-repeat, center)
7474

7575
.summary::before
7676
+background('@/assets/imgs/icon/note.svg', no-repeat, center)

src/views/meeting/components/MindMapComponent.tsx

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import { ReactFlow } from '@xyflow/react';
22

3+
// style
4+
import '@xyflow/react/dist/style.css';
5+
import "@/views/meeting/style/mind-map.sass";
6+
37
// component
48
import UseSpeechToText from "@/views/meeting/components/UseSpeechToText";
59

6-
import '@xyflow/react/dist/style.css';
7-
import "@/views/meeting/style/mind-map.sass";
10+
// import
11+
// import { useState, useEffect } from "react";
12+
813

914
const MindMapComponent = () => {
1015
const {
@@ -17,6 +22,8 @@ const MindMapComponent = () => {
1722
audioUrl,
1823
} = UseSpeechToText();
1924

25+
// const [mode, setMode] = useState<string>("none");
26+
2027
const initialNodes = [
2128
{ id: '1', position: { x: 0, y: 0 }, data: { label: '2' } },
2229
{ id: '2', position: { x: 0, y: 100 }, data: { label: '2' } },
@@ -28,32 +35,43 @@ const MindMapComponent = () => {
2835

2936
return (
3037
<div className="mind-map-container">
31-
<div className='mind-map-wrap'>
32-
<ReactFlow nodes={initialNodes} edges={initialEdges} />
33-
<ReactFlow nodes={initialNodes} edges={initialEdges} />
34-
</div>
35-
<div className="middle-bar">
36-
<div className="record-length-wrap">
37-
<div className="box-wrap">
38-
<div className='red box'></div>
39-
{Array.from({ length: 9 }).map(() => (
40-
<div className='box'></div>
41-
))}
42-
</div>
43-
<div className="box-time">
44-
13:28
38+
{
39+
!isRecording ? (
40+
<div className='start-wrap'>
41+
<p>녹음을 시작하고 자동으로 생성되는<br/>마인드맵을 확인해보세요.</p>
42+
<button className='btn-mic' onClick={toggleListening}>녹음 시작하기</button>
4543
</div>
46-
<div>
47-
{isRecording && !isPaused && (
48-
<button onClick={pauseRecording}>⏸️</button>
49-
)}
50-
{isRecording && isPaused && (
51-
<button onClick={resumeRecording}>▶️ 재개</button>
52-
)}
53-
<button onClick={toggleListening}>{isRecording ? "정지" : "시작"}</button>
44+
) : (
45+
<div className="mind-map-main">
46+
<div className='mind-map-wrap'>
47+
<ReactFlow nodes={initialNodes} edges={initialEdges} />
48+
<ReactFlow nodes={initialNodes} edges={initialEdges} />
49+
</div>
50+
<div className="middle-bar">
51+
<div className="record-length-wrap">
52+
<div className="box-wrap">
53+
<div className='red box'></div>
54+
{Array.from({ length: 9 }).map(() => (
55+
<div className='box'></div>
56+
))}
57+
</div>
58+
<div className="box-time">
59+
13:28
60+
</div>
61+
<div className="box-menu">
62+
{isRecording && !isPaused && (
63+
<button className='btn-pause' onClick={pauseRecording}>일시정지</button>
64+
)}
65+
{isRecording && isPaused && (
66+
<button className='btn-resume' onClick={resumeRecording}>▶️ 재개</button>
67+
)}
68+
<button className='btn-record' onClick={toggleListening}>{isRecording ? "정지" : "시작"}</button>
69+
</div>
70+
</div>
71+
</div>
5472
</div>
55-
</div>
56-
</div>
73+
)
74+
}
5775
</div>
5876
);
5977
}

src/views/meeting/style/meeting.sass

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@
1313

1414
.sidebar-closed
1515
+size(calc(100vw - 56px), calc(100vh - 60px))
16-
+padding(60px 0 0 56px)
16+
+padding(60px 0 0 56px)
17+
18+
.project-content
19+
height: 100%

src/views/meeting/style/mind-map.sass

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,67 @@
55

66

77
.mind-map-container
8+
background-color: $gray-50
89
position: relative
10+
+size(100%, 100%)
911

10-
.mind-map-wrap
11-
+size(100vw, 100vh)
12-
13-
.middle-bar
14-
+size(435px, 64px)
15-
+flex-box(center, center)
12+
.start-wrap
13+
+flex-box(center, center, 28px)
14+
flex-direction: column
1615
position: absolute
17-
bottom: 117px
18-
border-radius: 16px
19-
background-color: $gray-50
16+
top: 50%
2017
left: 50%
2118
transform: translate(-50%, -50%)
19+
p
20+
font-size: 16px
21+
font-weight: 500
22+
color: $gray-600
23+
line-height: 24px
24+
text-align: center
25+
26+
.btn-mic
27+
+flex-box(center, center, 8px)
28+
+btn(160px, 48px, 50px)
29+
background-color: $page-color
30+
color: $white
31+
font-weight: 700
32+
font-size: 16px
33+
34+
35+
&:before
36+
+size(20px, 20px)
37+
content : url('@/assets/imgs/icon/mic.svg')
38+
39+
40+
.mind-map-main
41+
.mind-map-wrap
42+
+size(100vw, 100vh)
43+
44+
.middle-bar
45+
+size(435px, 64px)
46+
+flex-box(center, center)
47+
position: absolute
48+
bottom: 117px
49+
border-radius: 16px
50+
background-color: $gray-100
51+
left: 50%
52+
transform: translate(-50%, -50%)
2253

23-
.record-length-wrap
24-
+flex-box(center, center, 10px)
54+
.record-length-wrap
55+
+flex-box(center, center, 10px)
2556

26-
.box-wrap
27-
+flex-box(center, center, 4.86px)
57+
.box-wrap
58+
+flex-box(center, center, 4.86px)
2859

29-
.box
30-
+size(5.5px, 13px)
31-
background-color: $gray-300
60+
.box
61+
+size(5.5px, 13px)
62+
background-color: $gray-300
3263

33-
.red
34-
background-color: #F05B56
64+
.red
65+
background-color: #F05B56
3566

36-
.box-time
37-
color: #505457
38-
font-weight: 500
39-
line-height: 21px
67+
.box-time
68+
color: #505457
69+
font-weight: 500
70+
line-height: 21px
71+

0 commit comments

Comments
 (0)