Skip to content
Open
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 www/src/components/Invite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react'
import { useParams } from 'react-router-dom'
import { gql, useMutation, useQuery } from '@apollo/client'
import { Box, Keyboard } from 'grommet'
import { GqlError } from 'forge-core'
// import { GqlError } from 'forge-core'
import { AppIcon, Button } from '@pluralsh/design-system'

import { Text } from 'honorable'
Expand Down
6 changes: 3 additions & 3 deletions www/src/components/incidents/CreateIncident.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import {
useState,
} from 'react'
import { Box, Text, TextInput } from 'grommet'
import { Button, SecondaryButton } from 'forge-core'
import { Editable, Slate } from 'slate-react'
import { useMutation, useQuery } from '@apollo/client'
import { CheckIcon } from '@pluralsh/design-system'
import { Button, CheckIcon } from '@pluralsh/design-system'

import { useEditor } from '../utils/hooks'
import { plainDeserialize, plainSerialize } from '../../utils/slate'
Expand Down Expand Up @@ -221,7 +220,8 @@ export function CreateIncident({ onCompleted }: any) {
justify="end"
gap="small"
>
<SecondaryButton
<Button
secondary
label="Cancel"
onClick={onCompleted}
/>
Expand Down
4 changes: 2 additions & 2 deletions www/src/components/incidents/File.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useState } from 'react'
import { Box, Stack, Text } from 'grommet'
import { FileIcon, defaultStyles } from 'react-file-icon'
import { HoveredBackground, Tooltip } from 'forge-core'
// import { HoveredBackground } from 'forge-core'
import moment from 'moment'
import { filesize } from 'filesize'
import { DownloadIcon } from '@pluralsh/design-system'
import { DownloadIcon, Tooltip } from '@pluralsh/design-system'

import { download } from '../../utils/file'

Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/Followers.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from 'react'
import { Box, Text } from 'grommet'
import { Scroller } from 'forge-core'
// import { Scroller } from 'forge-core'

import { extendConnection } from '../../utils/graphql'
import Avatar from '../users/Avatar'
Expand Down
3 changes: 2 additions & 1 deletion www/src/components/incidents/Incident.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
useMemo,
useState,
} from 'react'
import { Button, Scroller } from 'forge-core'
// import { Scroller } from 'forge-core'
import { Editable, Slate } from 'slate-react'
import { useMutation, useQuery, useSubscription } from '@apollo/client'
import { useNavigate, useParams } from 'react-router-dom'
Expand All @@ -17,6 +17,7 @@ import {
} from 'grommet'
import moment from 'moment'
import {
Button,
CloseIcon,
FileIcon,
MessagesIcon,
Expand Down
5 changes: 3 additions & 2 deletions www/src/components/incidents/IncidentControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
Layer,
Text,
} from 'grommet'
import { Button, SecondaryButton } from 'forge-core'
import {
Button,
CameraIcon,
CheckIcon,
LightningIcon,
Expand Down Expand Up @@ -117,7 +117,8 @@ function CompleteIncident({ incident: { id } }: any) {
align="center"
gap="xsmall"
>
<SecondaryButton
<Button
secondary
label="Cancel"
onClick={() => setOpen(false)}
/>
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/IncidentStatus.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from 'react'
import { Box, Text } from 'grommet'
import { Select } from 'forge-core'
import { Select } from '@pluralsh/design-system'

import { ThemeContext } from 'styled-components'

Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/Incidents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
TextInput,
ThemeContext,
} from 'grommet'
import { Button } from 'forge-core'
import {
Button,
CaretRightIcon,
CheckIcon,
CloseIcon,
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/Markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
Markdown,
Text,
} from 'grommet'
import { TooltipContent } from 'forge-core'
// import { TooltipContent } from 'forge-core'
import sortBy from 'lodash/sortBy'
import { Emoji as Emojii } from 'emoji-mart'

Expand Down
12 changes: 6 additions & 6 deletions www/src/components/incidents/MessageControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import {
useState,
} from 'react'
import { Box, Drop, Text } from 'grommet'
import {
Edit,
Emoji,
TooltipContent,
Trash,
} from 'forge-core'
// import {
// Edit,
// Emoji,
// TooltipContent,
// Trash,
// } from 'forge-core'
import { useMutation } from '@apollo/client'
import { useParams } from 'react-router-dom'

Expand Down
12 changes: 6 additions & 6 deletions www/src/components/incidents/MessageInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import { MoonLoader, SyncLoader } from 'react-spinners'
import { Progress } from 'react-sweet-progress'
import { Editor as SlateEditor, Transforms } from 'slate'
import { useParams } from 'react-router-dom'
import {
Attachment,
Close,
Emoji,
SendMessage,
} from 'forge-core'
// import {
// Attachment,
// Close,
// Emoji,
// SendMessage,
// } from 'forge-core'
import { filesize as fs } from 'filesize'
import { NimbleEmoji, emojiIndex } from 'emoji-mart'
import { ThemeContext } from 'styled-components'
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/MessageReactions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useContext } from 'react'
import { useMutation } from '@apollo/client'
import { Box, Text } from 'grommet'
import { Tooltip } from 'forge-core'
import { Tooltip } from '@pluralsh/design-system'
import 'emoji-mart/css/emoji-mart.css'
import { Emoji } from 'emoji-mart'

Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/Notifications.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect } from 'react'
import { Box, Text } from 'grommet'
import { Scroller } from 'forge-core'
// import { Scroller } from 'forge-core'
import {
useApolloClient,
useMutation,
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/Severity.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from 'react'
import { Box, Text } from 'grommet'
import { Select } from 'forge-core'
import { Select } from '@pluralsh/design-system'

import { normalizeColor } from 'grommet/utils'

Expand Down
16 changes: 8 additions & 8 deletions www/src/components/incidents/Sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useCallback, useState } from 'react'
import { Box, Stack, Text } from 'grommet'
import {
Cluster,
Eye as Hide,
History,
Notification,
Package,
User,
} from 'forge-core'
// import {
// Cluster,
// Eye as Hide,
// History,
// Notification,
// Package,
// User,
// } from 'forge-core'

