Skip to content

Commit

Permalink
various updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jsladerman committed Nov 5, 2024
1 parent 20e8cc2 commit 5fe5080
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 50 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
"babel-plugin-styled-components": "2.1.4",
"chroma-js": "2.4.2",
"classnames": "2.3.2",
"dayjs": "1.11.13",
"highlight.js": "11.9.0",
"honorable-recipe-mapper": "0.2.0",
"immer": "10.0.3",
"lodash-es": "4.17.21",
"moment": "2.29.4",
"react-animate-height": "3.2.3",
"react-aria": "3.34.3",
"react-embed": "3.7.0",
Expand Down
8 changes: 4 additions & 4 deletions src/components/Date.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Span } from 'honorable'

import moment from 'moment'
import dayjs from 'dayjs'
import styled from 'styled-components'

const Wrap = styled.div({
Expand All @@ -19,13 +19,13 @@ const T = styled.span(({ theme }) => ({
whiteSpace: 'nowrap',
}))

export default function Date({ date }: { date: moment.MomentInput }) {
export default function Date({ date }: { date: dayjs.ConfigType }) {
if (!date) return <Span>n/a</Span>

return (
<Wrap>
<D>{moment(date).format('ll')}</D>
<T>{moment(date).format('h:mm A')}</T>
<D>{dayjs(date).format('MMM D, YYYY')}</D>
<T>{dayjs(date).format('h:mm A')}</T>
</Wrap>
)
}
5 changes: 3 additions & 2 deletions src/components/ModalWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ function ModalWrapperRef(
)
}

const ContentSC = styled(Dialog.Content)({
const ContentSC = styled(Dialog.Content)(({ theme }) => ({
display: 'flex',
flexDirection: 'column',
overflow: 'auto',
boxShadow: theme.boxShadows.modal,
'@keyframes popIn': {
from: { transform: 'scale(0.8)' },
to: { transform: 'scale(1)' },
Expand All @@ -76,7 +77,7 @@ const ContentSC = styled(Dialog.Content)({
'&[data-state="closed"]': {
animation: `popOut ${ANIMATION_SPEED} ease-out`,
},
})
}))

const OverlaySC = styled(Dialog.Overlay)(({ theme }) => ({
display: 'flex',
Expand Down
6 changes: 3 additions & 3 deletions src/components/icons/EKSIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import createIcon from './createIcon'

export default createIcon(({ size }) => (
export default createIcon(({ size, color, fullColor }) => (
<svg
width={size}
height={size}
Expand All @@ -23,10 +23,10 @@ export default createIcon(({ size }) => (
y2="7.00024"
gradientUnits="userSpaceOnUse"
>
<stop stopColor="#DF6440" />
<stop stopColor={fullColor ? '#DF6440' : color} />
<stop
offset="1"
stopColor="#E9973D"
stopColor={fullColor ? '#E9973D' : color}
/>
</linearGradient>
<clipPath id="clip0_4976_27653">
Expand Down
10 changes: 5 additions & 5 deletions src/components/icons/GKEIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import createIcon from './createIcon'

export default createIcon(({ size }) => (
export default createIcon(({ size, color, fullColor }) => (
<svg
width={size}
height={size}
Expand All @@ -11,19 +11,19 @@ export default createIcon(({ size }) => (
<g clipPath="url(#clip0_5020_600)">
<path
d="M8.2999 4.09995V0.699951H7.6999V4.19995L4.8999 5.79995L7.9999 7.49995L11.0999 5.69995L8.2999 4.09995Z"
fill="#7CADF9"
fill={fullColor ? '#7CADF9' : color}
/>
<path
d="M13.9999 11.1999L11.3999 9.6999V6.3999L8.3999 8.1999V11.7999L11.1999 10.1999L13.7999 11.6999L13.9999 11.1999Z"
fill="#1467F0"
fill={fullColor ? '#1467F0' : color}
/>
<path
d="M7.60005 8.1999L4.50005 6.3999V9.5999L1.80005 11.1999L2.10005 11.6999L4.80005 10.0999L7.60005 11.6999V8.1999Z"
fill="#3381F4"
fill={fullColor ? '#3381F4' : color}
/>
<path
d="M14.9001 12V4L8.0001 0L1.1001 4V12L8.0001 16L14.9001 12ZM8.0001 14.2L2.6001 11.1V4.9L8.0001 1.8L13.4001 4.9V11.1L8.0001 14.2Z"
fill="#7CADF9"
fill={fullColor ? '#7CADF9' : color}
/>
</g>
<defs>
Expand Down
17 changes: 0 additions & 17 deletions src/components/icons/TerraformIcon.tsx

This file was deleted.

15 changes: 7 additions & 8 deletions src/components/icons/TerraformLogoIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import createIcon from './createIcon'

export default createIcon(({ size, color }) => (
export default createIcon(({ size, color, fullColor }) => (
<svg
width={size}
viewBox="0 0 15 17"
height={size}
viewBox="0 0 16 17"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M14.0529 8.24839L9.73453 10.7393V5.7548L14.0529 3.2586V8.24839Z"
fill={color}
stroke={color}
strokeWidth="0.0549999"
d="M10.7065 10.784L15.0799 8.26134V3.20801L10.7065 5.73601V10.784Z"
fill={fullColor ? '#4040B2' : color}
/>
<path
d="M4.85333 3.20929L9.22667 5.73729V10.7853L4.85333 8.25996M0 5.44129L4.37333 7.96663V2.91596L0 0.390625M4.85333 13.8653L9.22667 16.3906V11.34L4.85333 8.81463"
fill={color}
d="M5.85333 3.20832L10.2267 5.73632V10.7843L5.85333 8.25898M1 5.44032L5.37333 7.96565V2.91498L1 0.389648M5.85333 13.8643L10.2267 16.3896V11.339L5.85333 8.81365"
fill={fullColor ? '#5C4EE5' : color}
/>
</svg>
))
1 change: 0 additions & 1 deletion src/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ export { default as SuitcaseIcon } from './components/icons/SuitcaseIcon'
export { default as TableIcon } from './components/icons/TableIcon'
export { default as TagIcon } from './components/icons/TagIcon'
export { default as TerminalIcon } from './components/icons/TerminalIcon'
export { default as TerraformIcon } from './components/icons/TerraformIcon'
export { default as TerraformLogoIcon } from './components/icons/TerraformLogoIcon'
export { default as TestTubeIcon } from './components/icons/TestTubeIcon'
export { default as ThumbsUpFilledIcon } from './components/icons/ThumbsUpFilledIcon'
Expand Down
1 change: 0 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export type {
} from './components/AppList'
export { AppList } from './components/AppList'
export { default as Slider } from './components/Slider'
export { default as Layer } from './components/Layer'
export { Breadcrumbs } from './components/Breadcrumbs'
export { DatePicker } from './components/DatePicker'
export { Switch } from './components/Switch'
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2616,6 +2616,7 @@ __metadata:
chroma-js: 2.4.2
classnames: 2.3.2
conventional-changelog-conventionalcommits: 6.1.0
dayjs: 1.11.13
eslint: 8.55.0
eslint-config-prettier: 9.1.0
eslint-plugin-import: 2.29.1
Expand All @@ -2638,7 +2639,6 @@ __metadata:
jsdom: 23.0.1
lint-staged: 15.2.0
lodash-es: 4.17.21
moment: 2.29.4
npm-run-all: 4.1.5
prettier: 3.0.3
react: 18.3.1
Expand Down Expand Up @@ -8078,6 +8078,13 @@ __metadata:
languageName: node
linkType: hard

"dayjs@npm:1.11.13":
version: 1.11.13
resolution: "dayjs@npm:1.11.13"
checksum: f388db88a6aa93956c1f6121644e783391c7b738b73dbc54485578736565c8931bdfba4bb94e9b1535c6e509c97d5deb918bbe1ae6b34358d994de735055cca9
languageName: node
linkType: hard

"debounce@npm:^1.2.1":
version: 1.2.1
resolution: "debounce@npm:1.2.1"
Expand Down Expand Up @@ -13551,13 +13558,6 @@ __metadata:
languageName: node
linkType: hard

"moment@npm:2.29.4":
version: 2.29.4
resolution: "moment@npm:2.29.4"
checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
languageName: node
linkType: hard

"morgan@npm:^1.10.0, morgan@npm:^1.8.2":
version: 1.10.0
resolution: "morgan@npm:1.10.0"
Expand Down

0 comments on commit 5fe5080

Please sign in to comment.