Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add lock/unlock icons; rename previous lock to paywall #340

Merged
merged 3 commits into from
Jul 25, 2024
Merged

feat: add lock/unlock icons; rename previous lock to paywall #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ac5456
feat: add lock/unlock icons; rename previous lock to paywall
nastyastavitskaya Jul 24, 2024
f765e5f
Merge branch 'main' into feat/act-lock-icons
nastyastavitskaya Jul 24, 2024
6d9ee50
Update NavigationCreate.tsx
nastyastavitskaya Jul 24, 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
3 changes: 3 additions & 0 deletions src/assets/svg/mp_act_lt_lock.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/mp_act_lt_unlock.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 src/assets/svg/lock.svg → src/assets/svg/paywall.svg
View file
Open in desktop
File renamed without changes
10 changes: 7 additions & 3 deletions src/components/icons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import IdentityIcon from 'src/assets/svg/mp_pm_lt_identity.svg?react'
import JumpToIcon from 'src/assets/svg/mp_act_lt_jump-to.svg?react'
import LightBulbIcon from 'src/assets/svg/lightbulb.svg?react'
import LiveStreamIcon from 'src/assets/svg/mp_pm_lt_live-stream.svg?react'
import LockIcon from 'src/assets/svg/lock.svg?react'
import PaywallIcon from 'src/assets/svg/paywall.svg?react'
nastyastavitskaya marked this conversation as resolved.
Show resolved Hide resolved
nastyastavitskaya marked this conversation as resolved.
Show resolved Hide resolved
import MessageQuestionIcon from 'src/assets/svg/message-question.svg?react'
import MpLogoIcon from 'src/assets/svg/mpLogo.svg?react'
import ObservabilityIcon from 'src/assets/svg/mp_pm_lt_observability.svg?react'
Expand Down Expand Up @@ -55,7 +55,9 @@ import HelpVideoIcon from 'src/assets/svg/mp_info_lt_help-video.svg?react'
import NextIcon from 'src/assets/svg/mp_act_lt_next.svg?react'
import OpenTabIcon from 'src/assets/svg/mp_act_lt_open-tab.svg?react'
import PreviousIcon from 'src/assets/svg/mp_act_lt_previous.svg?react'
import DirectoryIcon from 'src/assets/svg//mp_pm_lt_directory.svg?react'
import DirectoryIcon from 'src/assets/svg/mp_pm_lt_directory.svg?react'
import LockIcon from 'src/assets/svg/mp_act_lt_lock.svg?react'
import UnlockIcon from 'src/assets/svg/mp_act_lt_unlock.svg?react'

export {
AddIcon,
Expand Down Expand Up @@ -88,7 +90,7 @@ export {
JumpToIcon,
LightBulbIcon,
LiveStreamIcon,
LockIcon,
PaywallIcon,
MessageQuestionIcon,
MpLogoIcon,
ObservabilityIcon,
Expand Down Expand Up @@ -116,4 +118,6 @@ export {
NextIcon,
PreviousIcon,
DirectoryIcon,
LockIcon,
UnlockIcon,
}
4 changes: 2 additions & 2 deletions src/components/navigation/GlobalNavigation/NavigationCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function NavigationCreate(props: INavigationCreateProps) {
<span className="navigationCreate__itemTitle">
{item.title}
{item.isLoading && <Spin className="navigationCreate__itemLoading" size="small" />}
{isLocked && <Icon name="lock" size="xs" />}
{isLocked && <Icon name="paywall" size="xs" />}
</span>

<span className="navigationCreate__itemDescription">{item.description}</span>
Expand Down Expand Up @@ -93,4 +93,4 @@ export function NavigationCreate(props: INavigationCreateProps) {
/>
</Center>
)
}
}
8 changes: 6 additions & 2 deletions src/constants/Icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
JumpToIcon,
LightBulbIcon,
LiveStreamIcon,
LockIcon,
PaywallIcon,
MessageQuestionIcon,
MpLogoIcon,
ObservabilityIcon,
Expand Down Expand Up @@ -57,6 +57,8 @@ import {
PreviousIcon,
OpenTabIcon,
DirectoryIcon,
LockIcon,
UnlockIcon,
} from 'src/components/icons'

export const Icons = {
Expand Down Expand Up @@ -88,7 +90,7 @@ export const Icons = {
jumpTo: JumpToIcon,
lightBulb: LightBulbIcon,
liveStream: LiveStreamIcon,
lock: LockIcon,
paywall: PaywallIcon,
messageQuestion: MessageQuestionIcon,
mpLogo: MpLogoIcon,
observability: ObservabilityIcon,
Expand Down Expand Up @@ -118,4 +120,6 @@ export const Icons = {
previous: PreviousIcon,
openTab: OpenTabIcon,
directory: DirectoryIcon,
lock: LockIcon,
unlock: UnlockIcon,
} as const
Loading