Sub cohorts

i18n.js

@@ -22,6 +22,7 @@ module.exports = {
     '/interactive-coding-tutorials': ['projects'],
     '/interactive-exercise/[slug]': ['exercises', 'workshops'],
     '/choose-program': ['choose-program', 'dashboard', 'profile', 'assignments'],
+    '/main-cohort/[mainCohortSlug]/syllabus/[cohortSlug]/[lesson]/[lessonSlug]': ['syllabus', 'dashboard', 'projects', 'assignments'],
     '/syllabus/[cohortSlug]/[lesson]/[lessonSlug]': ['syllabus', 'dashboard', 'projects', 'assignments'],
     '/survey/[surveyId]': ['survey'],
     '/mentorship': ['mentorship'],

package.json

@@ -108,6 +108,7 @@
     "react-player": "^2.12.0",
     "react-plx": "^2.1.2",
     "react-redux": "8.0.5",
+    "react-rewards": "^2.0.4",
     "react-select": "^5.7.3",
     "react-syntax-highlighter": "15.5.0",
     "react-tagsinput": "^3.20.1",

public/locales/en/alert-message.json

@@ -8,6 +8,7 @@
   "content-not-found2": "The endpoint could not access any content of this {{lesson}}",
   "default-version-not-found": "Default version could not access any content of this {{lesson}}",
   "invalid-cohort-slug": "Invalid cohort slug",
+  "error-fetching-syllabus": "There was a problem while fetching the syllabus data",
   "no-cohort-modules-found": "No cohort modules found, first choose a valid cohort",
   "language-not-found": "Data for language \"{{currentLanguageLabel}}\" not found, showing the english version",
   "task-cant-sync-with-cohort": "Some Tasks cannot sync with current cohort",

public/locales/en/choose-program.json

@@ -4,6 +4,10 @@
   },
   "title": "Your Programs",
   "welcome-back-user": "Welcome, {{name}}",
+  "hello-user": "Hello, {{name}}",
+  "rigo-chat": {
+    "welcome-message": "Hi {{firstName}}! I see you are on the course {{cohortName}}. Is there anything you would like to know about it?"
+  },
   "welcome": "Welcome",
   "your-active-programs": "Your active programs",
   "join-our-community": "Join our community",

public/locales/en/common.json

@@ -1,11 +1,15 @@
 {
   "change-language": "Change language",
   "connect-with-github": "Connect with Github",
+  "connect-with-rigobot": "Connect with Rigobot",
+  "get-help-rigobot": "Get help from Rigobot",
   "see-financing-options": "See financing options",
   "your-tutors-in-this-cohort": "Your tutors:",
   "main-instructor": "Main Instructor",
   "teacher-assistant": "Teacher Assistant",
   "rigo": "Rigo",
+  "see-workshops": "See all workshops",
+  "schedule-mentoring": "Schedule a mentoring session",
   "rigobot-bubble": {
     "greeting": "Hi!"
   },

public/locales/en/dashboard.json

@@ -4,8 +4,26 @@
   },
   "title": "Your News",
   "moduleMap": "Module map",
+  "module": "Module",
+  "modules-count": "{{count}} Modules",
+  "path-to-claim": "Path to claim your certificate",
+  "open": "Open",
+  "completed": "Completed!",
+  "hours-worked": "{{hours}} Hours worked",
+  "issued-on": "Issued on {{date}}",
+  "share": "Share",
+  "hide-content": "Hide content",
+  "show-content": "Show content",
+  "start-course": "Start course",
   "backToChooseProgram": "Back to choose program",
   "progressText": "progress in the program",
+  "students-modal": {
+    "students-course": "Students in this course",
+    "select-student": "Select a student to see their full report",
+    "filter-by-name": "Filter by name or email",
+    "student": "Student",
+    "no-students": "No students found"
+  },
   "whiteLabeledText": "This course is brought to you thanks to our parnership with this university",
   "free-trial-msg": "You are currently on a free trial, some features might be limited. <a class='black-link' href='{{link}}'>Upgrade your plan</a> to have unlimited access!",
   "intro-video-title": "Welcome!",
