diff --git a/backend/src/online_classroom/create_user.rs b/backend/src/online_classroom/create_user.rs index afd1760..8b09fa2 100644 --- a/backend/src/online_classroom/create_user.rs +++ b/backend/src/online_classroom/create_user.rs @@ -107,7 +107,7 @@ Content-Disposition: form-data; name="firstname" -----------------------------83919643214156711801978607619 Content-Disposition: form-data; name="official_code" - +{password} -----------------------------83919643214156711801978607619 Content-Disposition: form-data; name="email" diff --git a/frontend/index.html b/frontend/index.html index e5f8138..135da56 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -9,7 +9,7 @@ - + diff --git a/frontend/src/OnlineClassroom/ClassroomRegistration.tsx b/frontend/src/OnlineClassroom/ClassroomRegistration.tsx index a254752..3e3a851 100644 --- a/frontend/src/OnlineClassroom/ClassroomRegistration.tsx +++ b/frontend/src/OnlineClassroom/ClassroomRegistration.tsx @@ -13,7 +13,7 @@ export function ClassroomRegistration(props: { return (
-

Registrar cursos

+

Inscribir en Aula Virtual

>([]); const {setError, status, setStatus} = useLoading(); @@ -18,7 +21,6 @@ export function ClassroomUserCourses(props: {userid: number, updateSignal: numbe backend.get>>(`/api/classroom/course/${props.userid}`) .then((res) => { setCourses(res.data.Ok); - setStatus(LoadingStatus.Ok); }) .catch((err) => { @@ -39,9 +41,9 @@ export function ClassroomUserCourses(props: {userid: number, updateSignal: numbe }); return ( -
-

- Cursos matriculados: + +

+ Cursos matriculados

@@ -57,11 +59,34 @@ export function ClassroomUserCourses(props: {userid: number, updateSignal: numbe
- {(c) => (

{c.name}

)} + {(c) => } -

Esta persona no está matriculada en ningún curso

+
+
+ +
+

No está matriculado a ningun curso.

+
+ + ); +} + +function Course(props: {course: ClassroomCourse}) { + return ( +
+

{props.course.name}

+
); } diff --git a/frontend/src/OnlineClassroom/ClassroomUserCourses/Message.tsx b/frontend/src/OnlineClassroom/ClassroomUserCourses/Message.tsx new file mode 100644 index 0000000..750dea3 --- /dev/null +++ b/frontend/src/OnlineClassroom/ClassroomUserCourses/Message.tsx @@ -0,0 +1,40 @@ +import { OutlinedCard } from "../../components/OutlinedCard"; + +export function Message() { + const message = ` +Buen día estimados, +Se adjunta... + `.trim(); + + return ( + +

+ Generar mensajes +

+ +
+

Mensaje usuario natural:

+
+ 
+                        {message}
+
+
+ +

Mensaje empresa:

+
+ 
+                        {message}
+
+
+
+ + ); +} diff --git a/frontend/src/OnlineClassroom/ClassroomUserCourses/index.tsx b/frontend/src/OnlineClassroom/ClassroomUserCourses/index.tsx new file mode 100644 index 0000000..e56b7b4 --- /dev/null +++ b/frontend/src/OnlineClassroom/ClassroomUserCourses/index.tsx @@ -0,0 +1,12 @@ +import { CoursesList } from "./Courses"; +import { Message } from "./Message"; + +export function ClassroomUserCourses(props: {userid: number, updateSignal: number}) { + return ( +
+ + + +
+ ); +} diff --git a/frontend/src/OnlineClassroom/ClassroomUserCreation.tsx b/frontend/src/OnlineClassroom/ClassroomUserCreation.tsx index 079f291..8ecabd2 100644 --- a/frontend/src/OnlineClassroom/ClassroomUserCreation.tsx +++ b/frontend/src/OnlineClassroom/ClassroomUserCreation.tsx @@ -53,7 +53,6 @@ export function ClassroomUserCreation(props: {person: Person, onCreate: (classro }) .then((response) => { if (response.status === 200) { - alert("Usuario creado con éxito"); setStatus(LoadingStatus.Ok); props.onCreate(response.data.Ok.person_classroom_id); } else { diff --git a/frontend/src/OnlineClassroom/index.tsx b/frontend/src/OnlineClassroom/index.tsx index 6ce6b75..13cab28 100644 --- a/frontend/src/OnlineClassroom/index.tsx +++ b/frontend/src/OnlineClassroom/index.tsx @@ -32,10 +32,12 @@ export function OnlineClassroom() { onSuccess={() => setUpdateSIgnal((s) => s + 1)} /> - +
+ +

diff --git a/frontend/src/certs/NewRegister/index.tsx b/frontend/src/certs/NewRegister/index.tsx index 2e7ca36..38afeb6 100644 --- a/frontend/src/certs/NewRegister/index.tsx +++ b/frontend/src/certs/NewRegister/index.tsx @@ -30,7 +30,7 @@ export function NewRegister(props: { return (
-

Agregar certs

+

Registrar certificados

diff --git a/frontend/src/components/OutlinedCard.tsx b/frontend/src/components/OutlinedCard.tsx new file mode 100644 index 0000000..c95dfb1 --- /dev/null +++ b/frontend/src/components/OutlinedCard.tsx @@ -0,0 +1,12 @@ +import type { JSX } from "solid-js"; + +export function OutlinedCard(props: {children?: Array | JSX.Element, class?: string}) { + return ( +
+ {props.children} +
+ ); +}