Merge pull request YJU-OKURA#163 from Regulus0811/refactor/live-class

不要なビデオタグを削除し、その他のレイアウトを調整
Lainari · Jun 19, 2024 · e97da35 · e97da35
2 parents c14434b + 3cf8078
commit e97da35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 60 deletions.
diff --git a/src/app/classes/[cId]/[mId]/components/Material.tsx b/src/app/classes/[cId]/[mId]/components/Material.tsx
@@ -88,7 +88,7 @@ const Material = () => {
   }, [numPages]);
 
   return (
-    <div className="relative min-h-screen flex flex-col items-center justify-start">
+    <div className="relative h-[calc(100%-122px)] flex flex-col items-center justify-start">
       <Suspense fallback={<div>Loading...</div>}>
         {file && (
           <>

diff --git a/src/app/classes/[cId]/[mId]/components/manageSubComponents/LiveClass.tsx b/src/app/classes/[cId]/[mId]/components/manageSubComponents/LiveClass.tsx
@@ -341,25 +341,6 @@ const LiveClass: React.FC<LiveClassProps> = ({classId, userId}) => {
               style={{width: '100%'}}
             />
           </div>
-
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
         </div>
       )}
     </div>

diff --git a/src/app/classes/[cId]/[mId]/components/subComponents/LiveClassViewer.tsx b/src/app/classes/[cId]/[mId]/components/subComponents/LiveClassViewer.tsx
@@ -198,7 +198,7 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
   };
 
   return (
-    <div className="relative flex flex-col items-end h-screen">
+    <div className="relative flex flex-col items-end h-[calc(100%- 122px)]">
       <div className="bg-[#ffffff] border border-gray-400 shadow-md rounded-lg p-6 w-80 flex flex-col items-center mb-8">
         {!inClass ? (
           <button
@@ -239,7 +239,7 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
 
       {inClass && (
         <div
-          className="flex flex-col items-center mt-12 overflow-y-auto"
+          className="flex flex-col items-center mt-4 overflow-y-auto m-auto"
           style={{height: '60vh'}}
         >
           <div className="flex flex-col items-center p-4 mb-8">
@@ -260,44 +260,6 @@ const LiveClassViewer: React.FC<LiveClassViewerProps> = ({classId, userId}) => {
               style={{width: '100%'}}
             />
           </div>
-
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
-
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
-          <div className="flex flex-col items-center p-4 mb-8">
-            <video
-              className="h-full w-full rounded-lg"
-              controls
-              autoPlay
-              playsInline
-              style={{width: '100%'}}
-            />
-          </div>
         </div>
       )}
     </div>