@@ -198,6 +216,7 @@
     "take-attendancy": "Take attendance",
     "review-attendancy": "Review attendance",
     "assignments": "Assignments",
+    "student-progress": "Student Progress",
     "teacher-tutorial": "Teacher tutorial",
     "no-instructions": ">:warning: No available instruction found for this module"
   },

public/locales/es/alert-message.json

@@ -8,6 +8,7 @@
   "content-not-found2": "El endpoint no pudo acceder a ningún contenido de esta {{lesson}}",
   "default-version-not-found": "La versión predeterminada no pudo acceder a ningún contenido de este {{lesson}}",
   "invalid-cohort-slug": "Slug de cohorte no válido",
+  "error-fetching-syllabus": "Hubo un problema al mostrar la información del plan de estudios",
   "no-cohort-modules-found": "No se encontraron módulos de cohorte, primero elija una cohorte válida",
   "language-not-found": "No se encontró información para el idioma \"{{currentLanguageLabel}}\", mostrando la versión en inglés",
   "task-cant-sync-with-cohort": "Algunas tareas no se pueden sincronizar con la cohorte actual",

public/locales/es/choose-program.json

@@ -4,6 +4,10 @@
   },
   "title": "Tus Programas",
   "welcome-back-user": "Bienvenido, {{name}}",
+  "hello-user": "Hola, {{name}}",
+  "rigo-chat": {
+    "welcome-message": "¡Hola {{firstName}}! Veo que estas leyendo haciendo el curso {{cohortName}}. ¿Hay algo que pueda hacer para ayudarte?"
+  },
   "welcome": "Bienvenido",
   "your-active-programs": "Tus programas activos",
   "join-our-community": "Únete a nuestra comunidad",

public/locales/es/common.json

@@ -1,11 +1,18 @@
 {
   "change-language": "Cambiar idioma",
   "connect-with-github": "Conéctate con Github",
+  "connect-with-rigobot": "Conéctate con Rigobot",
+  "get-help-rigobot": "Pide ayuda a Rigobot",
   "see-financing-options": "Ver opciones de financiamiento",
   "your-tutors-in-this-cohort": "Tus tutores:",
   "main-instructor": "Instructor Principal",
   "teacher-assistant": "Asistente de Profesor",
   "rigo": "Rigo",
+  "see-workshops": "Ver todos los workshops",
+  "schedule-mentoring": "Agenda una sesión de mentoria",
+  "rigobot-bubble": {
+    "greeting": "Hola!"
+  },
   "ai-tutor": "Tutor IA",
   "clone-modal": {
     "title": "¿Cómo clonar un proyecto?"

public/locales/es/dashboard.json

@@ -4,8 +4,26 @@
   },
   "title": "Tus noticias",
   "moduleMap": "Mapa de módulos",
+  "module": "Módulo",
+  "modules-count": "{{count}} Módulos",
+  "path-to-claim": "Vía para reclamar tu certificado",
+  "open": "Abrir",
+  "completed": "¡Completed!",
+  "hours-worked": "{{hours}} Horas trabajadas",
+  "issued-on": "Emitido en {{date}}",
+  "share": "Compartir",
+  "hide-content": "Ocultar contenido",
+  "show-content": "Mostrar contenido",
+  "start-course": "Empezar el curso",
   "backToChooseProgram": "Volver a elegir programa",
   "progressText": "Progreso en el programa",
+  "students-modal": {
+    "students-course": "Estudiantes en este curso",
+    "select-student": "Selecciona un estudiante para ver el reporte de su progreso",
+    "filter-by-name": "Filtrar por nombre o email",
+    "student": "Estudiante",
+    "no-students": "No se encontraron estudiantes"
+  },
   "whiteLabeledText": "Este curso es traído a ti gracias a nuestra alianza con esta universidad.",
   "free-trial-msg": "Actualmente se encuentra en una prueba gratuita, algunas funciones pueden ser limitadas. ¡<a class='black-link' href='{{link}}'>Actualiza tu plan</a> para tener acceso ilimitado!",
   "intro-video-title": "Bienvenido!",
@@ -199,6 +217,7 @@
     "take-attendancy": "Tomar asistencia",
     "review-attendancy": "Revisar asistencia",
     "assignments": "Tareas",
+    "student-progress": "Progreso del Estudiante",
     "teacher-tutorial": "Tutorial de profesor",
     "no-instructions": ">:warning: No se encontró instrucción disponible para este módulo"
   },

