Skip to content

Commit e97da35

Browse files
authored
Merge pull request YJU-OKURA#163 from Regulus0811/refactor/live-class
不要なビデオタグを削除し、その他のレイアウトを調整
2 parents c14434b + 3cf8078 commit e97da35

File tree

3 files changed

+3
-60
lines changed

3 files changed

+3
-60
lines changed

src/app/classes/[cId]/[mId]/components/Material.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const Material = () => {
8888
}, [numPages]);
8989

9090
return (
91-
<div className="relative min-h-screen flex flex-col items-center justify-start">
91+
<div className="relative h-[calc(100%-122px)] flex flex-col items-center justify-start">
9292
<Suspense fallback={<div>Loading...</div>}>
9393
{file && (
9494
<>

src/app/classes/[cId]/[mId]/components/manageSubComponents/LiveClass.tsx

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -341,25 +341,6 @@ const LiveClass: React.FC<LiveClassProps> = ({classId, userId}) => {
341341
style={{width: '100%'}}
342342
/>
343343
</div>
344-
345-
<div className="flex flex-col items-center p-4 mb-8">
346-
<video
347-
className="h-full w-full rounded-lg"
348-
controls
349-
autoPlay
350-
playsInline
351-
style={{width: '100%'}}
352-
/>
353-
</div>
354-
<div className="flex flex-col items-center p-4 mb-8">
355-
<video
356-
className="h-full w-full rounded-lg"
357-
controls
358-
autoPlay
359-
playsInline
360-
style={{width: '100%'}}
361-
/>
362-
</div>
363344
</div>
364345
)}
365346
</div>

src/app/classes/[cId]/[mId]/components/subComponents/LiveClassViewer.tsx

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
198198
};
199199

200200
return (
201-
<div className="relative flex flex-col items-end h-screen">
201+
<div className="relative flex flex-col items-end h-[calc(100%- 122px)]">
202202
<div className="bg-[#ffffff] border border-gray-400 shadow-md rounded-lg p-6 w-80 flex flex-col items-center mb-8">
203203
{!inClass ? (
204204
<button
@@ -239,7 +239,7 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
239239

240240
{inClass && (
241241
<div
242-
className="flex flex-col items-center mt-12 overflow-y-auto"
242+
className="flex flex-col items-center mt-4 overflow-y-auto m-auto"
243243
style={{height: '60vh'}}
244244
>
245245
<div className="flex flex-col items-center p-4 mb-8">
@@ -260,44 +260,6 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
260260
style={{width: '100%'}}
261261
/>
262262
</div>
263-
264-
<div className="flex flex-col items-center p-4 mb-8">
265-
<video
266-
className="h-full w-full rounded-lg"
267-
controls
268-
autoPlay
269-
playsInline
270-
style={{width: '100%'}}
271-
/>
272-
</div>
273-
<div className="flex flex-col items-center p-4 mb-8">
274-
<video
275-
className="h-full w-full rounded-lg"
276-
controls
277-
autoPlay
278-
playsInline
279-
style={{width: '100%'}}
280-
/>
281-
</div>
282-
283-
<div className="flex flex-col items-center p-4 mb-8">
284-
<video
285-
className="h-full w-full rounded-lg"
286-
controls
287-
autoPlay
288-
playsInline
289-
style={{width: '100%'}}
290-
/>
291-
</div>
292-
<div className="flex flex-col items-center p-4 mb-8">
293-
<video
294-
className="h-full w-full rounded-lg"
295-
controls
296-
autoPlay
297-
playsInline
298-
style={{width: '100%'}}
299-
/>
300-
</div>
301263
</div>
302264
)}
303265
</div>

0 commit comments

Comments
 (0)