Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b38f3d7
Swapping the icons on the Browse by Topics (and elsewhere since this …
jkachel Jun 24, 2024
87f4fc7
Swapping out the rest of the icons that were marked
jkachel Jun 24, 2024
34a81be
Removing a bunch of SVG icons that we don't need anymore (they're all…
jkachel Jun 24, 2024
047372c
forgot one
jkachel Jun 24, 2024
7cc0475
swapping out last few icons
jkachel Jun 27, 2024
8a646e5
Swapping icon on Learning Resource Card
jkachel Jun 28, 2024
0ec229a
Figured these two out so swapping - these may need to change though
jkachel Jun 28, 2024
67240fc
Explicitly adding a data-testid to the grab handles on the card templ…
jkachel Jun 28, 2024
542bc20
switching some more icons
shanbady Jul 2, 2024
ac55754
some more remixicon replacements
shanbady Jul 2, 2024
76435b1
adding remixicon as dependency
shanbady Jul 2, 2024
0a46b40
fixing icon
shanbady Jul 2, 2024
6430d3c
replacing external link icon
shanbady Jul 2, 2024
74e812f
fixing visual issue
shanbady Jul 2, 2024
e645bdc
swapping out more remixicons
shanbady Jul 2, 2024
aafad5c
updating yarn locklfile
shanbady Jul 2, 2024
8924ef4
updating package json
shanbady Jul 2, 2024
aa4ae74
making some more replacements
shanbady Jul 2, 2024
3106f4c
replacing some more icons
shanbady Jul 2, 2024
ec333ef
Merge branch 'main' into jkachel/4589-4104-update-all-icons-to-remixicon
shanbady Jul 2, 2024
c6a1440
replacing more icons
shanbady Jul 2, 2024
947b272
fixing size
shanbady Jul 2, 2024
cd8b6fc
replacing storybook references to mui
shanbady Jul 2, 2024
d08a38f
removing material icon package
shanbady Jul 2, 2024
43989c6
removing final refs to mui icon
shanbady Jul 2, 2024
4aec56a
Merge branch 'main' into jkachel/4589-4104-update-all-icons-to-remixicon
shanbady Jul 2, 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
5 changes: 0 additions & 5 deletions frontends/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ function restrictedImports({ paths = [], patterns = [] } = {}) {
message: "Please use @faker-js/faker/locale/en instead.",
allowTypeImports: true,
},
{
name: "@mui/icons-material",
message: "Please use @mui/icons-material/<ICON_NAME> instead.",
allowTypeImports: true,
},
{
name: "@mui/material",
message: "Please use @mui/material/<COMPONENT_NAME> instead.",
Expand Down
1 change: 0 additions & 1 deletion frontends/mit-open/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"dependencies": {
"@ebay/nice-modal-react": "^1.2.13",
"@mitodl/course-search-utils": "^3.1.4",
"@mui/icons-material": "^5.15.15",
"@remixicon/react": "^4.2.0",
"@sentry/react": "^7.57.0",
"@tanstack/react-query": "^4.36.1",
Expand Down
6 changes: 0 additions & 6 deletions frontends/mit-open/public/images/navdrawer/certificate.svg

This file was deleted.

10 changes: 0 additions & 10 deletions frontends/mit-open/public/images/navdrawer/courses.svg

This file was deleted.

8 changes: 0 additions & 8 deletions frontends/mit-open/public/images/navdrawer/departments.svg

This file was deleted.

5 changes: 0 additions & 5 deletions frontends/mit-open/public/images/navdrawer/free.svg

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions frontends/mit-open/public/images/navdrawer/new.svg

This file was deleted.

7 changes: 0 additions & 7 deletions frontends/mit-open/public/images/navdrawer/pathways.svg

This file was deleted.

12 changes: 0 additions & 12 deletions frontends/mit-open/public/images/navdrawer/popular.svg

This file was deleted.

15 changes: 0 additions & 15 deletions frontends/mit-open/public/images/navdrawer/programs.svg

This file was deleted.

11 changes: 0 additions & 11 deletions frontends/mit-open/public/images/navdrawer/provider.svg

This file was deleted.

17 changes: 0 additions & 17 deletions frontends/mit-open/public/images/navdrawer/topics.svg

This file was deleted.

4 changes: 2 additions & 2 deletions frontends/mit-open/src/components/ChannelMenu/ChannelMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useMemo } from "react"
import * as routes from "../../common/urls"
import { SimpleMenu, ActionButton, styled } from "ol-components"
import type { SimpleMenuItem } from "ol-components"
import SettingsIcon from "@mui/icons-material/Settings"
import { RiSettings4Fill } from "@remixicon/react"

const InvertedButton = styled(ActionButton)({ color: "white" })

Expand All @@ -29,7 +29,7 @@ const ChannelMenu: React.FC<{ channelType: string; name: string }> = ({
items={items}
trigger={
<InvertedButton variant="text">
<SettingsIcon />
<RiSettings4Fill />
</InvertedButton>
}
/>
Expand Down
32 changes: 16 additions & 16 deletions frontends/mit-open/src/components/RootTopicIcon/RootTopicIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import {
RiPaletteLine,
RiSeedlingLine,
RiBriefcaseLine,
RiMacbookLine,
RiBarChartBoxLine,
RiShakeHandsLine,
RiEarthLine,
RiLightbulbLine,
RiBuildingLine,
RiServiceLine,
RiQuillPenLine,
RiMicroscopeLine,
RiBriefcase3Line,
RiLightbulbFlashLine,
RiRobot2Line,
RiStethoscopeLine,
RiInfinityLine,
RiTestTubeLine,
RiUserSearchLine,
} from "@remixicon/react"
import React from "react"

/* TODO Using any icons until we have a solution for specifying them */
const ICON_MAP = {
Business: RiBriefcaseLine,
Energy: RiLightbulbLine,
Engineering: RiBuildingLine,
Business: RiBriefcase3Line,
Energy: RiLightbulbFlashLine,
Engineering: RiRobot2Line,
"Fine Arts": RiPaletteLine,
"Health and Medicine": RiServiceLine,
"Health and Medicine": RiStethoscopeLine,
Humanities: RiQuillPenLine,
Mathematics: RiBarChartBoxLine,
Science: RiMicroscopeLine,
"Social Science": RiSeedlingLine,
Mathematics: RiInfinityLine,
Science: RiTestTubeLine,
"Social Science": RiUserSearchLine,
Society: RiEarthLine,
"Teaching and Education": RiMacbookLine,
"Teaching and Education": RiShakeHandsLine,
}

type RootTopicIconProps = { name: string }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
styled,
TruncateText,
} from "ol-components"
import DragIndicatorIcon from "@mui/icons-material/DragIndicator"
import { RiDraggable } from "@remixicon/react"
import {
DEFAULT_RESOURCE_IMG,
EmbedlyConfig,
Expand Down Expand Up @@ -238,7 +238,7 @@ const CardTemplate = ({
</Details>
{sortable ? (
<DragHandle>
<DragIndicatorIcon fontSize="inherit" />
<RiDraggable fontSize="inherit" data-testid="CardDraggable" />
</DragHandle>
) : null}
</StyledCardContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useMemo } from "react"
import { styled, Typography, Box } from "ol-components"
import { capitalize } from "ol-utilities"
import { ChannelTypeEnum, Channel } from "api/v0"
import OpenInNewIcon from "@mui/icons-material/OpenInNew"
import { RiExternalLinkLine } from "@remixicon/react"

type ChannelDetailsProps = {
channel: Channel
Expand Down Expand Up @@ -90,7 +90,7 @@ const getFacetManifest = (channelType: ChannelTypeEnum) => {
title: "More Information",
labelFunction: (key: string, channelTitle: string) => (
<a href={key}>
{channelTitle} website <OpenInNewIcon fontSize="inherit" />
{channelTitle} website <RiExternalLinkLine size={18} />
</a>
),
order: 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import {
styled,
} from "ol-components"

import LockOpenIcon from "@mui/icons-material/LockOpen"
import LockIcon from "@mui/icons-material/Lock"
import { RiLockLine, RiLockUnlockLine, RiAddLine } from "@remixicon/react"

import AddIcon from "@mui/icons-material/Add"
import * as NiceModal from "@ebay/nice-modal-react"

import {
Expand Down Expand Up @@ -209,7 +207,7 @@ const PrivacyChip: React.FC<PrivacyChipProps> = ({
selectedOption,
}) => {
const isPublic = selectedOption === publicOption
const icon = isPublic ? <LockOpenIcon /> : <LockIcon />
const icon = isPublic ? <RiLockUnlockLine /> : <RiLockLine />
return <Chip icon={icon} label={selectedOption} size="medium" />
}

Expand Down Expand Up @@ -253,7 +251,7 @@ const AddToListDialogInner: React.FC<AddToListDialogInnerProps> = ({
<ListItemButton
onClick={() => manageListDialogs.upsertLearningPath()}
>
<AddIcon />
<RiAddLine />
<ListItemText primary="Create a new list" />
</ListItemButton>
</ListItem>
Expand All @@ -269,7 +267,7 @@ const AddToListDialogInner: React.FC<AddToListDialogInnerProps> = ({
<ListItemButton
onClick={() => manageListDialogs.upsertUserList()}
>
<AddIcon />
<RiAddLine />
<ListItemText primary="Create a new list" />
</ListItemButton>
</ListItem>
Expand Down
40 changes: 27 additions & 13 deletions frontends/mit-open/src/page-components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,21 @@ import {
ClickAwayListener,
ActionButtonLink,
} from "ol-components"
import { RiSearch2Line } from "@remixicon/react"
import {
RiSearch2Line,
RiPencilRulerLine,
RiStackLine,
RiSignpostLine,
RiBookMarkedLine,
RiPresentationLine,
RiNodeTree,
RiVerifiedBadgeLine,
RiFileAddLine,
RiTimeLine,
RiHeartLine,
RiPriceTag3Line,
RiAwardLine,
} from "@remixicon/react"
import { MITLogoLink, useToggle } from "ol-utilities"
import UserMenu from "./UserMenu"
import { MenuButton } from "./MenuButton"
Expand Down Expand Up @@ -151,26 +165,26 @@ const navData: NavData = {
items: [
{
title: "Courses",
icon: "/static/images/navdrawer/courses.svg",
icon: <RiPencilRulerLine />,
description: "Learn with MIT instructors",
href: querifiedSearchUrl({ resource_category: "course" }),
},
{
title: "Programs",
icon: "/static/images/navdrawer/programs.svg",
icon: <RiStackLine />,
description:
"Learn in-depth from a series of courses and earn a certificate",
href: querifiedSearchUrl({ resource_category: "program" }),
},
{
title: "Pathways",
icon: "/static/images/navdrawer/pathways.svg",
icon: <RiSignpostLine />,
description:
"Achieve your learning goals with a curated collection of courses",
},
{
title: "Learning Materials",
icon: "/static/images/navdrawer/learning_materials.svg",
icon: <RiBookMarkedLine />,
description:
"Free teaching and learning materials including videos, podcasts, lecture notes, etc.",
href: querifiedSearchUrl({ resource_category: "learning_material" }),
Expand All @@ -182,17 +196,17 @@ const navData: NavData = {
items: [
{
title: "By Topic",
icon: "/static/images/navdrawer/topics.svg",
icon: <RiPresentationLine />,
href: TOPICS,
},
{
title: "By Departments",
icon: "/static/images/navdrawer/departments.svg",
icon: <RiNodeTree />,
href: DEPARTMENTS,
},
{
title: "By Provider",
icon: "/static/images/navdrawer/provider.svg",
icon: <RiVerifiedBadgeLine />,
href: UNITS,
},
],
Expand All @@ -202,27 +216,27 @@ const navData: NavData = {
items: [
{
title: "New",
icon: "/static/images/navdrawer/new.svg",
icon: <RiFileAddLine />,
href: querifiedSearchUrl({ sortby: "new" }),
},
{
title: "Upcoming",
icon: "/static/images/navdrawer/free.svg",
icon: <RiTimeLine />,
href: querifiedSearchUrl({ sortby: "upcoming" }),
},
{
title: "Popular",
icon: "/static/images/navdrawer/popular.svg",
href: querifiedSearchUrl({ sortby: "-views" }),
icon: <RiHeartLine />,
},
{
title: "Free",
icon: "/static/images/navdrawer/free.svg",
icon: <RiPriceTag3Line />,
href: querifiedSearchUrl({ free: "true" }),
},
{
title: "With Certificate",
icon: "/static/images/navdrawer/certificate.svg",
icon: <RiAwardLine />,
href: querifiedSearchUrl({ certification: "true" }),
},
],
Expand Down
Loading