Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Course views for teacher #161

Merged
merged 45 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e267e55
teacher detailed course base project list
JibrilExe Mar 27, 2024
673a140
basic
JibrilExe Mar 27, 2024
2b941a9
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Mar 31, 2024
3907358
scrollers
JibrilExe Mar 31, 2024
2450ba9
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 1, 2024
3e99550
doc
JibrilExe Apr 1, 2024
dc98d2a
backtick strings
JibrilExe Apr 1, 2024
1fa7210
base all courses page
JibrilExe Apr 1, 2024
17c597e
changed height
JibrilExe Apr 2, 2024
d70e61a
merged with dev
JibrilExe Apr 2, 2024
a0f296c
first finished version of teacher course views
JibrilExe Apr 2, 2024
e21c049
merged with dev
JibrilExe Apr 3, 2024
aba444f
teacher all course page reviewed
JibrilExe Apr 4, 2024
0fd3537
display time until deadline
JibrilExe Apr 4, 2024
772ab0c
more searchbars and translations
JibrilExe Apr 13, 2024
7ea55c1
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 13, 2024
4e803ad
changed file structure for maintainability
JibrilExe Apr 13, 2024
77aad27
titles and absolute create button
JibrilExe Apr 13, 2024
673f53e
searchbars update url and remain on reload
JibrilExe Apr 13, 2024
866ad2d
user and admin listing
JibrilExe Apr 13, 2024
6ea09e5
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 13, 2024
b3088ec
reworked form and gave unique ids to all list items
JibrilExe Apr 13, 2024
8758e97
whoops linter ssst
JibrilExe Apr 13, 2024
c0d5a0e
added .env to gitignore
JibrilExe Apr 14, 2024
014931e
placeholder for loading courses
JibrilExe Apr 14, 2024
4b1662f
debounce seachbars
JibrilExe Apr 14, 2024
0c20f48
better debouncing more hooks
JibrilExe Apr 14, 2024
22dc78a
setup for loader but doesnt work yet bc bad router
JibrilExe Apr 14, 2024
44149c0
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 15, 2024
dba8ac5
loaders
JibrilExe Apr 15, 2024
a279a6d
course detail teacher course join codes menu
JibrilExe Apr 15, 2024
0b3f202
join code link points to app host now
JibrilExe Apr 15, 2024
c1bbf75
accident
JibrilExe Apr 15, 2024
bff0a8a
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 16, 2024
16d495a
fixed empty filters, placeholders and teacher in admin list
JibrilExe Apr 16, 2024
fbc9cc3
reworked
JibrilExe Apr 18, 2024
139d942
delete
JibrilExe Apr 18, 2024
3bfad45
Merge branch 'development' into frontend/feature/coursesteacher
JibrilExe Apr 18, 2024
a381494
removed wannabe popup errorer
JibrilExe Apr 18, 2024
32dbf90
unuserud
JibrilExe Apr 18, 2024
82462c8
merged dev and fix translation
JibrilExe Apr 19, 2024
0af039b
package
JibrilExe Apr 19, 2024
6e637cb
fix
JibrilExe Apr 19, 2024
965dda9
uhh
JibrilExe Apr 19, 2024
e2e8bed
u
JibrilExe Apr 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/project/endpoints/projects/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get(self, teacher_id=None):
return query_selected_from_model(
Project,
response_url,
select_values=["project_id", "title", "description"],
select_values=["project_id", "title", "description","deadline"],
url_mapper={"project_id": response_url},
filters=request.args
)
Expand Down
18 changes: 18 additions & 0 deletions frontend/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
"home": {
"homepage": "Homepage"
},
"courseDetailTeacher": {
"projects": "Projects",
"newProject": "New Project",
"assistantList": "List of co-teachers/assistants",
"newTeacher": "New teacher",
"studentList": "List of students",
"newStudent": "New student(s)"
},
"allCoursesTeacher": {
"courseForm": "Course Form",
"courseName": "Course Name",
"submit": "Submit",
"emptyCourseNameError": "Course name should not be empty",
"cancel": "Cancel",
"create": "Create",
"activeCourses": "Active Courses",
"archivedCourses":"Archived Courses"
},
"courseForm": {
"courseName": "Course Name",
"submit": "Submit",
Expand Down
18 changes: 18 additions & 0 deletions frontend/public/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
"home": {
"homepage": "Homepage"
},
"courseDetailTeacher": {
"projects": "Projecten",
"newProject": "Nieuw Project",
"assistantList": "Lijst co-leerkrachten/assistenten",
"newTeacher": "Nieuwe leerkracht",
"studentList": "Lijst studenten",
"newStudent": "Nieuwe student(en)"
},
"allCoursesTeacher": {
"courseForm": "Vak Form",
"courseName": "Vak Naam",
"submit": "Opslaan",
"emptyCourseNameError": "Vak name mag niet leeg zijn",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vak name -> vak naam

"cancel": "Annuleer",
"create": "Nieuw Vak",
"activeCourses": "Actieve Vakken",
"archivedCourses":"Gearchiveerde Vakken"
},
"courseForm": {
"courseName": "Vak Naam",
"submit": "Opslaan",
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BrowserRouter,Route,Routes } from "react-router-dom";
import { Header } from "./components/Header/Header";
import { AllCoursesTeacher, CourseDetailTeacher } from "./components/Courses/Teacher";
import Home from "./pages/home/Home";
/**
* This component is the main application component that will be rendered by the ReactDOM.
Expand All @@ -11,6 +12,8 @@ function App(): JSX.Element {
<Header />
<Routes>
<Route index element={<Home />} />
<Route path="/courses/:courseId" element={<CourseDetailTeacher />} />
<Route path="/courses" element={<AllCoursesTeacher />} />
</Routes>
</BrowserRouter>
);
Expand Down
Loading