Merge branch 'master' of https://github.com/DamienVesper/Sloodle

Slaytur · Oct 1, 2022 · b24b904 · b24b904
2 parents 032aac6 + 4e02c13
commit b24b904
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/client/src/components/Dashboard/Lecture.tsx b/client/src/components/Dashboard/Lecture.tsx
@@ -19,8 +19,8 @@ class Lecture extends React.Component<{ visibility: `COLLAPSED` | `EXPANDED` },
     render = (): React.ReactNode => (
         <section className={`tw-font-poppins tw-font-normal ${this.state.state === `COLLAPSED` ? `tw-hidden` : `tw-block`}`}>
             <div className="tw-self-center tw-hidden md:tw-flex tw-absolute tw-h-full tw-top-0 tw-left-0 tw-right-0 tw-items-center">
-                <img src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
-                <img src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
             </div>
             <div className="tw-opacity-90 tw-backdrop-blur-xl  tw-h-screen tw-w-screen tw-inset-0 tw-z-[40] tw-blur-md tw-absolute tw-l-0 tw-b-2 tw-t-3 tw-r-2 " />
             <i className="tw-cursor-pointer icofont icofont-close tw-absolute tw-right-[11rem] tw-top-[3rem] tw-z-[60] tw-p-1" onClick={this.changeState}></i>

diff --git a/client/src/components/Dashboard/Lecture2.tsx b/client/src/components/Dashboard/Lecture2.tsx
@@ -19,8 +19,8 @@ class Lecture extends React.Component<{ visibility: `COLLAPSED` | `EXPANDED` },
     render = (): React.ReactNode => (
         <section className={`tw-font-poppins tw-font-normal ${this.state.state === `COLLAPSED` ? `tw-hidden` : `tw-block`}`}>
             <div className="tw-self-center tw-hidden md:tw-flex tw-absolute tw-h-full tw-top-0 tw-left-0 tw-right-0 tw-items-center">
-                <img src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
-                <img src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
             </div>
             <div className="tw-opacity-90 tw-backdrop-blur-xl  tw-h-screen tw-w-screen tw-inset-0 tw-z-[40] tw-blur-md tw-absolute tw-l-0 tw-b-2 tw-t-3 tw-r-2 " />
             <i className="tw-cursor-pointer icofont icofont-close tw-absolute tw-right-[11rem] tw-top-[3rem] tw-z-[60] tw-p-1" onClick={this.changeState}></i>

diff --git a/client/src/components/Dashboard/Lecture3.tsx b/client/src/components/Dashboard/Lecture3.tsx
@@ -19,8 +19,8 @@ class Lecture extends React.Component<{ visibility: `COLLAPSED` | `EXPANDED` },
     render = (): React.ReactNode => (
         <section className={`tw-font-poppins tw-font-normal ${this.state.state === `COLLAPSED` ? `tw-hidden` : `tw-block`}`}>
             <div className="tw-self-center tw-hidden md:tw-flex tw-absolute tw-h-full tw-top-0 tw-left-0 tw-right-0 tw-items-center">
-                <img src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
-                <img src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="leftarrow" className=" tw-ml-6 tw-z-50 tw-relative tw-left-4 tw-w-[42px] tw-h-[53px] " />
+                <img onClick={this.changeState} src={LeftArrow} alt="rightarrow" className=" tw-mr-6 mirror tw-z-50 tw-absolute tw-right-4  tw-w-[42px] tw-h-[53px] " />
             </div>
             <div className="tw-opacity-90 tw-backdrop-blur-xl  tw-h-screen tw-w-screen tw-inset-0 tw-z-[40] tw-blur-md tw-absolute tw-l-0 tw-b-2 tw-t-3 tw-r-2 " />
             <i className="tw-cursor-pointer icofont icofont-close tw-absolute tw-right-[11rem] tw-top-[3rem] tw-z-[60] tw-p-1" onClick={this.changeState}></i>

diff --git a/client/src/components/Sidebar.tsx b/client/src/components/Sidebar.tsx
@@ -6,8 +6,8 @@ class Sidebar extends React.Component {
             <div className='tw-w-32 md:tw-w-64 hover:tw-w-64 tw-ease-in tw-duration-150 tw-z-10'>
                 <div className=" card card-body tw-font-poppins tw-h-full tw-text-black tw-bg-opacity-40 tw-rounded-md tw-mt-2 tw-ml-6 tw-px-2 tw-py-3  tw-ease-in tw-duration-150 tw-z-10 tw-bg-primary tw-text-center mt-16">
                     <div className='tw-flex tw-items-center tw-justify-center'>
-                        <h2 className="tw-text-xl tw-px-4">Classes</h2>
-                        <div className='tw-w-full'></div>
+                        <h2 className="tw-text-md md:text-text-xl tw-px-2">Classes</h2>
+                        <div className='tw-w-2'></div>
                         <a href='/join-class'><i className="icofont icofont-plus tw-float-right tw-cursor-pointer"></i></a>
                     </div>
                     <hr className="tw-mx-4" />
@@ -16,7 +16,7 @@ class Sidebar extends React.Component {
                         <br /> <div className='tw-underline'>Organic Chemistry</div><br/><br/>Linear Algebra<br/><br/><br/>
                     </div>
                 </div>
-                <div className="card tw-font-poppins tw-h-full tw-text-black tw-bg-opacity-40 tw-rounded-md tw-mt-4 tw-ml-6 tw-px-2 tw-py-3  tw-bg-primary tw-text-center mt-16">
+                <div className="card tw-font-poppins tw-h-full tw-text-black tw-bg-opacity-40 tw-rounded-md tw-mt-4 tw-ml-6 tw-px-2 tw-py-3  tw-bg-primary tw-text-center mt-16 tw-justify-start">
                     <h2 className="tw-text-xl tw-overflow-clip tw-text-ellipsis px-2">Assignments</h2>
                     <hr className="tw-mx-4" />