Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/components/molecules/Categories/Categories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import type { Category } from "@escolalms/sdk/lib/types/api";
import type { Category } from "@escolalms/sdk/lib/types";
import styled, {
createGlobalStyle,
ThemeContext,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Certificate } from "@escolalms/sdk/lib/types/api";
import { Certificate } from "@escolalms/sdk/lib/types";
import React from "react";
import styled, { withTheme } from "styled-components";

Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/CourseTopNav/CourseTopNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getStylesBasedOnTheme } from "../../../utils/utils";
import { getUniqueId } from "../../../utils/utils";
import { ExtendableStyledComponent } from "types/component";
import { useState } from "react";
import { BookmarkableType } from "@escolalms/sdk/lib/types/api";
import { BookmarkableType } from "@escolalms/sdk/lib/types";

interface StyledAsideProps {
mobile?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled, { withTheme } from "styled-components";
import { useOnClickOutside } from "../../../hooks/useOnClickOutside";
import { Checkbox } from "../../../";
import { Text } from "../../../";
import { Category } from "@escolalms/sdk/lib/types/api";
import { Category } from "@escolalms/sdk/lib/types";

interface Props {
categories: Category[];
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/Tags/Tags.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import type { Tag } from "@escolalms/sdk/lib/types/api";
import type { Tag } from "@escolalms/sdk/lib/types";
import styled, {
createGlobalStyle,
ThemeContext,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Lesson } from "@escolalms/sdk/lib/types/api";
import { Lesson } from "@escolalms/sdk/lib/types";

import { useCourseAgendaContext } from "../context";
import CourseAgendaTopic from "../CourseAgendaTopic";
Expand Down Expand Up @@ -46,8 +46,11 @@ export const CourseAgendaLesson: React.FC<CourseAgendaLessonProps> = ({

const isLessonActive = useMemo(
() =>
!!(lesson.active_from === null ||
(lesson.active_from && isAfter(new Date(), new Date(lesson.active_from)))),
!!(
lesson.active_from === null ||
(lesson.active_from &&
isAfter(new Date(), new Date(lesson.active_from)))
),
[lesson.id]
);

Expand Down Expand Up @@ -79,7 +82,7 @@ export const CourseAgendaLesson: React.FC<CourseAgendaLessonProps> = ({
<StyledLessonItem
className={`lesson__item ${open ? "open" : "closed"} ${
isAncestor && !isRootAncestor && open ? "full-border" : ""
} ${!isSubLesson ? "bottom-border" : ""} ${isMobile ? 'mobile' : ''}`}
} ${!isSubLesson ? "bottom-border" : ""} ${isMobile ? "mobile" : ""}`}
aria-label={`${t<string>("Course.Lesson")} ${index + 1}`}
>
<Header
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/LoginForm/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
import type {
DefaultResponseError,
DefaultResponse,
} from "@escolalms/sdk/lib/types/api";
} from "@escolalms/sdk/lib/types";
import type { ResponseError } from "umi-request";

import styled, { withTheme } from "styled-components";
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/ModalAddTask/ModalAddTask.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button, Input, Title } from "../../..";
import { API } from "@escolalms/sdk/lib";
import { DefaultResponseError } from "@escolalms/sdk/lib/types/api";
import { DefaultResponseError } from "@escolalms/sdk/lib/types";
import {
RelatedTreeSelect,
RelatedValue,
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/ModalCourseAccess/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import styled, { withTheme } from "styled-components";
import { ResponseError } from "umi-request";
import { API } from "@escolalms/sdk/lib";
import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
import { DefaultResponseError } from "@escolalms/sdk/lib/types/api";
import { DefaultResponseError } from "@escolalms/sdk/lib/types";

import { Button } from "../../atoms/Button/Button";
import { Input } from "../../atoms/Input/Input";
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/MyProfileForm/MyProfileForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Formik, FormikErrors } from "formik";
import { useContext, useState, useEffect, useCallback } from "react";
import { useTranslation } from "react-i18next";
import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types/api";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types";
import type { ResponseError } from "umi-request";

import { API } from "@escolalms/sdk/lib";
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/NoteEditor/NoteEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Input } from "../../atoms/Input/Input";
import { TextArea } from "../../atoms/TextArea/TextArea";
import Button from "../../atoms/Button/Button";
import Link from "../../atoms/Link/Link";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types/api";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types";
import type { ResponseError } from "umi-request";
import { Formik } from "formik";
import { t } from "i18next";
Expand Down
4 changes: 2 additions & 2 deletions src/components/organisms/RegisterForm/RegisterForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import type {
DefaultResponse,
DefaultResponseError,
RegisterResponse,
} from "@escolalms/sdk/lib/types/api";
} from "@escolalms/sdk/lib/types";
import type { ResponseError } from "umi-request";

//import "@escolalms/ts-models";
//import "@escolalms/sdk/lib/types/api";
//import "@escolalms/sdk/lib/types";

import styled, { withTheme } from "styled-components";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Formik, FormikErrors } from "formik";
import { useCallback, useContext } from "react";
import { useTranslation } from "react-i18next";
import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types/api";
import type { DefaultResponseError } from "@escolalms/sdk/lib/types";
import type { ResponseError } from "umi-request";

import styled, { withTheme } from "styled-components";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled from "styled-components";
import { useTranslation } from "react-i18next";
import { format, isAfter } from "date-fns";
import { Formik, FormikErrors } from "formik";
import { Task, TaskNote } from "@escolalms/sdk/lib/types/api";
import { Task, TaskNote } from "@escolalms/sdk/lib/types";
import { AddTaskNote, EditTaskNote } from "../../TaskNote";

import {
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/TaskNote/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext, useState, useCallback, useRef } from "react";
import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
import { useTranslation } from "react-i18next";
import { Button, Row, Spin, TextArea } from "../../../";
import { TaskNote } from "@escolalms/sdk/lib/types/api";
import { TaskNote } from "@escolalms/sdk/lib/types";
import { AddNoteWrapper } from "../TaskDetailsModal/content/common";
import useAutosizeTextArea from "../../../hooks/useAutosizeTextArea";

Expand Down
2 changes: 1 addition & 1 deletion src/components/players/H5Player/H5Player.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext, useEffect, useMemo } from "react";
import styled, { withTheme, ThemeContext } from "styled-components";
import { XAPIEvent, ContextlessPlayer as Player } from "@escolalms/h5p-react";

import * as API from "@escolalms/sdk/lib/types/api";
import * as API from "@escolalms/sdk/lib/types";
import { EscolaLMSContext } from "@escolalms/sdk/lib/react/context";
import { getFontFromTheme } from "../../../theme/provider";
import { Spin } from "../../atoms/Spin/Spin";
Expand Down
Loading