ran precommit

Author: gabrielhan23

csm_web/csm_web/apps.py

@@ -2,4 +2,4 @@
 
 
 class AdminConfig(DefaultAdminConfig):
-    default_site = 'csm_web.admin.AdminSite'
+    default_site = "csm_web.admin.AdminSite"

csm_web/csm_web/urls.py

@@ -13,20 +13,25 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.contrib import admin
-from django.contrib.auth.views import logout_then_login
-from django.urls import path, include
-from django.shortcuts import render
 
 from django.conf import settings
 from django.conf.urls.static import static
+from django.contrib import admin
+from django.contrib.auth.views import logout_then_login
 from django.contrib.staticfiles.views import serve
+from django.shortcuts import render
+from django.urls import include, path
 from django.views.decorators.cache import cache_control
 
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("api/", include("scheduler.urls")),
-    path("login/", lambda request: render(request, "frontend/login.html", context={"DJANGO_ENV": settings.DJANGO_ENV})),
+    path(
+        "login/",
+        lambda request: render(
+            request, "frontend/login.html", context={"DJANGO_ENV": settings.DJANGO_ENV}
+        ),
+    ),
     path("logout/", logout_then_login),
     path("", include("social_django.urls", namespace="social")),
     path("", include("frontend.urls")),

csm_web/frontend/src/components/coord_interface/ActionButton.tsx