src/common/components/AttendanceModal/index.jsx

@@ -20,8 +20,7 @@ function AttendanceModal({
   title, message, isOpen, onClose, students,
 }) {
   const { t } = useTranslation('dashboard');
-  const { state, setCohortSession } = useCohortHandler();
-  const { cohortSession, sortedAssignments } = state;
+  const { setCohortSession, cohortSession, sortedAssignments } = useCohortHandler();
   const [historyLog, setHistoryLog] = useState();
   const [day, setDay] = useState(cohortSession.current_day);
   const [attendanceTaken, setAttendanceTaken] = useState({});

src/common/components/FooterTC.jsx

@@ -21,6 +21,7 @@ function FooterTC({ pageProps }) {
   const noFooterRoutes = [
     '/cohort/[cohortSlug]/[slug]/[version]',
     '/syllabus/[cohortSlug]/[lesson]/[lessonSlug]',
+    '/main-cohort/[mainCohortSlug]/syllabus/[cohortSlug]/[lesson]/[lessonSlug]',
     '/mentorship/schedule',
   ];
 

src/common/components/Icon/set/badge.jsx

@@ -0,0 +1,23 @@
+const badge = ({
+  width, height, style, color,
+}) => (
+  <svg
+    width={width || '18'}
+    height={height || '18'}
+    style={style}
+    viewBox="0 0 18 18"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M18 9.01286C17.9639 9.5537 17.815 10.0436 17.4592 10.4567C17.1354 10.8329 16.8211 11.217 16.4872 11.583C16.2074 11.8887 16.0757 12.2336 16.0812 12.6482C16.0875 13.1311 16.0969 13.6163 16.0538 14.0959C15.9566 15.1815 15.0654 16.0179 13.9751 16.068C13.5448 16.0876 13.1137 16.0822 12.6825 16.0751C12.2577 16.0673 11.8948 16.1942 11.5781 16.485C11.2223 16.8111 10.8508 17.1207 10.4816 17.4319C9.59429 18.1804 8.3919 18.1859 7.50697 17.4437C7.12681 17.1254 6.74744 16.8048 6.38062 16.4717C6.09452 16.2123 5.76923 16.0884 5.38516 16.0939C4.95406 16.0994 4.52296 16.1088 4.09264 16.0869C2.79855 16.0218 1.91518 15.1149 1.87442 13.8177C1.8611 13.3874 1.90734 12.9524 1.85796 12.5267C1.82582 12.2446 1.72471 11.9389 1.56246 11.7084C1.2552 11.2726 0.877398 10.887 0.538003 10.4739C-0.18233 9.59838 -0.178411 8.39834 0.544273 7.52517C0.810773 7.2038 1.06316 6.86676 1.3571 6.57282C1.75606 6.17386 1.90734 5.71767 1.87912 5.15881C1.85561 4.69243 1.86658 4.21587 1.93242 3.7542C2.07508 2.76109 2.89339 2.01254 3.89982 1.93416C4.3803 1.89654 4.8647 1.90359 5.34754 1.90829C5.75983 1.91221 6.10785 1.7868 6.41354 1.50541C6.76861 1.17856 7.14092 0.86973 7.5101 0.558553C8.38328 -0.175105 9.5794 -0.182944 10.4549 0.541308C10.7967 0.824268 11.1478 1.09939 11.4621 1.41057C11.8423 1.7868 12.2789 1.93651 12.8064 1.91065C13.2226 1.89027 13.6427 1.89811 14.0582 1.93181C15.1234 2.0196 15.9589 2.83948 16.0522 3.90312C16.0953 4.39615 16.0326 4.89936 16.0969 5.38768C16.1408 5.71846 16.2662 6.06961 16.4543 6.34395C16.7553 6.78289 17.1417 7.16226 17.4866 7.57141C17.8377 7.98841 17.9741 8.48378 17.9984 9.01208L18 9.01286ZM9.00877 16.7954C9.27135 16.6614 9.53237 16.5705 9.74086 16.4114C10.1343 16.1104 10.4706 15.7294 10.8813 15.4582C11.263 15.2058 11.6941 14.9715 12.1347 14.8798C12.6496 14.7724 13.1991 14.8233 13.7329 14.8139C14.4485 14.8014 14.8145 14.4495 14.8318 13.7315C14.8412 13.327 14.8334 12.9218 14.8349 12.5165C14.8373 11.8769 15.0466 11.3189 15.4753 10.8392C15.8147 10.4598 16.1478 10.0742 16.47 9.67989C16.8345 9.23468 16.8274 8.72833 16.459 8.28783C16.1494 7.91708 15.8382 7.54711 15.5129 7.18969C15.0513 6.68256 14.8255 6.09234 14.8326 5.40806C14.8365 4.99028 14.8475 4.57172 14.8263 4.15473C14.7949 3.54884 14.4297 3.19768 13.8246 3.17652C13.4201 3.16241 13.0149 3.17103 12.6097 3.17182C11.9301 3.17182 11.3312 2.96567 10.8225 2.50322C10.4753 2.18734 10.1116 1.8887 9.75419 1.58301C9.25568 1.15583 8.75011 1.15426 8.24141 1.58536C7.87301 1.89732 7.50932 2.21555 7.14641 2.53535C6.73098 2.90218 6.24737 3.12008 5.69791 3.15222C5.20331 3.18122 4.70559 3.16241 4.21021 3.17417C3.52358 3.18984 3.15205 3.55902 3.13481 4.24722C3.12383 4.67832 3.13246 5.10943 3.13089 5.54053C3.12932 6.14015 2.91926 6.66061 2.53205 7.11444C2.2099 7.49225 1.88618 7.86848 1.56716 8.24785C1.15017 8.74479 1.14468 9.23155 1.55697 9.73006C1.87285 10.1126 2.19657 10.4888 2.52029 10.865C2.92788 11.3392 3.13951 11.8848 3.13246 12.5134C3.12854 12.9312 3.12227 13.3498 3.13481 13.7675C3.15519 14.4338 3.53456 14.8037 4.19297 14.8124C4.58488 14.8178 4.97679 14.8139 5.3687 14.8139C6.0326 14.8139 6.62517 15.0068 7.13073 15.4496C7.51402 15.7851 7.89026 16.1308 8.29393 16.4396C8.49145 16.5909 8.74541 16.6685 9.0072 16.7962L9.00877 16.7954Z"
+      fill={color || '#FFB718'}
+    />
+    <path
+      d="M7.96174 10.1479C9.08496 9.02391 10.1635 7.94459 11.242 6.86527C11.3345 6.77278 11.4239 6.67793 11.5195 6.58858C11.8346 6.29543 12.1952 6.28054 12.4585 6.54547C12.7172 6.80648 12.707 7.17958 12.4044 7.48606C11.4309 8.46975 10.4488 9.44561 9.4706 10.4238C9.14767 10.7468 8.82865 11.0744 8.50023 11.3918C8.13732 11.743 7.82849 11.754 7.47812 11.4107C6.83461 10.7805 6.19814 10.1424 5.56638 9.4997C5.25677 9.1846 5.24266 8.83109 5.50524 8.56303C5.77409 8.28791 6.14484 8.3075 6.46934 8.62965C6.95923 9.11719 7.43893 9.61492 7.96096 10.1463L7.96174 10.1479Z"
+      fill={color || '#FFB718'}
+    />
+  </svg>
+);
+
+export default badge;