Skip to content
Closed
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@sentry/react": "7.119.0",
"cozy": "^0.5.0",
"cozy-bar": "^29.3.0",
"cozy-bar": "^30.0.0",
"cozy-client": "^60.22.1",
"cozy-dataproxy-lib": "^4.11.0",
"cozy-device-helper": "^3.8.0",
Expand Down
15 changes: 15 additions & 0 deletions src/components/Icons/WorkplaceText.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/illus/workplace-text.svg` to regenerate;
import React from 'react'

function SvgWorkplaceText(props) {
return (
<svg viewBox="0 0 114 22" fill="none" {...props}>
<path
d="M95.23 17.435c-1.728 0-3.166-.574-4.313-1.72-1.132-1.148-1.698-2.562-1.698-4.245 0-1.682.566-3.096 1.698-4.243 1.147-1.147 2.585-1.721 4.313-1.721 1.162 0 2.202.275 3.12.826.933.55 1.659 1.3 2.179 2.248l-1.72.963a3.964 3.964 0 00-1.446-1.605c-.612-.398-1.323-.597-2.133-.597-1.178 0-2.141.398-2.89 1.193-.75.795-1.125 1.774-1.125 2.936 0 1.163.375 2.141 1.124 2.937.75.795 1.713 1.193 2.89 1.193.811 0 1.522-.2 2.134-.597a3.963 3.963 0 001.445-1.606l1.721.964a5.808 5.808 0 01-2.18 2.248c-.917.55-1.957.826-3.12.826zm-14.622 0c-.887 0-1.644-.16-2.271-.482a3.51 3.51 0 01-1.4-1.354 3.962 3.962 0 01-.481-1.95c0-1.208.351-2.08 1.055-2.615.719-.535 1.743-.803 3.074-.803h3.946v-.825c0-1.04-.238-1.76-.712-2.157-.458-.397-1.154-.596-2.087-.596-.872 0-1.507.168-1.904.504-.398.322-.62.689-.665 1.102h-2.02a3.1 3.1 0 01.666-1.744c.398-.52.94-.933 1.629-1.239.688-.305 1.491-.458 2.409-.458.963 0 1.797.153 2.5.458a3.315 3.315 0 011.629 1.4c.382.627.573 1.46.573 2.5v6.63c.016.474.054.94.115 1.4h-1.766a12.303 12.303 0 01-.092-.987c-.015-.321-.023-.68-.023-1.078-.321.642-.841 1.185-1.56 1.628-.719.444-1.59.666-2.615.666zm.436-1.836c.642 0 1.223-.114 1.743-.344a2.86 2.86 0 001.262-1.009c.321-.444.482-.987.482-1.629v-.826h-3.602c-.75 0-1.338.153-1.766.46-.429.29-.643.756-.643 1.399 0 .565.2 1.032.597 1.399.413.367 1.055.55 1.927.55zm-9.426 1.606V0h1.973v17.205h-1.973zM59.102 22h-1.973V5.735h1.973v1.767c.397-.581.956-1.055 1.674-1.422a5.04 5.04 0 012.363-.574c1.59 0 2.921.581 3.992 1.743 1.085 1.163 1.629 2.57 1.629 4.221 0 1.652-.544 3.06-1.63 4.221-1.07 1.163-2.4 1.744-3.99 1.744a5.211 5.211 0 01-2.364-.55c-.719-.383-1.277-.865-1.674-1.446V22zm.94-7.57c.734.795 1.667 1.193 2.799 1.193s2.065-.398 2.799-1.193c.734-.796 1.1-1.782 1.1-2.96 0-1.177-.366-2.164-1.1-2.959-.734-.795-1.667-1.193-2.8-1.193-1.13 0-2.064.398-2.798 1.193s-1.1 1.782-1.1 2.96c0 1.177.366 2.163 1.1 2.959zm-7.055 2.775l-6.216-5.735v5.735h-1.973V0h1.973v10.208l5-4.473h2.616l-5.644 5.07 6.905 6.4h-2.66zm-16.821 0V5.735h1.973V7.96a3.135 3.135 0 011.238-1.698c.627-.428 1.285-.642 1.973-.642.337 0 .635.03.895.092v2.041c-.275-.122-.635-.183-1.078-.183-.796 0-1.499.344-2.11 1.032-.613.688-.918 1.66-.918 2.914v5.689h-1.973zm-8.78.23c-1.728 0-3.165-.574-4.312-1.72-1.132-1.163-1.698-2.578-1.698-4.245 0-1.667.566-3.074 1.698-4.22 1.147-1.163 2.584-1.744 4.312-1.744 1.713 0 3.136.581 4.267 1.743 1.147 1.147 1.72 2.554 1.72 4.221 0 1.667-.573 3.082-1.72 4.244-1.131 1.147-2.554 1.72-4.267 1.72zm-2.89-3.028c.75.795 1.713 1.193 2.89 1.193 1.178 0 2.134-.398 2.868-1.193.734-.796 1.101-1.774 1.101-2.937 0-1.162-.367-2.14-1.101-2.936-.734-.795-1.69-1.193-2.868-1.193-1.177 0-2.14.398-2.89 1.193-.734.795-1.101 1.774-1.101 2.936 0 1.163.367 2.141 1.1 2.937zm-10.181 2.798L10.323 6.148 6.354 17.205H4.45L0 .917h2.225l3.395 12.71L10.323.641l4.703 12.984L18.444.917h2.225l-4.45 16.288h-1.904zm93.794.23c-1.759 0-3.189-.566-4.29-1.698-1.101-1.131-1.652-2.554-1.652-4.267 0-1.697.559-3.112 1.675-4.243 1.116-1.147 2.546-1.721 4.29-1.721 1.544 0 2.837.52 3.877 1.56 1.055 1.025 1.583 2.424 1.583 4.198 0 .23-.008.428-.023.596h-9.406c.031 1.071.413 1.966 1.147 2.684.75.72 1.69 1.079 2.822 1.079 1.606 0 2.798-.666 3.578-1.996l1.56 1.078c-1.116 1.82-2.837 2.73-5.161 2.73zm-3.808-7.18h7.272c-.153-.918-.558-1.644-1.216-2.18-.642-.55-1.407-.826-2.294-.826-.902 0-1.713.276-2.432.826-.703.536-1.147 1.262-1.33 2.18z"
fill="#97A3B7"
/>
</svg>
)
}

export default SvgWorkplaceText
11 changes: 9 additions & 2 deletions src/containers/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ import { isFlagshipApp } from 'cozy-device-helper'
import IconSprite from 'cozy-ui/transpiled/react/Icon/Sprite'
import Spinner from 'cozy-ui/transpiled/react/Spinner'
import { Layout } from 'cozy-ui/transpiled/react/Layout'
import TwakeWorkplace from 'cozy-ui/transpiled/react/Icons/TwakeWorkplace'
import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'

import { AssistantMobileWrapper } from '@/components/Assistant/AssistantMobileWrapper'
import { AssistantView, SearchDialog } from 'cozy-search'
import { AiText, AssistantView, SearchDialog } from 'cozy-search'
import Failure from '@/components/Failure'
import HeroHeader from '@/components/HeroHeader'
import Home from '@/components/Home'
Expand All @@ -42,6 +43,7 @@ import SectionDialog from '@/components/Sections/SectionDialog'
import { SentryRoutes } from '@/lib/sentry'
import '../flags'
import styles from '../styles/app.styl'
import WorkplaceText from '@/components/Icons/WorkplaceText'

window.flag = window.flag || flag
window.minilog = minilog
Expand Down Expand Up @@ -114,7 +116,12 @@ const App = () => {
<Layout monoColumn className={`${isNewAssistantView ? '' : 'u-bg-white'}`}>
<BarComponent
searchOptions={{ enabled: isNewAssistantView }}
appSlug={isNewAssistantView ? 'assistant' : undefined}
appIcon={TwakeWorkplace}
appTextIcon={
isNewAssistantView
? AiText
: () => <WorkplaceText style={{ height: 26, marginTop: 5 }} />
}
componentsProps={{
Wrapper: {
className: cx('u-elevation-0', {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5820,10 +5820,10 @@ cozy-app-publish@^0.41.0:
tar "^6.1.11"
verror "^1.10.1"

cozy-bar@^29.3.0:
version "29.3.0"
resolved "https://registry.yarnpkg.com/cozy-bar/-/cozy-bar-29.3.0.tgz#12e9f7d56dec4d6390f6d053fcffd51f0aa26ae7"
integrity sha512-qysS7zn4DjdARxm+y0f8EuI3aDWIN604Uzs7909ffVnL8jxhJLfKinEuhu/JWJRKuCtjqXZKSybic1x40VnBOw==
cozy-bar@^30.0.0:
version "30.0.0"
resolved "https://registry.yarnpkg.com/cozy-bar/-/cozy-bar-30.0.0.tgz#2423bb32766d5472d4f7fa3f0e5b9f321799363c"
integrity sha512-ae/0NT6tQCCi3M2XKweGaEgcz+jpXWUapGKZAXM6n2q141YXxAzTn90P3LVIORVGhObAf/3QQVVIfQISXnirCA==
dependencies:
lodash.set "^4.3.2"
lodash.unionwith "4.6.0"
Expand Down
Loading