import { IncidentHistory } from './IncidentHistory'
import { SidebarView } from './types'
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/incidents/ViewSwitcher.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createElement, useRef, useState } from 'react'
import { Box, Text } from 'grommet'

import { Check as Checkmark, File, Messages } from 'forge-core'
// import { Check as Checkmark, File, Messages } from 'forge-core'

import { Tooltip } from '../utils/Tooltip'

Expand Down
5 changes: 3 additions & 2 deletions www/src/components/integrations/CreateWebhook.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from 'react'
import { useMutation } from '@apollo/client'
import { Button, SecondaryButton } from 'forge-core'
import { Button } from '@pluralsh/design-system'
import {
Box,
FormField,
Expand Down Expand Up @@ -121,7 +121,8 @@ export function CreateWebhook({ cancel }: any) {
justify="end"
gap="xsmall"
>
<SecondaryButton
<Button
secondary
label="Cancel"
onClick={cancel}
/>
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/integrations/OAuthIntegrations.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useQuery } from '@apollo/client'
import { Box, Text } from 'grommet'
import { Check as Checkmark } from 'forge-core'
// import { Check as Checkmark } from 'forge-core'

import { ZOOM_ICON, ZOOM_INSTALL_URL } from './constants'
import { OAUTH_Q } from './queries'
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/integrations/OauthCreator.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useMemo } from 'react'
import { Errors } from 'forge-core'
// import { Errors } from 'forge-core'
import { useLocation, useNavigate, useParams } from 'react-router-dom'
import { useMutation } from '@apollo/client'