@@ -21,17 +21,16 @@ export default function ActionButton({ copyEmail, reset }: ActionButtonProps) {
         <div id="default-copy">Copy Selected Emails</div>
         <div id="success-copy" className="hidden">
           <div className="checkmark"></div>
-
           <div>Copied!</div>
         </div>
       </button>
       {isStudents ? (
         <button onClick={changeURL}>
-          <div>See Mentors</div>
+          <div>View Mentors</div>
         </button>
       ) : (
         <button onClick={changeURL}>
-          <div>Students</div>
+          <div>View Students</div>
         </button>
       )}
     </div>

csm_web/frontend/src/components/coord_interface/CheckBox.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import styles from "../../css/coord_interface.scss";
+import "../../css/coord_interface.scss";
 
 interface CheckBoxProps {
   id: string;
@@ -8,7 +8,7 @@ interface CheckBoxProps {
 
 export function CheckBox({ id, onClick: onClick }: CheckBoxProps) {
   return (
-    <td className={styles}>
+    <td>
       <div className="checkbox-wrapper">
         <input className="inp-cbx" id={id + "check"} type="checkbox" onClick={onClick} />
         <label className="cbx" htmlFor={id + "check"}>

csm_web/frontend/src/components/coord_interface/CoordTable.tsx

@@ -5,7 +5,7 @@ import ActionButton from "./ActionButton";
 import { CheckBox } from "./CheckBox";
 import DropBox from "./DropBox";
 import { SearchBar } from "./SearchBar";
-import styles from "../../css/coord_interface.scss";
+import "../../css/coord_interface.scss";
 
 export default function CoordTable() {
   const [tableData, setTableData] = useState<Mentor[] | Student[]>([]);
@@ -202,112 +202,110 @@ export default function CoordTable() {
   // }
 
   return (
-    <div className={styles}>
-      <div className="coord-table">
-        <div className="search-container">
-          <SearchBar onChange={filterSearch} />
-        </div>
-        <div id="table-buttons">
+    <div className="coord-table">
+      <div className="search-container">
+        <SearchBar onChange={filterSearch} />
+      </div>
+      <div id="table-buttons">
+        <DropBox
+          items={["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]}
+          name={"Day"}
+          field={"dayTime"}
+          func={filterString}
+          reset={resetFilters}
+        ></DropBox>
+        {isStudents ? (
           <DropBox
-            items={["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]}
-            name={"Day"}
-            field={"dayTime"}
+            items={["0", "1", "2", "3+"]}
+            name={"Absences"}
+            field={"numUnexcused"}
             func={filterString}
             reset={resetFilters}
           ></DropBox>
-          {isStudents ? (
+        ) : (
+          <>
+            <DropBox
+              items={familyNames}
+              name={"Family"}
+              field={"family"}
+              func={filterString}
+              reset={resetFilters}
+            ></DropBox>
             <DropBox
-              items={["0", "1", "2", "3+"]}
-              name={"Absences"}
-              field={"numUnexcused"}
+              items={sectionSizes}
+              name={"Section Size"}
+              field={"numStudents"}
               func={filterString}
               reset={resetFilters}
             ></DropBox>
-          ) : (
-            <>
-              <DropBox
-                items={familyNames}
-                name={"Family"}
-                field={"family"}
-                func={filterString}
-                reset={resetFilters}
-              ></DropBox>
-              <DropBox
-                items={sectionSizes}
-                name={"Section Size"}
-                field={"numStudents"}
-                func={filterString}
-                reset={resetFilters}
-              ></DropBox>
-            </>
-          )}
-        </div>
+          </>
+        )}
+      </div>
+
+      <div id="table-header">
+        {isStudents ? <div className="title">Students List</div> : <div className="title">Mentors List</div>}
+        <ActionButton copyEmail={copyEmail} reset={reset} />
+      </div>
 
-        <div id="table-header">
-          {isStudents ? <div className="title">Students List</div> : <div className="title">Mentors List</div>}
-          <ActionButton copyEmail={copyEmail} reset={reset} />
-        </div>
+      <table>
+        <thead>
+          <tr>
+            <CheckBox id="check" onClick={toggleAllCheckboxes} />
+            <th>Name</th>
+            <th>Email</th>
+            {isStudents ? (
+              <>
+                <th>Mentor Name</th>
+                <th>Time</th>
+                <th>Unexcused Absenses</th>
+              </>
+            ) : (
+              <>
+                <th>Family</th>
+                <th>Time</th>
+                <th>Section Size</th>
+              </>
+            )}
+          </tr>
+        </thead>
+        <tbody>
+          {searchData.length === 0 ? <div className="no-data">No data found...</div> : null}
 
-        <table>
-          <thead>
-            <tr>
-              <CheckBox id="check" onClick={toggleAllCheckboxes} />
-              <th>Name</th>
-              <th>Email</th>
+          {searchData.map(row => (
+            <tr
+              key={row.id}
+              className="data-row"
+              onDoubleClick={() => navigate(`/sections/${row.section}`)}
+              onClick={() => selectCheckbox(row.id)}
+            >
+              <CheckBox
+                id={row.id.toString()}
+                onClick={e => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                }}
+              />
               {isStudents ? (
                 <>
-                  <th>Mentor Name</th>
-                  <th>Time</th>
-                  <th>Unexcused Absenses</th>
+                  <td>{row.name}</td>
+                  <td>{row.email}</td>
+                  <td>{(row as Student).mentorName}</td>
+                  <td>{row.dayTime}</td>
+                  <td>{(row as Student).numUnexcused}</td>
                 </>
               ) : (
                 <>
-                  <th>Family</th>
-                  <th>Time</th>
-                  <th>Section Size</th>
+                  <td>{row.name}</td>
+                  <td>{row.email}</td>
+                  <td>{(row as Mentor).family}</td>
+                  <td>{row.dayTime}</td>
+                  <td>{(row as Mentor).numStudents}</td>
                 </>
               )}
             </tr>
-          </thead>
-          <tbody>
-            {searchData.length === 0 ? <div className="no-data">No data found...</div> : null}
-
-            {searchData.map(row => (
-              <tr
-                key={row.id}
-                className="data-row"
-                onDoubleClick={() => navigate(`/sections/${row.section}`)}
-                onClick={() => selectCheckbox(row.id)}
-              >
-                <CheckBox
-                  id={row.id.toString()}
-                  onClick={e => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                />
-                {isStudents ? (
-                  <>
-                    <td>{row.name}</td>
-                    <td>{row.email}</td>
-                    <td>{(row as Student).mentorName}</td>
-                    <td>{row.dayTime}</td>
-                    <td>{(row as Student).numUnexcused}</td>
-                  </>
-                ) : (
-                  <>
-                    <td>{row.name}</td>
-                    <td>{row.email}</td>
-                    <td>{(row as Mentor).family}</td>
-                    <td>{row.dayTime}</td>
-                    <td>{(row as Mentor).numStudents}</td>
-                  </>
-                )}
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
+          ))}
+        </tbody>
+      </table>
     </div>
   );
 }

csm_web/frontend/src/css/coord_interface.scss

@@ -1,3 +1,5 @@
+@use "base/variables" as *;
+
 .coord-table table {
   width: 100%;
   padding: 10%;

csm_web/frontend/src/css/interface.scss

@@ -91,9 +91,8 @@ $modal-height: 75vh;
   display: grid;
   grid-auto-columns: 2fr 1.5fr;
   row-gap: 10px;
-  align-content: center;
+  place-content: center center;
   align-items: center;
-  justify-content: center;
 }
 
 .resource-solution a,

csm_web/frontend/src/css/resource_aggregation.scss

@@ -44,8 +44,7 @@
 .whitelist-modal-footer {
   display: flex;
   flex-direction: row;
-  align-content: center;
-  justify-content: center;
+  place-content: center center;
 }
 
 /* Add tab */