+++ client/resources/img/new_img/dashboard/btn.png
Binary file is not shown |
+++ client/resources/img/new_img/dashboard/rabbit.png
Binary file is not shown |
--- client/views/pages/main/Dashboard.vue
+++ client/views/pages/main/Dashboard.vue
... | ... | @@ -1,36 +1,22 @@ |
1 | 1 |
<template> |
2 |
- <p |
|
3 |
- class="title1" |
|
4 |
- v-if="state === 'finish'" |
|
5 |
- style="position: absolute; top: 50%; transform: translate(0, -50%)" |
|
6 |
- > |
|
2 |
+ <p class="title1" v-if="state === 'finish'" style="position: absolute; top: 50%; transform: translate(0, -50%)"> |
|
7 | 3 |
오늘 공부를 다했어요! 너무 고생했어요! |
8 | 4 |
</p> |
9 |
- <div |
|
10 |
- class="title1" |
|
11 |
- v-else-if="state === 'notRegistered'" |
|
12 |
- style="position: absolute; top: 50%; transform: translate(0, -50%)" |
|
13 |
- > |
|
14 |
- <div> |
|
15 |
- <h3> |
|
16 |
- 지금은 학습 루트가 등록이 안됐어요! 학습 일정에서 학습루트를 |
|
5 |
+ <div class="title1" v-else-if="state === 'notRegistered'" |
|
6 |
+ style="position: absolute;top: 50%;transform: translate(-50%, -50%);left: 50%;"> |
|
7 |
+ <div class="title-box" style="text-align: center;"> |
|
8 |
+ <img src="../../../resources/img/new_img/dashboard/rabbit.png"> |
|
9 |
+ <h3 class="title" style=" margin-top: 1em; letter-spacing: 2px; line-height: 42px; font-size: 30px"> |
|
10 |
+ 지금은 학습 루트가 등록이 안됐어요! <br> 학습 일정에서 학습루트를 |
|
17 | 11 |
등록해볼까요? |
18 | 12 |
</h3> |
19 |
- <button |
|
20 |
- type="button" |
|
21 |
- title="바로가기" |
|
22 |
- class="yellow-btn" |
|
23 |
- @click="goToPage2('MyPlan2')" |
|
24 |
- > |
|
25 |
- 바로가기 |
|
26 |
- </button> |
|
13 |
+ <div @click="goToPage2('MyPlan2')" style="cursor: pointer; margin-top: 2em;"> |
|
14 |
+ <img src="../../../resources/img/new_img/dashboard/btn.png"> |
|
15 |
+ </div> |
|
27 | 16 |
</div> |
28 | 17 |
</div> |
29 |
- <p |
|
30 |
- class="title1" |
|
31 |
- v-else-if="state === 'noProblem'" |
|
32 |
- style="position: absolute; top: 50%; transform: translate(0, -50%)" |
|
33 |
- > |
|
18 |
+ <p class="title1" v-else-if="state === 'noProblem'" |
|
19 |
+ style="position: absolute; top: 50%; transform: translate(0, -50%)"> |
|
34 | 20 |
교재에 등록된 문제가 없습니다. |
35 | 21 |
</p> |
36 | 22 |
<div v-else class="main"> |
... | ... | @@ -41,95 +27,46 @@ |
41 | 27 |
</div> --> |
42 | 28 |
<div class="race-box"> |
43 | 29 |
<div class="rabbit-start"> |
44 |
- <img |
|
45 |
- src="../../../resources/img/new_img/rabbit.png" |
|
46 |
- alt="" |
|
47 |
- :style="{ display: rabbitPos[0] ? 'block' : 'none' }" |
|
48 |
- /> |
|
30 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
31 |
+ :style="{ display: rabbitPos[0] ? 'block' : 'none' }" /> |
|
49 | 32 |
</div> |
50 | 33 |
<!-- 1번째줄 --> |
51 |
- <div |
|
52 |
- class="rcon flex justify-end mb5" |
|
53 |
- style="position: relative; top: 24px" |
|
54 |
- > |
|
34 |
+ <div class="rcon flex justify-end mb5" style="position: relative; top: 24px"> |
|
55 | 35 |
<!-- 1 --> |
56 | 36 |
<div class="race-btn" @click="[storeLearningId(labeledItems[0])]"> |
57 | 37 |
<div class="rabbit-running"> |
58 |
- <img |
|
59 |
- src="../../../resources/img/new_img/rabbit.png" |
|
60 |
- alt="" |
|
61 |
- :style="{ display: rabbitPos[1] ? 'block' : 'none' }" |
|
62 |
- /> |
|
38 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
39 |
+ :style="{ display: rabbitPos[1] ? 'block' : 'none' }" /> |
|
63 | 40 |
</div> |
64 |
- <button |
|
65 |
- class="popTxt" |
|
66 |
- v-for="(item, index) in items" |
|
67 |
- :key="index" |
|
68 |
- @click="toggleImage(index)" |
|
69 |
- data-num="1" |
|
70 |
- > |
|
41 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="1"> |
|
71 | 42 |
<div class="image-container"> |
72 |
- <img |
|
73 |
- src="../../../resources/img/new_img/board/racebtn_1.png" |
|
74 |
- alt="Race Button" |
|
75 |
- class="base-img" |
|
76 |
- /> |
|
77 |
- <img |
|
78 |
- v-if="rabbitCompl[1]" |
|
79 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
80 |
- alt="Clear Icon" |
|
81 |
- class="clear-img" |
|
82 |
- /> |
|
43 |
+ <img src="../../../resources/img/new_img/board/racebtn_1.png" alt="Race Button" class="base-img" /> |
|
44 |
+ <img v-if="rabbitCompl[1]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
45 |
+ class="clear-img" /> |
|
83 | 46 |
</div> |
84 | 47 |
</button> |
85 | 48 |
<p :class="!rabbitCompl[1] ? 'before-clear' : 'clear'"> |
86 |
- <img |
|
87 |
- v-if="rabbitCompl[1]" |
|
88 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
89 |
- alt="Complete Icon" |
|
90 |
- class="complete-icon" |
|
91 |
- /> |
|
49 |
+ <img v-if="rabbitCompl[1]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
50 |
+ class="complete-icon" /> |
|
92 | 51 |
{{ labeledItems[0].label }} |
93 | 52 |
</p> |
94 | 53 |
</div> |
95 | 54 |
<!-- 2 --> |
96 | 55 |
<div class="race-btn" @click="[storeLearningId(labeledItems[1])]"> |
97 | 56 |
<div class="rabbit-running"> |
98 |
- <img |
|
99 |
- src="../../../resources/img/new_img/rabbit.png" |
|
100 |
- alt="" |
|
101 |
- :style="{ display: rabbitPos[2] ? 'block' : 'none' }" |
|
102 |
- /> |
|
57 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
58 |
+ :style="{ display: rabbitPos[2] ? 'block' : 'none' }" /> |
|
103 | 59 |
</div> |
104 |
- <button |
|
105 |
- class="popTxt" |
|
106 |
- v-for="(item, index) in items" |
|
107 |
- :key="index" |
|
108 |
- @click="toggleImage(index)" |
|
109 |
- data-num="2" |
|
110 |
- > |
|
60 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="2"> |
|
111 | 61 |
<div class="image-container"> |
112 |
- <img |
|
113 |
- src="../../../resources/img/new_img/board/racebtn_2.png" |
|
114 |
- alt="Race Button" |
|
115 |
- class="base-img" |
|
116 |
- /> |
|
117 |
- <img |
|
118 |
- v-if="rabbitCompl[2]" |
|
119 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
120 |
- alt="Clear Icon" |
|
121 |
- class="clear-img" |
|
122 |
- style="position: absolute; left: 16px" |
|
123 |
- /> |
|
62 |
+ <img src="../../../resources/img/new_img/board/racebtn_2.png" alt="Race Button" class="base-img" /> |
|
63 |
+ <img v-if="rabbitCompl[2]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
64 |
+ class="clear-img" style="position: absolute; left: 16px" /> |
|
124 | 65 |
</div> |
125 | 66 |
</button> |
126 | 67 |
<p :class="!rabbitCompl[2] ? 'before-clear' : 'clear'"> |
127 |
- <img |
|
128 |
- v-if="rabbitCompl[2]" |
|
129 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
130 |
- alt="Complete Icon" |
|
131 |
- class="complete-icon" |
|
132 |
- /> |
|
68 |
+ <img v-if="rabbitCompl[2]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
69 |
+ class="complete-icon" /> |
|
133 | 70 |
{{ labeledItems[1].label }} |
134 | 71 |
</p> |
135 | 72 |
</div> |
... | ... | @@ -139,213 +76,96 @@ |
139 | 76 |
<!-- 7 --> |
140 | 77 |
<div class="race-btn" @click="[storeLearningId(labeledItems[6])]"> |
141 | 78 |
<div class="rabbit-running" style="top: -71px"> |
142 |
- <img |
|
143 |
- src="../../../resources/img/new_img/rabbit.png" |
|
144 |
- alt="" |
|
145 |
- :style="{ display: rabbitPos[7] ? 'block' : 'none' }" |
|
146 |
- /> |
|
79 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
80 |
+ :style="{ display: rabbitPos[7] ? 'block' : 'none' }" /> |
|
147 | 81 |
</div> |
148 |
- <button |
|
149 |
- class="popTxt" |
|
150 |
- v-for="(item, index) in items" |
|
151 |
- :key="index" |
|
152 |
- @click="toggleImage(index)" |
|
153 |
- data-num="7" |
|
154 |
- style="top: -53px; position: relative" |
|
155 |
- > |
|
82 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="7" |
|
83 |
+ style="top: -53px; position: relative"> |
|
156 | 84 |
<div class="image-container"> |
157 |
- <img |
|
158 |
- src="../../../resources/img/new_img/board/racebtn_7.png" |
|
159 |
- alt="Race Button" |
|
160 |
- class="base-img" |
|
161 |
- /> |
|
162 |
- <img |
|
163 |
- v-if="rabbitCompl[7]" |
|
164 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
165 |
- alt="Clear Icon" |
|
166 |
- class="clear-img" |
|
167 |
- style="position: absolute; top: 85px" |
|
168 |
- /> |
|
85 |
+ <img src="../../../resources/img/new_img/board/racebtn_7.png" alt="Race Button" class="base-img" /> |
|
86 |
+ <img v-if="rabbitCompl[7]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
87 |
+ class="clear-img" style="position: absolute; top: 85px" /> |
|
169 | 88 |
</div> |
170 | 89 |
</button> |
171 |
- <p |
|
172 |
- :class="!rabbitCompl[7] ? 'before-clear' : 'clear'" |
|
173 |
- style="position: relative; top: -53px; left: -10px" |
|
174 |
- > |
|
175 |
- <img |
|
176 |
- v-if="rabbitCompl[7]" |
|
177 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
178 |
- alt="Complete Icon" |
|
179 |
- class="complete-icon" |
|
180 |
- /> |
|
90 |
+ <p :class="!rabbitCompl[7] ? 'before-clear' : 'clear'" style="position: relative; top: -53px; left: -10px"> |
|
91 |
+ <img v-if="rabbitCompl[7]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
92 |
+ class="complete-icon" /> |
|
181 | 93 |
{{ labeledItems[6].label }} |
182 | 94 |
</p> |
183 | 95 |
</div> |
184 | 96 |
<!-- 6 --> |
185 | 97 |
<div class="race-btn" @click="[storeLearningId(labeledItems[5])]"> |
186 | 98 |
<div class="rabbit-running"> |
187 |
- <img |
|
188 |
- src="../../../resources/img/new_img/rabbit.png" |
|
189 |
- alt="" |
|
190 |
- :style="{ display: rabbitPos[6] ? 'block' : 'none' }" |
|
191 |
- /> |
|
99 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
100 |
+ :style="{ display: rabbitPos[6] ? 'block' : 'none' }" /> |
|
192 | 101 |
</div> |
193 |
- <button |
|
194 |
- class="popTxt" |
|
195 |
- v-for="(item, index) in items" |
|
196 |
- :key="index" |
|
197 |
- @click="toggleImage(index)" |
|
198 |
- data-num="6" |
|
199 |
- > |
|
102 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="6"> |
|
200 | 103 |
<div class="image-container"> |
201 |
- <img |
|
202 |
- src="../../../resources/img/new_img/board/racebtn_6.png" |
|
203 |
- alt="Race Button" |
|
204 |
- class="base-img" |
|
205 |
- /> |
|
206 |
- <img |
|
207 |
- v-if="rabbitCompl[6]" |
|
208 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
209 |
- alt="Clear Icon" |
|
210 |
- class="clear-img" |
|
211 |
- /> |
|
104 |
+ <img src="../../../resources/img/new_img/board/racebtn_6.png" alt="Race Button" class="base-img" /> |
|
105 |
+ <img v-if="rabbitCompl[6]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
106 |
+ class="clear-img" /> |
|
212 | 107 |
</div> |
213 | 108 |
</button> |
214 | 109 |
<p :class="!rabbitCompl[6] ? 'before-clear' : 'clear'"> |
215 |
- <img |
|
216 |
- v-if="rabbitCompl[6]" |
|
217 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
218 |
- alt="Complete Icon" |
|
219 |
- class="complete-icon" |
|
220 |
- /> |
|
110 |
+ <img v-if="rabbitCompl[6]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
111 |
+ class="complete-icon" /> |
|
221 | 112 |
{{ labeledItems[5].label }} |
222 | 113 |
</p> |
223 | 114 |
</div> |
224 | 115 |
<!-- 5 --> |
225 |
- <div |
|
226 |
- class="race-btn" |
|
227 |
- @click="[storeLearningId(labeledItems[4])]" |
|
228 |
- style="position: relative; left: -31px" |
|
229 |
- > |
|
116 |
+ <div class="race-btn" @click="[storeLearningId(labeledItems[4])]" style="position: relative; left: -31px"> |
|
230 | 117 |
<div class="rabbit-running"> |
231 |
- <img |
|
232 |
- src="../../../resources/img/new_img/rabbit.png" |
|
233 |
- alt="" |
|
234 |
- :style="{ display: rabbitPos[5] ? 'block' : 'none' }" |
|
235 |
- /> |
|
118 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
119 |
+ :style="{ display: rabbitPos[5] ? 'block' : 'none' }" /> |
|
236 | 120 |
</div> |
237 |
- <button |
|
238 |
- class="popTxt" |
|
239 |
- v-for="(item, index) in items" |
|
240 |
- :key="index" |
|
241 |
- @click="toggleImage(index)" |
|
242 |
- data-num="5" |
|
243 |
- > |
|
121 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="5"> |
|
244 | 122 |
<div class="image-container"> |
245 |
- <img |
|
246 |
- src="../../../resources/img/new_img/board/racebtn_5.png" |
|
247 |
- alt="Race Button" |
|
248 |
- class="base-img" |
|
249 |
- /> |
|
250 |
- <img |
|
251 |
- v-if="rabbitCompl[5]" |
|
252 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
253 |
- alt="Clear Icon" |
|
254 |
- class="clear-img" |
|
255 |
- /> |
|
123 |
+ <img src="../../../resources/img/new_img/board/racebtn_5.png" alt="Race Button" class="base-img" /> |
|
124 |
+ <img v-if="rabbitCompl[5]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
125 |
+ class="clear-img" /> |
|
256 | 126 |
</div> |
257 | 127 |
</button> |
258 | 128 |
<p :class="!rabbitCompl[5] ? 'before-clear' : 'clear'"> |
259 |
- <img |
|
260 |
- v-if="rabbitCompl[5]" |
|
261 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
262 |
- alt="Complete Icon" |
|
263 |
- class="complete-icon" |
|
264 |
- /> |
|
129 |
+ <img v-if="rabbitCompl[5]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
130 |
+ class="complete-icon" /> |
|
265 | 131 |
{{ labeledItems[4].label }} |
266 | 132 |
</p> |
267 | 133 |
</div> |
268 | 134 |
<!-- 4 --> |
269 | 135 |
<div class="race-btn" @click="[storeLearningId(labeledItems[3])]"> |
270 | 136 |
<div class="rabbit-running"> |
271 |
- <img |
|
272 |
- src="../../../resources/img/new_img/rabbit.png" |
|
273 |
- alt="" |
|
274 |
- :style="{ display: rabbitPos[4] ? 'block' : 'none' }" |
|
275 |
- /> |
|
137 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
138 |
+ :style="{ display: rabbitPos[4] ? 'block' : 'none' }" /> |
|
276 | 139 |
</div> |
277 |
- <button |
|
278 |
- class="popTxt" |
|
279 |
- v-for="(item, index) in items" |
|
280 |
- :key="index" |
|
281 |
- @click="toggleImage(index)" |
|
282 |
- data-num="4" |
|
283 |
- > |
|
140 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="4"> |
|
284 | 141 |
<div class="image-container"> |
285 |
- <img |
|
286 |
- src="../../../resources/img/new_img/board/racebtn_4.png" |
|
287 |
- alt="Race Button" |
|
288 |
- class="base-img" |
|
289 |
- /> |
|
290 |
- <img |
|
291 |
- v-if="rabbitCompl[4]" |
|
292 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
293 |
- alt="Clear Icon" |
|
294 |
- class="clear-img" |
|
295 |
- /> |
|
142 |
+ <img src="../../../resources/img/new_img/board/racebtn_4.png" alt="Race Button" class="base-img" /> |
|
143 |
+ <img v-if="rabbitCompl[4]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
144 |
+ class="clear-img" /> |
|
296 | 145 |
</div> |
297 | 146 |
</button> |
298 | 147 |
<p :class="!rabbitCompl[4] ? 'before-clear' : 'clear'"> |
299 |
- <img |
|
300 |
- v-if="rabbitCompl[4]" |
|
301 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
302 |
- alt="Complete Icon" |
|
303 |
- class="complete-icon" |
|
304 |
- /> |
|
148 |
+ <img v-if="rabbitCompl[4]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
149 |
+ class="complete-icon" /> |
|
305 | 150 |
{{ labeledItems[3].label }} |
306 | 151 |
</p> |
307 | 152 |
</div> |
308 | 153 |
<!-- 3 --> |
309 |
- <div |
|
310 |
- class="race-btn" |
|
311 |
- @click="[storeLearningId(labeledItems[2])]" |
|
312 |
- style="right: 12px" |
|
313 |
- > |
|
154 |
+ <div class="race-btn" @click="[storeLearningId(labeledItems[2])]" style="right: 12px"> |
|
314 | 155 |
<div class="rabbit-running"> |
315 |
- <img |
|
316 |
- src="../../../resources/img/new_img/rabbit.png" |
|
317 |
- alt="" |
|
318 |
- :style="{ display: rabbitPos[3] ? 'block' : 'none' }" |
|
319 |
- /> |
|
156 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
157 |
+ :style="{ display: rabbitPos[3] ? 'block' : 'none' }" /> |
|
320 | 158 |
</div> |
321 |
- <button |
|
322 |
- class="popTxt" |
|
323 |
- v-for="(item, index) in items" |
|
324 |
- :key="index" |
|
325 |
- @click="toggleImage(index)" |
|
326 |
- data-num="3" |
|
327 |
- > |
|
159 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="3"> |
|
328 | 160 |
<div class="image-container"> |
329 |
- <img |
|
330 |
- src="../../../resources/img/new_img/board/racebtn_3.png" |
|
331 |
- alt="Race Button" |
|
332 |
- class="base-img" |
|
333 |
- /> |
|
334 |
- <img |
|
335 |
- v-if="rabbitCompl[3]" |
|
336 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
337 |
- alt="Clear Icon" |
|
338 |
- class="clear-img" |
|
339 |
- /> |
|
161 |
+ <img src="../../../resources/img/new_img/board/racebtn_3.png" alt="Race Button" class="base-img" /> |
|
162 |
+ <img v-if="rabbitCompl[3]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
163 |
+ class="clear-img" /> |
|
340 | 164 |
</div> |
341 | 165 |
</button> |
342 | 166 |
<p :class="!rabbitCompl[3] ? 'before-clear' : 'clear'"> |
343 |
- <img |
|
344 |
- v-if="rabbitCompl[3]" |
|
345 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
346 |
- alt="Complete Icon" |
|
347 |
- class="complete-icon" |
|
348 |
- /> |
|
167 |
+ <img v-if="rabbitCompl[3]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
168 |
+ class="complete-icon" /> |
|
349 | 169 |
{{ labeledItems[2].label }} |
350 | 170 |
</p> |
351 | 171 |
</div> |
... | ... | @@ -355,178 +175,88 @@ |
355 | 175 |
<!-- 8 --> |
356 | 176 |
<div class="race-btn" @click="[storeLearningId(labeledItems[7])]"> |
357 | 177 |
<div class="rabbit-running"> |
358 |
- <img |
|
359 |
- src="../../../resources/img/new_img/rabbit.png" |
|
360 |
- alt="" |
|
361 |
- :style="{ display: rabbitPos[8] ? 'block' : 'none' }" |
|
362 |
- /> |
|
178 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
179 |
+ :style="{ display: rabbitPos[8] ? 'block' : 'none' }" /> |
|
363 | 180 |
</div> |
364 |
- <button |
|
365 |
- class="popTxt" |
|
366 |
- v-for="(item, index) in items" |
|
367 |
- :key="index" |
|
368 |
- @click="toggleImage(index)" |
|
369 |
- data-num="8" |
|
370 |
- > |
|
181 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="8"> |
|
371 | 182 |
<div class="image-container"> |
372 |
- <img |
|
373 |
- src="../../../resources/img/new_img/board/racebtn_8.png" |
|
374 |
- alt="Race Button" |
|
375 |
- class="base-img" |
|
376 |
- /> |
|
377 |
- <img |
|
378 |
- v-if="rabbitCompl[8]" |
|
379 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
380 |
- alt="Clear Icon" |
|
381 |
- class="clear-img" |
|
382 |
- /> |
|
183 |
+ <img src="../../../resources/img/new_img/board/racebtn_8.png" alt="Race Button" class="base-img" /> |
|
184 |
+ <img v-if="rabbitCompl[8]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
185 |
+ class="clear-img" /> |
|
383 | 186 |
</div> |
384 | 187 |
</button> |
385 | 188 |
<p :class="!rabbitCompl[8] ? 'before-clear' : 'clear'"> |
386 |
- <img |
|
387 |
- v-if="rabbitCompl[8]" |
|
388 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
389 |
- alt="Complete Icon" |
|
390 |
- class="complete-icon" |
|
391 |
- /> |
|
189 |
+ <img v-if="rabbitCompl[8]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
190 |
+ class="complete-icon" /> |
|
392 | 191 |
{{ labeledItems[7].label }} |
393 | 192 |
</p> |
394 | 193 |
</div> |
395 | 194 |
<!-- 9 --> |
396 | 195 |
<div class="race-btn" @click="[storeLearningId(labeledItems[8])]"> |
397 | 196 |
<div class="rabbit-running"> |
398 |
- <img |
|
399 |
- src="../../../resources/img/new_img/rabbit.png" |
|
400 |
- alt="" |
|
401 |
- :style="{ display: rabbitPos[9] ? 'block' : 'none' }" |
|
402 |
- /> |
|
197 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
198 |
+ :style="{ display: rabbitPos[9] ? 'block' : 'none' }" /> |
|
403 | 199 |
</div> |
404 |
- <button |
|
405 |
- class="popTxt" |
|
406 |
- v-for="(item, index) in items" |
|
407 |
- :key="index" |
|
408 |
- @click="toggleImage(index)" |
|
409 |
- data-num="9" |
|
410 |
- > |
|
200 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" data-num="9"> |
|
411 | 201 |
<div class="image-container"> |
412 |
- <img |
|
413 |
- src="../../../resources/img/new_img/board/racebtn_9.png" |
|
414 |
- alt="Race Button" |
|
415 |
- class="base-img" |
|
416 |
- /> |
|
417 |
- <img |
|
418 |
- v-if="rabbitCompl[9]" |
|
419 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
420 |
- alt="Clear Icon" |
|
421 |
- class="clear-img" |
|
422 |
- /> |
|
202 |
+ <img src="../../../resources/img/new_img/board/racebtn_9.png" alt="Race Button" class="base-img" /> |
|
203 |
+ <img v-if="rabbitCompl[9]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
204 |
+ class="clear-img" /> |
|
423 | 205 |
</div> |
424 | 206 |
</button> |
425 | 207 |
<p :class="!rabbitCompl[9] ? 'before-clear' : 'clear'"> |
426 |
- <img |
|
427 |
- v-if="rabbitCompl[9]" |
|
428 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
429 |
- alt="Complete Icon" |
|
430 |
- class="complete-icon" |
|
431 |
- /> |
|
208 |
+ <img v-if="rabbitCompl[9]" src="../../../resources/img/new_img/icon/complete_icon.png" alt="Complete Icon" |
|
209 |
+ class="complete-icon" /> |
|
432 | 210 |
{{ labeledItems[8].label }} |
433 | 211 |
</p> |
434 | 212 |
</div> |
435 | 213 |
<!-- 10 --> |
436 | 214 |
<div class="race-btn" @click="[storeLearningId(labeledItems[9])]"> |
437 | 215 |
<div class="rabbit-running"> |
438 |
- <img |
|
439 |
- src="../../../resources/img/new_img/rabbit.png" |
|
440 |
- alt="" |
|
441 |
- :style="{ display: rabbitPos[10] ? 'block' : 'none' }" |
|
442 |
- /> |
|
216 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
217 |
+ :style="{ display: rabbitPos[10] ? 'block' : 'none' }" /> |
|
443 | 218 |
</div> |
444 |
- <button |
|
445 |
- class="popTxt" |
|
446 |
- v-for="(item, index) in items" |
|
447 |
- :key="index" |
|
448 |
- @click="toggleImage(index)" |
|
449 |
- data-num="10" |
|
450 |
- > |
|
219 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" @click="toggleImage(index)" |
|
220 |
+ data-num="10"> |
|
451 | 221 |
<div class="image-container"> |
452 |
- <img |
|
453 |
- src="../../../resources/img/new_img/board/racebtn_10.png" |
|
454 |
- alt="Race Button" |
|
455 |
- class="base-img" |
|
456 |
- /> |
|
457 |
- <img |
|
458 |
- v-if="rabbitCompl[10]" |
|
459 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
460 |
- alt="Clear Icon" |
|
461 |
- class="clear-img" |
|
462 |
- /> |
|
222 |
+ <img src="../../../resources/img/new_img/board/racebtn_10.png" alt="Race Button" class="base-img" /> |
|
223 |
+ <img v-if="rabbitCompl[10]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
224 |
+ class="clear-img" /> |
|
463 | 225 |
</div> |
464 | 226 |
</button> |
465 | 227 |
<p :class="!rabbitCompl[10] ? 'before-clear' : 'clear'"> |
466 |
- <img |
|
467 |
- v-if="rabbitCompl[10]" |
|
468 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
469 |
- alt="Complete Icon" |
|
470 |
- class="complete-icon" |
|
471 |
- /> |
|
228 |
+ <img v-if="rabbitCompl[10]" src="../../../resources/img/new_img/icon/complete_icon.png" |
|
229 |
+ alt="Complete Icon" class="complete-icon" /> |
|
472 | 230 |
{{ labeledItems[9].label }} |
473 | 231 |
</p> |
474 | 232 |
</div> |
475 | 233 |
<!-- 11 --> |
476 | 234 |
<div class="race-btn" @click="[storeLearningId(labeledItems[10])]"> |
477 | 235 |
<div class="rabbit-running"> |
478 |
- <img |
|
479 |
- src="../../../resources/img/new_img/rabbit.png" |
|
480 |
- alt="" |
|
481 |
- :style="{ display: rabbitPos[11] ? 'block' : 'none' }" |
|
482 |
- /> |
|
236 |
+ <img src="../../../resources/img/new_img/rabbit.png" alt="" |
|
237 |
+ :style="{ display: rabbitPos[11] ? 'block' : 'none' }" /> |
|
483 | 238 |
</div> |
484 |
- <button |
|
485 |
- class="popTxt" |
|
486 |
- v-for="(item, index) in items" |
|
487 |
- :key="index" |
|
488 |
- @click="toggleImageAndShowPopup(index, '11')" |
|
489 |
- data-num="11" |
|
490 |
- > |
|
239 |
+ <button class="popTxt" v-for="(item, index) in items" :key="index" |
|
240 |
+ @click="toggleImageAndShowPopup(index, '11')" data-num="11"> |
|
491 | 241 |
<div class="image-container"> |
492 |
- <img |
|
493 |
- src="../../../resources/img/new_img/board/racebtn_11.png" |
|
494 |
- alt="Race Button" |
|
495 |
- class="base-img" |
|
496 |
- /> |
|
497 |
- <img |
|
498 |
- v-if="rabbitCompl[11]" |
|
499 |
- src="../../../resources/img/new_img/icon/clear_img.png" |
|
500 |
- alt="Clear Icon" |
|
501 |
- class="clear-img" |
|
502 |
- /> |
|
242 |
+ <img src="../../../resources/img/new_img/board/racebtn_11.png" alt="Race Button" class="base-img" /> |
|
243 |
+ <img v-if="rabbitCompl[11]" src="../../../resources/img/new_img/icon/clear_img.png" alt="Clear Icon" |
|
244 |
+ class="clear-img" /> |
|
503 | 245 |
</div> |
504 | 246 |
</button> |
505 | 247 |
<p :class="!rabbitCompl[11] ? 'before-clear' : 'clear'"> |
506 |
- <img |
|
507 |
- v-if="rabbitCompl[11]" |
|
508 |
- src="../../../resources/img/new_img/icon/complete_icon.png" |
|
509 |
- alt="Complete Icon" |
|
510 |
- class="complete-icon" |
|
511 |
- /> |
|
248 |
+ <img v-if="rabbitCompl[11]" src="../../../resources/img/new_img/icon/complete_icon.png" |
|
249 |
+ alt="Complete Icon" class="complete-icon" /> |
|
512 | 250 |
{{ labeledItems[10].label }} |
513 | 251 |
</p> |
514 | 252 |
</div> |
515 | 253 |
</div> |
516 | 254 |
<div class="race-btn"> |
517 | 255 |
<div class="rabbit-running" style="display: flex"> |
518 |
- <img |
|
519 |
- class="rabbit-end" |
|
520 |
- src="../../../resources/img/new_img/rabbit.png" |
|
521 |
- alt="" |
|
522 |
- :style="{ display: rabbitEnd ? 'block' : 'none' }" |
|
523 |
- /> |
|
524 |
- <img |
|
525 |
- class="fireworks-end" |
|
526 |
- src="../../../resources/img/fireworks.gif" |
|
527 |
- alt="" |
|
528 |
- :style="{ display: rabbitEnd ? 'block' : 'none' }" |
|
529 |
- /> |
|
256 |
+ <img class="rabbit-end" src="../../../resources/img/new_img/rabbit.png" alt="" |
|
257 |
+ :style="{ display: rabbitEnd ? 'block' : 'none' }" /> |
|
258 |
+ <img class="fireworks-end" src="../../../resources/img/fireworks.gif" alt="" |
|
259 |
+ :style="{ display: rabbitEnd ? 'block' : 'none' }" /> |
|
530 | 260 |
</div> |
531 | 261 |
</div> |
532 | 262 |
</div> |
... | ... | @@ -534,17 +264,9 @@ |
534 | 264 |
<!-- 팝업 --> |
535 | 265 |
<div v-show="searchOpen2" class="popup-wrap"> |
536 | 266 |
<div class="popup-box"> |
537 |
- <button |
|
538 |
- type="button" |
|
539 |
- class="popup-close-btn" |
|
540 |
- style="position: absolute; top: 10px; right: 10px" |
|
541 |
- @click="closeModal" |
|
542 |
- > |
|
543 |
- <svg-icon |
|
544 |
- type="mdi" |
|
545 |
- :path="mdiWindowClose" |
|
546 |
- class="close-btn" |
|
547 |
- ></svg-icon> |
|
267 |
+ <button type="button" class="popup-close-btn" style="position: absolute; top: 10px; right: 10px" |
|
268 |
+ @click="closeModal"> |
|
269 |
+ <svg-icon type="mdi" :path="mdiWindowClose" class="close-btn"></svg-icon> |
|
548 | 270 |
</button> |
549 | 271 |
|
550 | 272 |
<div class="mb30 text-ct"> |
... | ... | @@ -554,12 +276,7 @@ |
554 | 276 |
</p> |
555 | 277 |
</div> |
556 | 278 |
<div class="flex justify-center"> |
557 |
- <button |
|
558 |
- type="button" |
|
559 |
- title="사진촬영" |
|
560 |
- class="new-btn" |
|
561 |
- @click="openCameraModal" |
|
562 |
- > |
|
279 |
+ <button type="button" title="사진촬영" class="new-btn" @click="openCameraModal"> |
|
563 | 280 |
사진 촬영 |
564 | 281 |
</button> |
565 | 282 |
</div> |
... | ... | @@ -571,29 +288,15 @@ |
571 | 288 |
<div class="flex mb10 justify-between"> |
572 | 289 |
<p class="popup-title">사진 촬영</p> |
573 | 290 |
<button type="button" class="popup-close-btn" @click="closeModal"> |
574 |
- <svg-icon |
|
575 |
- type="mdi" |
|
576 |
- :path="mdiWindowClose" |
|
577 |
- class="close-btn" |
|
578 |
- ></svg-icon> |
|
291 |
+ <svg-icon type="mdi" :path="mdiWindowClose" class="close-btn"></svg-icon> |
|
579 | 292 |
</button> |
580 | 293 |
</div> |
581 | 294 |
<div class="box"> |
582 | 295 |
<div style="width: 100%"> |
583 | 296 |
<div id="container" ref="container"> |
584 |
- <video |
|
585 |
- v-if="!photoTaken" |
|
586 |
- autoplay="true" |
|
587 |
- ref="modalVideoElement" |
|
588 |
- class="mirrored" |
|
589 |
- @canplay="onVideoLoaded" |
|
590 |
- style="position: absolute; height: 100%" |
|
591 |
- ></video> |
|
592 |
- <img |
|
593 |
- src="../../../resources/img/camera-rabbit.png" |
|
594 |
- class="camera-rabbit" |
|
595 |
- style="position: absolute" |
|
596 |
- /> |
|
297 |
+ <video v-if="!photoTaken" autoplay="true" ref="modalVideoElement" class="mirrored" |
|
298 |
+ @canplay="onVideoLoaded" style="position: absolute; height: 100%"></video> |
|
299 |
+ <img src="../../../resources/img/camera-rabbit.png" class="camera-rabbit" style="position: absolute" /> |
|
597 | 300 |
<canvas ref="canvas" style="pointer-events: none"></canvas> |
598 | 301 |
</div> |
599 | 302 |
</div> |
... | ... | @@ -606,17 +309,8 @@ |
606 | 309 |
</div> |
607 | 310 |
|
608 | 311 |
<div class="complete-wrap myphoto"> |
609 |
- <button |
|
610 |
- class="login-btn mt10" |
|
611 |
- type="submit" |
|
612 |
- style="width: 100%" |
|
613 |
- @click="finishSchedule" |
|
614 |
- > |
|
615 |
- <img |
|
616 |
- src="../../../resources/img/btn07_s.png" |
|
617 |
- alt="" |
|
618 |
- style="height: 100px" |
|
619 |
- /> |
|
312 |
+ <button class="login-btn mt10" type="submit" style="width: 100%" @click="finishSchedule"> |
|
313 |
+ <img src="../../../resources/img/btn07_s.png" alt="" style="height: 100px" /> |
|
620 | 314 |
<p>학습 종료하기</p> |
621 | 315 |
</button> |
622 | 316 |
<h2 class="mb40 mt10">이 단원을 끝낸 친구들</h2> |
... | ... | @@ -624,19 +318,9 @@ |
624 | 318 |
<article class="flex-column"> |
625 | 319 |
<div class="flex-row"> |
626 | 320 |
<div class="flex" style="gap: 5px; flex-wrap: wrap"> |
627 |
- <div |
|
628 |
- v-for="(image, index) in images" |
|
629 |
- :key="image.fileId" |
|
630 |
- @click="buttonSearch(image)" |
|
631 |
- class="photo" |
|
632 |
- style="margin-bottom: 5px" |
|
633 |
- > |
|
634 |
- <img |
|
635 |
- :src="image.url" |
|
636 |
- :alt="image.fileNm" |
|
637 |
- reloadable="true" |
|
638 |
- style="height: 100%" |
|
639 |
- /> |
|
321 |
+ <div v-for="(image, index) in images" :key="image.fileId" @click="buttonSearch(image)" class="photo" |
|
322 |
+ style="margin-bottom: 5px"> |
|
323 |
+ <img :src="image.url" :alt="image.fileNm" reloadable="true" style="height: 100%" /> |
|
640 | 324 |
</div> |
641 | 325 |
</div> |
642 | 326 |
</div> |
... | ... | @@ -645,51 +329,27 @@ |
645 | 329 |
<div class="popup-box" style="top: 50%"> |
646 | 330 |
<div class="flex mb10 justify-between"> |
647 | 331 |
<button type="button" class="popup-close-btn" @click="closeModal"> |
648 |
- <svg-icon |
|
649 |
- type="mdi" |
|
650 |
- :path="mdiWindowClose" |
|
651 |
- class="close-btn" |
|
652 |
- ></svg-icon> |
|
332 |
+ <svg-icon type="mdi" :path="mdiWindowClose" class="close-btn"></svg-icon> |
|
653 | 333 |
</button> |
654 | 334 |
</div> |
655 | 335 |
<div class="box"> |
656 | 336 |
<div style="width: 910px; height: 680px"> |
657 |
- <img |
|
658 |
- :src="selectedImage.image" |
|
659 |
- alt="Image" |
|
660 |
- @error="onImageError" |
|
661 |
- reloadable="true" |
|
662 |
- /> |
|
337 |
+ <img :src="selectedImage.image" alt="Image" @error="onImageError" reloadable="true" /> |
|
663 | 338 |
</div> |
664 | 339 |
</div> |
665 | 340 |
<div class="flex justify-between mt20"> |
666 | 341 |
<div class="text flex"> |
667 | 342 |
<p class="title2 date ml30">{{ selectedImage.date }}</p> |
668 |
- <span class="title1 ml30" |
|
669 |
- >{{ selectedImage.unit }}을 마친 |
|
670 |
- <em class="yellow">{{ selectedImage.name }}</em |
|
671 |
- >친구</span |
|
672 |
- > |
|
343 |
+ <span class="title1 ml30">{{ selectedImage.unit }}을 마친 |
|
344 |
+ <em class="yellow">{{ selectedImage.name }}</em>친구</span> |
|
673 | 345 |
</div> |
674 | 346 |
<div class="title2 flex align-center" style="gap: 10px"> |
675 |
- <svg-icon |
|
676 |
- v-if="!isHeartFilled" |
|
677 |
- type="mdi" |
|
678 |
- :path="mdiHeartOutline" |
|
679 |
- @click=" |
|
680 |
- toggleHeart(selectedImage.heart, selectedImage.fileMngId) |
|
681 |
- " |
|
682 |
- style="color: #ffba08; cursor: pointer" |
|
683 |
- ></svg-icon> |
|
684 |
- <svg-icon |
|
685 |
- v-if="isHeartFilled" |
|
686 |
- type="mdi" |
|
687 |
- :path="mdiHeart" |
|
688 |
- @click=" |
|
689 |
- toggleHeart(selectedImage.heart, selectedImage.fileMngId) |
|
690 |
- " |
|
691 |
- style="color: #ffba08; cursor: pointer" |
|
692 |
- ></svg-icon> |
|
347 |
+ <svg-icon v-if="!isHeartFilled" type="mdi" :path="mdiHeartOutline" @click=" |
|
348 |
+ toggleHeart(selectedImage.heart, selectedImage.fileMngId) |
|
349 |
+ " style="color: #ffba08; cursor: pointer"></svg-icon> |
|
350 |
+ <svg-icon v-if="isHeartFilled" type="mdi" :path="mdiHeart" @click=" |
|
351 |
+ toggleHeart(selectedImage.heart, selectedImage.fileMngId) |
|
352 |
+ " style="color: #ffba08; cursor: pointer"></svg-icon> |
|
693 | 353 |
<p> |
694 | 354 |
<em class="yellow">{{ selectedImage.heart }}</em> |
695 | 355 |
</p> |
... | ... | @@ -1427,6 +1087,7 @@ |
1427 | 1087 |
.complete-wrap img { |
1428 | 1088 |
width: auto; |
1429 | 1089 |
} |
1090 |
+ |
|
1430 | 1091 |
.body { |
1431 | 1092 |
width: 1435px; |
1432 | 1093 |
height: auto; |
... | ... | @@ -1569,6 +1230,7 @@ |
1569 | 1230 |
display: flex; |
1570 | 1231 |
align-items: center; |
1571 | 1232 |
} |
1233 |
+ |
|
1572 | 1234 |
.lcon .race-btn .rabbit-running { |
1573 | 1235 |
transform: scaleX(1); |
1574 | 1236 |
} |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?