diff --git a/frontend/app/components/Session/RightBlock.tsx b/frontend/app/components/Session/RightBlock.tsx index 8a07bbf2e..d549e905d 100644 --- a/frontend/app/components/Session/RightBlock.tsx +++ b/frontend/app/components/Session/RightBlock.tsx @@ -4,7 +4,7 @@ import PageInsightsPanel from '../Session_/PageInsightsPanel/PageInsightsPanel' import { Controls as PlayerControls } from 'Player'; import { connectPlayer } from 'Player'; import cn from 'classnames'; -import stl from './rightblock.css'; +import stl from './rightblock.module.css'; const EventsBlockConnected = connectPlayer(state => ({ currentTimeEventIndex: state.eventListNow.length > 0 ? state.eventListNow.length - 1 : 0, diff --git a/frontend/app/components/Session/Tabs/Tabs.tsx b/frontend/app/components/Session/Tabs/Tabs.tsx index e59fc9733..87bb8bb39 100644 --- a/frontend/app/components/Session/Tabs/Tabs.tsx +++ b/frontend/app/components/Session/Tabs/Tabs.tsx @@ -1,6 +1,6 @@ import React from 'react'; import cn from 'classnames'; -import stl from './tabs.css'; +import stl from './tabs.module.css'; interface Props { tabs: Array; diff --git a/frontend/app/components/Session/Tabs/tabs.css b/frontend/app/components/Session/Tabs/tabs.module.css similarity index 100% rename from frontend/app/components/Session/Tabs/tabs.css rename to frontend/app/components/Session/Tabs/tabs.module.css diff --git a/frontend/app/components/Session/rightblock.css b/frontend/app/components/Session/rightblock.module.css similarity index 100% rename from frontend/app/components/Session/rightblock.css rename to frontend/app/components/Session/rightblock.module.css diff --git a/frontend/app/components/Session_/Autoplay/Autoplay.js b/frontend/app/components/Session_/Autoplay/Autoplay.js index 7c111b2ba..65f64a3ed 100644 --- a/frontend/app/components/Session_/Autoplay/Autoplay.js +++ b/frontend/app/components/Session_/Autoplay/Autoplay.js @@ -2,15 +2,14 @@ import React, { useEffect } from 'react' import { connect } from 'react-redux' import { setAutoplayValues } from 'Duck/sessions' import { session as sessionRoute } from 'App/routes'; -import { Link, Icon, Slider, Toggler } from 'UI'; +import { Link, Icon, Toggler } from 'UI'; import { connectPlayer } from 'Player/store'; import { Controls as PlayerControls } from 'Player'; import { Tooltip } from 'react-tippy'; import cn from 'classnames'; -import { disabled } from '../Player/Controls/controlButton.css'; function Autoplay(props) { - const { previousId, nextId, autoplay } = props + const { previousId, nextId, autoplay, disabled } = props useEffect(() => { props.setAutoplayValues() @@ -35,12 +34,12 @@ function Autoplay(props) { title="Play Previous Session" disabled={!previousId} className={cn( - "p-1 bg-gray-bg group rounded-full color-gray-darkest font-medium", + "p-1 bg-gray-bg group rounded-full color-gray-darkest font-medium", previousId && 'cursor-pointer', !disabled && 'hover:bg-bg-blue' )} > - + @@ -53,7 +52,7 @@ function Autoplay(props) { title="Play Next Session" disabled={!nextId} className={cn( - "p-1 bg-gray-bg group ml-1 rounded-full color-gray-darkest font-medium", + "p-1 bg-gray-bg group ml-1 rounded-full color-gray-darkest font-medium", nextId && 'cursor-pointer', !disabled && 'hover:bg-bg-blue' )} diff --git a/frontend/app/components/Session_/PlayerBlock.js b/frontend/app/components/Session_/PlayerBlock.js index 9d405650e..e6bcbaa33 100644 --- a/frontend/app/components/Session_/PlayerBlock.js +++ b/frontend/app/components/Session_/PlayerBlock.js @@ -8,7 +8,7 @@ import { import Player from './Player'; import SubHeader from './Subheader'; -import styles from './playerBlock.css'; +import styles from './playerBlock.module.css'; @connect(state => ({ fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), @@ -19,11 +19,11 @@ import styles from './playerBlock.css'; })) export default class PlayerBlock extends React.PureComponent { render() { - const { - fullscreen, - bottomBlock, - sessionId, - disabled, + const { + fullscreen, + bottomBlock, + sessionId, + disabled, activeTab, jiraConfig, } = this.props; diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js index 8c42e40fa..55f59e73d 100644 --- a/frontend/app/components/Session_/PlayerBlockHeader.js +++ b/frontend/app/components/Session_/PlayerBlockHeader.js @@ -2,19 +2,15 @@ import React from 'react'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; import { sessions as sessionsRoute, assist as assistRoute, liveSession as liveSessionRoute, withSiteId } from 'App/routes'; -import { Button, Icon, BackLink, Link } from 'UI'; +import { Icon, BackLink, Link } from 'UI'; import { toggleFavorite, setSessionPath } from 'Duck/sessions'; import cn from 'classnames'; -import SharePopup from '../shared/SharePopup/SharePopup'; -import { Icon, BackLink, Link } from 'UI'; -import { connectPlayer, showEvents, toggleEvents } from 'Player'; -import { fetchList as fetchListIntegration } from 'Duck/integrations/actions'; +import { connectPlayer, toggleEvents } from 'Player'; import SessionMetaList from 'Shared/SessionItem/SessionMetaList'; import UserCard from './EventsBlock/UserCard'; import Tabs from 'Components/Session/Tabs'; import stl from './playerBlockHeader.module.css'; -import Issues from './Issues/Issues'; import AssistActions from '../Assist/components/AssistActions'; import AssistTabs from '../Assist/components/AssistTabs'; diff --git a/frontend/app/components/ui/SVG.tsx b/frontend/app/components/ui/SVG.tsx index 87b4b2d8a..0d4805b78 100644 --- a/frontend/app/components/ui/SVG.tsx +++ b/frontend/app/components/ui/SVG.tsx @@ -19,10 +19,12 @@ const SVG = (props: Props) => { case 'analytics': return ; case 'anchor': return ; case 'arrow-alt-square-right': return ; + case 'arrow-clockwise': return ; case 'arrow-down': return ; case 'arrow-square-left': return ; case 'arrow-square-right': return ; case 'arrow-up': return ; + case 'arrows-angle-extend': return ; case 'avatar/icn_bear': return ; case 'avatar/icn_beaver': return ; case 'avatar/icn_bird': return ; @@ -239,7 +241,7 @@ const SVG = (props: Props) => { case 'integrations/github': return ; case 'integrations/graphql': return ; case 'integrations/jira-text': return ; - case 'integrations/jira': return ; + case 'integrations/jira': return ; case 'integrations/mobx': return ; case 'integrations/newrelic-text': return ; case 'integrations/newrelic': return ; @@ -252,6 +254,7 @@ const SVG = (props: Props) => { case 'integrations/segment': return ; case 'integrations/sentry-text': return ; case 'integrations/sentry': return ; + case 'integrations/slack-bw': return ; case 'integrations/slack': return ; case 'integrations/stackdriver': return ; case 'integrations/sumologic-text': return ; @@ -284,6 +287,7 @@ const SVG = (props: Props) => { case 'os/ubuntu': return ; case 'os/windows': return ; case 'os': return ; + case 'pause-fill': return ; case 'pause': return ; case 'pdf-download': return ; case 'pencil-stop': return ; @@ -295,6 +299,7 @@ const SVG = (props: Props) => { case 'pin-fill': return ; case 'play-circle-light': return ; case 'play-circle': return ; + case 'play-fill-new': return ; case 'play-fill': return ; case 'play-hover': return ; case 'play': return ; diff --git a/frontend/app/styles/colors-autogen.css b/frontend/app/styles/colors-autogen.css index 1d53dea64..8fa85566e 100644 --- a/frontend/app/styles/colors-autogen.css +++ b/frontend/app/styles/colors-autogen.css @@ -5,6 +5,7 @@ .fill-gray-light-shade { fill: $gray-light-shade } .fill-gray-lightest { fill: $gray-lightest } .fill-gray-light { fill: $gray-light } +.fill-gray-bg { fill: $gray-bg } .fill-gray-medium { fill: $gray-medium } .fill-gray-dark { fill: $gray-dark } .fill-gray-darkest { fill: $gray-darkest } @@ -26,8 +27,10 @@ .fill-blue { fill: $blue } .fill-blue2 { fill: $blue2 } .fill-active-blue { fill: $active-blue } +.fill-bg-blue { fill: $bg-blue } .fill-active-blue-border { fill: $active-blue-border } .fill-pink { fill: $pink } +.fill-light-blue-bg { fill: $light-blue-bg } .fill-white { fill: $white } .fill-borderColor { fill: $borderColor } @@ -36,6 +39,7 @@ .color-gray-light-shade { color: $gray-light-shade } .color-gray-lightest { color: $gray-lightest } .color-gray-light { color: $gray-light } +.color-gray-bg { color: $gray-bg } .color-gray-medium { color: $gray-medium } .color-gray-dark { color: $gray-dark } .color-gray-darkest { color: $gray-darkest } @@ -57,8 +61,10 @@ .color-blue { color: $blue } .color-blue2 { color: $blue2 } .color-active-blue { color: $active-blue } +.color-bg-blue { color: $bg-blue } .color-active-blue-border { color: $active-blue-border } .color-pink { color: $pink } +.color-light-blue-bg { color: $light-blue-bg } .color-white { color: $white } .color-borderColor { color: $borderColor } @@ -67,6 +73,7 @@ .hover-gray-light-shade:hover { color: $gray-light-shade } .hover-gray-lightest:hover { color: $gray-lightest } .hover-gray-light:hover { color: $gray-light } +.hover-gray-bg:hover { color: $gray-bg } .hover-gray-medium:hover { color: $gray-medium } .hover-gray-dark:hover { color: $gray-dark } .hover-gray-darkest:hover { color: $gray-darkest } @@ -88,8 +95,10 @@ .hover-blue:hover { color: $blue } .hover-blue2:hover { color: $blue2 } .hover-active-blue:hover { color: $active-blue } +.hover-bg-blue:hover { color: $bg-blue } .hover-active-blue-border:hover { color: $active-blue-border } .hover-pink:hover { color: $pink } +.hover-light-blue-bg:hover { color: $light-blue-bg } .hover-white:hover { color: $white } .hover-borderColor:hover { color: $borderColor } @@ -97,6 +106,7 @@ .border-gray-light-shade { border-color: $gray-light-shade } .border-gray-lightest { border-color: $gray-lightest } .border-gray-light { border-color: $gray-light } +.border-gray-bg { border-color: $gray-bg } .border-gray-medium { border-color: $gray-medium } .border-gray-dark { border-color: $gray-dark } .border-gray-darkest { border-color: $gray-darkest } @@ -118,7 +128,9 @@ .border-blue { border-color: $blue } .border-blue2 { border-color: $blue2 } .border-active-blue { border-color: $active-blue } +.border-bg-blue { border-color: $bg-blue } .border-active-blue-border { border-color: $active-blue-border } .border-pink { border-color: $pink } +.border-light-blue-bg { border-color: $light-blue-bg } .border-white { border-color: $white } .border-borderColor { border-color: $borderColor }