diff --git a/services/cms/src/blocks/ExerciseTask/ExerciseTaskEditor.tsx b/services/cms/src/blocks/ExerciseTask/ExerciseTaskEditor.tsx index 0c3057f7f2ee..40b994af1b1f 100644 --- a/services/cms/src/blocks/ExerciseTask/ExerciseTaskEditor.tsx +++ b/services/cms/src/blocks/ExerciseTask/ExerciseTaskEditor.tsx @@ -1,7 +1,6 @@ import { css, cx } from "@emotion/css" import styled from "@emotion/styled" -import { faPenSquare, faTrashAlt, faWindowClose } from "@fortawesome/free-solid-svg-icons" -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" +import { PencilBox, Trash, XmarkCircle } from "@vectopus/atlas-icons-react" import { InnerBlocks } from "@wordpress/block-editor" import { BlockEditProps } from "@wordpress/blocks" import React, { useContext, useState } from "react" @@ -56,20 +55,6 @@ const gray500WithHover = css` } ` -// eslint-disable-next-line i18next/no-literal-string -const StyledIconDark = styled(FontAwesomeIcon)` - font-size: 1rem; - color: ${baseTheme.colors.gray[700]}; - margin: 1.5rem; -` - -// eslint-disable-next-line i18next/no-literal-string -const StyledIconLight = styled(FontAwesomeIcon)` - font-size: 1rem; - color: ${baseTheme.colors.gray[100]}; - margin: 1.5rem; -` - export interface ExerciseTaskAttributes { id: string exercise_type: string @@ -155,7 +140,23 @@ const ExerciseTaskEditor: React.FC< tabIndex={0} aria-label={attributes.show_editor ? t("close") : t("edit")} > - + {attributes.show_editor ? ( + + ) : ( + + )}
- +
diff --git a/services/cms/src/components/editors/EmailEditor.tsx b/services/cms/src/components/editors/EmailEditor.tsx index 3330daa87c07..2aa7c63d09db 100644 --- a/services/cms/src/components/editors/EmailEditor.tsx +++ b/services/cms/src/components/editors/EmailEditor.tsx @@ -1,5 +1,5 @@ -import SaveIcon from "@mui/icons-material/Save" import LoadingButton from "@mui/lab/LoadingButton" +import { FloppyDiskSave } from "@vectopus/atlas-icons-react" import { BlockInstance } from "@wordpress/blocks" import dynamic from "next/dynamic" import React, { useContext, useState } from "react" @@ -79,7 +79,7 @@ const EmailEditor: React.FC> = ({ } + startIcon={} loading={saving} onClick={handleOnSave} > diff --git a/services/cms/src/components/editors/ExamsInstructionsEditor.tsx b/services/cms/src/components/editors/ExamsInstructionsEditor.tsx index 588d4dee5456..7a4bde9b841f 100644 --- a/services/cms/src/components/editors/ExamsInstructionsEditor.tsx +++ b/services/cms/src/components/editors/ExamsInstructionsEditor.tsx @@ -1,5 +1,5 @@ -import SaveIcon from "@mui/icons-material/Save" import LoadingButton from "@mui/lab/LoadingButton" +import { FloppyDiskSave } from "@vectopus/atlas-icons-react" import { BlockInstance } from "@wordpress/blocks" import dynamic from "next/dynamic" import React, { useState } from "react" @@ -68,7 +68,7 @@ const ExamsInstructionsEditor: React.FC} + startIcon={} loading={saving} onClick={handleOnSave} > diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/ExerciseTask.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/ExerciseTask.tsx index f2492996583c..034a3f1ec9ec 100644 --- a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/ExerciseTask.tsx +++ b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/ExerciseTask.tsx @@ -1,6 +1,5 @@ import { css } from "@emotion/css" -import { faCircleInfo as infoIcon } from "@fortawesome/free-solid-svg-icons" -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" +import { InfoCircle } from "@vectopus/atlas-icons-react" import React, { useContext } from "react" import { useTranslation } from "react-i18next" @@ -90,7 +89,7 @@ const ExerciseTask: React.FC> = ({ } `} > - + {feedbackText} )} diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx index 51a49ba2ffb0..5338424dac80 100644 --- a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx +++ b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx @@ -3,7 +3,7 @@ import styled from "@emotion/styled" import { faQuestion as infoIcon } from "@fortawesome/free-solid-svg-icons" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { useQuery, useQueryClient } from "@tanstack/react-query" -import CheckIcon from "humbleicons/icons/check.svg" +import { CheckCircle } from "@vectopus/atlas-icons-react" import { produce } from "immer" import { useContext, useId, useReducer, useState } from "react" import { useTranslation } from "react-i18next" @@ -474,8 +474,8 @@ const ExerciseBlock: React.FC< padding: 0.7rem 1rem; margin: 1rem 0; border: 1px solid ${baseTheme.colors.green[300]}; - display: flex; + align-items: center; svg { width: 80px; @@ -483,7 +483,8 @@ const ExerciseBlock: React.FC< } `} > - + +
{t("exam-submission-has-been-saved-help-text")}
)} diff --git a/services/course-material/src/components/HeadingsNavigation.tsx b/services/course-material/src/components/HeadingsNavigation.tsx index e0cf5a76dd32..cc2be673d3c6 100644 --- a/services/course-material/src/components/HeadingsNavigation.tsx +++ b/services/course-material/src/components/HeadingsNavigation.tsx @@ -1,7 +1,6 @@ import { css } from "@emotion/css" import styled from "@emotion/styled" -import { faArrowLeft, faArrowRight } from "@fortawesome/free-solid-svg-icons" -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" +import { ArrowLeft, ArrowRight } from "@vectopus/atlas-icons-react" import { maxBy, minBy } from "lodash" import { useCallback, useContext, useEffect, useRef, useState } from "react" import { useTranslation } from "react-i18next" @@ -341,7 +340,11 @@ const HeadingsNavigation: React.FC - + {realCollapsed ? ( + + ) : ( + + )} ) diff --git a/services/course-material/src/components/SearchDialog.tsx b/services/course-material/src/components/SearchDialog.tsx index 37b24b8b06fc..b20be6097ecb 100644 --- a/services/course-material/src/components/SearchDialog.tsx +++ b/services/course-material/src/components/SearchDialog.tsx @@ -1,7 +1,6 @@ import { css, cx } from "@emotion/css" import styled from "@emotion/styled" -import { faXmark as closeIcon, faSearch } from "@fortawesome/free-solid-svg-icons" -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" +import { MagnifyingGlass, XmarkCircle } from "@vectopus/atlas-icons-react" import Link from "next/link" import React, { useEffect, useMemo, useState } from "react" import { useTranslation } from "react-i18next" @@ -31,6 +30,8 @@ const HeaderBar = styled.div` ` const StyledIcon = css` + right: -8px; + bottom: -2px; :hover { cursor: pointer; } @@ -106,24 +107,20 @@ const SearchDialog: React.FC> = ({ setOpen(true) } - const openModalOnEnter = (event: React.KeyboardEvent) => { - if (event.key == "Enter") { - setOpen(true) - } - } - return ( <> - + > + +
> = ({ `} > - + > = ({ aria-label={t("close")} onClick={closeModal} > - +
> = ({ domai `} onClick={() => setEditingRole({ userId: ur.id, newRole: ur.role })} > - + @@ -344,7 +345,7 @@ export const PermissionPage: React.FC> = ({ domai setEditingRole(null) }} > - + {" "} diff --git a/services/main-frontend/src/components/page-specific/manage/exercise-services/ExerciseServiceCard.tsx b/services/main-frontend/src/components/page-specific/manage/exercise-services/ExerciseServiceCard.tsx index a3e8fe5c4e60..27b565fbdc64 100644 --- a/services/main-frontend/src/components/page-specific/manage/exercise-services/ExerciseServiceCard.tsx +++ b/services/main-frontend/src/components/page-specific/manage/exercise-services/ExerciseServiceCard.tsx @@ -1,8 +1,13 @@ import { css } from "@emotion/css" -import DoneIcon from "@mui/icons-material/Done" -import ErrorIcon from "@mui/icons-material/Error" import { QueryObserverResult } from "@tanstack/react-query" -import { FloppyDiskSave, Pencil, Trash, XmarkCircle } from "@vectopus/atlas-icons-react" +import { + BellXmark, + CheckCircle, + FloppyDiskSave, + Pencil, + Trash, + XmarkCircle, +} from "@vectopus/atlas-icons-react" import { useState } from "react" import { useTranslation } from "react-i18next" @@ -172,9 +177,9 @@ const ExerciseServiceCard: React.FC ) : status == UpdateStatus.saved ? ( - + ) : ( - + )}
diff --git a/services/main-frontend/src/pages/playground-views.tsx b/services/main-frontend/src/pages/playground-views.tsx index 72417185975e..c498e428a928 100644 --- a/services/main-frontend/src/pages/playground-views.tsx +++ b/services/main-frontend/src/pages/playground-views.tsx @@ -1,10 +1,8 @@ import { css } from "@emotion/css" import styled from "@emotion/styled" -import { faCheck, faXmark } from "@fortawesome/free-solid-svg-icons" -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { isServer, useQuery } from "@tanstack/react-query" +import { BellXmark, CheckCircle, MoveUpDownArrows } from "@vectopus/atlas-icons-react" import axios from "axios" -import ArrowsVertical from "humbleicons/icons/arrows-vertical.svg" import _ from "lodash" import React, { useEffect, useState } from "react" import { useForm } from "react-hook-form" @@ -390,14 +388,12 @@ const IframeViewPlayground: React.FC> = () => { padding-left: 1rem; `} > - + {isValidServiceInfo ? ( + + ) : ( + + )} + > = () => { align-items: center; `} > - +