diff --git a/frontend/src/App.js b/frontend/src/App.js
index 1cfcd516e..dee8f069e 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -16,6 +16,7 @@ import SchoolIndexPage from "main/pages/SchoolIndexPage";
import CoursesCreatePage from "main/pages/CoursesCreatePage";
import CourseIndexPage from "main/pages/CourseIndexPage";
+
import { hasRole, useCurrentUser } from "main/utils/currentUser";
import NotFoundPage from "main/pages/NotFoundPage";
diff --git a/frontend/src/fixtures/schoolsFixtures.js b/frontend/src/fixtures/schoolsFixtures.js
index ddee6e292..9755c89cc 100644
--- a/frontend/src/fixtures/schoolsFixtures.js
+++ b/frontend/src/fixtures/schoolsFixtures.js
@@ -3,30 +3,26 @@ const schoolsFixtures = {
"abbrev": "ucsb",
"name": "UC Santa Barbara",
"termRegex": "[WSMF]\\d\\d",
- "termDescription": "Enter quarter, e.g. F23, W24, S24, M24",
- "termError": "Quarter must be entered in the correct format"
+ "termDescription": "Enter quarter, e.g. F23, W24, S24, M24"
},
threeSchools: [
{
"abbrev": "ucsb",
"name": "UC Santa Barbara",
"termRegex": "[WSMF]\\d\\d",
- "termDescription": "Enter quarter, e.g. F23, W24, S24, M24",
- "termError": "Quarter must be entered in the correct format"
+ "termDescription": "Enter quarter, e.g. F23, W24, S24, M24"
},
{
"abbrev": "umn",
"name": "University of Minnesota",
"termRegex": "[WSMF]\\d\\d",
- "termDescription": "Enter quarter, e.g. F23, W24, S24, M24",
- "termError": "Quarter must be entered in the correct format"
+ "termDescription": "Enter quarter, e.g. F23, W24, S24, M24"
},
{
"abbrev": "ucsd",
"name": "UC San Diego",
"termRegex": "[WSMF]\\d\\d",
- "termDescription": "Enter quarter, e.g. F23, W24, S24, M24",
- "termError": "Quarter must be entered in the correct format"
+ "termDescription": "Enter quarter, e.g. F23, W24, S24, M24"
}
]
};
diff --git a/frontend/src/main/components/Courses/CoursesTable.js b/frontend/src/main/components/Courses/CoursesTable.js
index a6f6ec368..235e1dc52 100644
--- a/frontend/src/main/components/Courses/CoursesTable.js
+++ b/frontend/src/main/components/Courses/CoursesTable.js
@@ -37,6 +37,7 @@ import React from "react";
{
Header: 'id',
accessor: 'id',
+ Cell: ({ value }) => {value},
},
{
Header: 'Name',
diff --git a/frontend/src/main/components/School/SchoolForm.js b/frontend/src/main/components/School/SchoolForm.js
index 336f5f2bb..56a388604 100644
--- a/frontend/src/main/components/School/SchoolForm.js
+++ b/frontend/src/main/components/School/SchoolForm.js
@@ -1,4 +1,4 @@
-import { Button, Form, Row, Col } from 'react-bootstrap';
+import { Button, Form, Row, Col, OverlayTrigger, Tooltip } from 'react-bootstrap';
import { useForm } from 'react-hook-form'
import { useNavigate } from 'react-router-dom'
@@ -26,6 +26,11 @@ function SchoolForm({ initialContents, submitAction, buttonLabel = "Create" }) {
Abbreviation
+ Please enter an abbreviation for school name in lowercase. EX: UCSB}
+ delay='5'
+ >
+
{errors.abbrev?.type === 'required' && 'Abbreviation is required. '}
{errors.abbrev?.type === 'pattern' && 'Abbreviation must be lowercase letters (_ and . allowed), e.g. ucsb'}
@@ -57,6 +63,11 @@ function SchoolForm({ initialContents, submitAction, buttonLabel = "Create" }) {
Term Regex
+ Please enter a regular expression for the format of terms (semesters or quarters) at the school. EX: [WSMF]\d\d for UCSB}
+ delay='5'
+ >
+
{errors.termRegex && 'Term Regex is required. '}
@@ -75,6 +87,11 @@ function SchoolForm({ initialContents, submitAction, buttonLabel = "Create" }) {
Term Description
+ Please enter a term description. EX: Quarter, Semester or Session}
+ delay='5'
+ >
+
{errors.termDescription && 'Term Description is required.'}
@@ -89,24 +107,6 @@ function SchoolForm({ initialContents, submitAction, buttonLabel = "Create" }) {
-
-
-
- Term Error
-
-
- {errors.termError && 'Term Error is required.'}
-
-
-
-
-