Expand Down
20 changes: 10 additions & 10 deletions www/src/components/integrations/Webhook.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { useContext, useEffect, useState } from 'react'
import { useNavigate, useParams } from 'react-router-dom'
import {
Button,
Close,
Copyable,
Edit,
Reload,
SecondaryButton,
Trash,
} from 'forge-core'
// import {
// Button,
// Close,
// Copyable,
// Edit,
// Reload,
// Trash,
// } from 'forge-core'
import {
Box,
Layer,
Expand Down Expand Up @@ -261,7 +260,8 @@ function WebhookControls({ webhook, setEdit }: any) {
justify="end"
gap="small"
>
<SecondaryButton
<Button
secondary
label="Cancel"
onClick={() => setOpen(false)}
/>
Expand Down
12 changes: 6 additions & 6 deletions www/src/components/integrations/WebhookLog.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useState } from 'react'
import { Box, Collapsible, Text } from 'grommet'
import {
TabContent,
TabHeader,
TabHeaderItem,
Tabs,
} from 'forge-core'
// import {
// TabContent,
// TabHeader,
// TabHeaderItem,
// Tabs,
// } from 'forge-core'

import ReactJson from 'react-json-view'
import moment from 'moment'
Expand Down
3 changes: 1 addition & 2 deletions www/src/components/oidc/OAuthConsent.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { useLocation } from 'react-router-dom'
import { useMutation, useQuery } from '@apollo/client'
import { Button } from 'forge-core'
import queryString from 'query-string'
import { ArrowRightLeftIcon } from '@pluralsh/design-system'
import { ArrowRightLeftIcon, Button } from '@pluralsh/design-system'
import { Box, Text } from 'grommet'

import { LoginPortal } from '../users/MagicLogin'
Expand Down
20 changes: 11 additions & 9 deletions www/src/components/payments/CreatePlan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ import {
Text,
TextInput,
} from 'grommet'
// import { HoveredBackground, Trash } from 'forge-core'
import { FaDollarSign } from 'react-icons/fa'
import {
Button,
HoveredBackground,
SecondaryButton,
CreditCardIcon,
PlusIcon,
Select,
Trash,
} from 'forge-core'
import { FaDollarSign } from 'react-icons/fa'
import { CreditCardIcon, PlusIcon } from '@pluralsh/design-system'
} from '@pluralsh/design-system'

import { LabeledInput } from '../repos/CreateRepository'

Expand Down Expand Up @@ -211,7 +210,8 @@ function FeatureCreator({
gap="small"
margin={{ top: 'small' }}
>
<SecondaryButton
<Button
secondary
label="Add feature"
round="xsmall"
onClick={() => setState(addFeature())}
Expand Down Expand Up @@ -338,7 +338,8 @@ function ItemCreator({
gap="small"
margin={{ top: 'small' }}
>
<SecondaryButton
<Button
secondary
label="Add line item"
round="xsmall"
onClick={() => setState(addLineItem())}
Expand Down Expand Up @@ -536,7 +537,8 @@ function NavigableSlaForm({
gap="small"
margin={{ top: 'small' }}
>
<SecondaryButton
<Button
secondary
label="Add service level"
round="xsmall"
onClick={() => setState({ ...state, serviceLevels: [...state.serviceLevels, serviceLevel] })}
Expand Down
4 changes: 2 additions & 2 deletions www/src/components/payments/CreateSubscription.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react'
import { Box, Layer, Text } from 'grommet'
import { Button, NumericInput } from 'forge-core'
import { PlusIcon } from '@pluralsh/design-system'
// import { NumericInput } from 'forge-core'
import { Button, PlusIcon } from '@pluralsh/design-system'
import { useMutation } from '@apollo/client'

import { deepUpdate } from '../../utils/graphql'
Expand Down
14 changes: 7 additions & 7 deletions www/src/components/payments/Plan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import './plan.css'

import { useCallback, useContext, useState } from 'react'
import styled from 'styled-components'
import {
Check as Checkmark,
Edit,
Group,
HoveredBackground,
Reload as Refresh,
} from 'forge-core'
// import {
// Check as Checkmark,
// Edit,
// Group,
// HoveredBackground,
// Reload as Refresh,
// } from 'forge-core'
import {
Anchor,
Box,
Expand Down
3 changes: 2 additions & 1 deletion www/src/components/payments/Subscription.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
Layer,
Text,
} from 'grommet'
import { Button, Reload as Refresh } from 'forge-core'
// import { Reload as Refresh } from 'forge-core'
import { Button } from '@pluralsh/design-system'
import { useMutation } from '@apollo/client'

import { NumericInput } from '../utils/NumericInput'
Expand Down
Loading