Commit c02d2a1f authored by Alexandros Georgantas's avatar Alexandros Georgantas
Browse files

feat(app): wax connection done

parent 018bfe6e
......@@ -53,10 +53,6 @@ import invisibles, {
// paragraph,
} from '@guardian/prosemirror-invisibles'
const updateTitle = title => {
// console.log(title)
}
export default {
MenuService: [
{
......@@ -73,8 +69,8 @@ export default {
'StrikeThrough',
],
},
// 'HighlightToolGroup',
// 'TransformToolGroup',
'HighlightToolGroup',
'TransformToolGroup',
'Notes',
'Lists',
'Images',
......@@ -89,18 +85,18 @@ export default {
templateArea: 'leftSideBar',
toolGroups: ['DisplayText'],
},
// {
// templateArea: 'commentTrackToolBar',
// toolGroups: ['TrackCommentOptions'],
// },
// {
// templateArea: 'BottomRightInfo',
// toolGroups: ['InfoToolGroup'],
// },
{
templateArea: 'commentTrackToolBar',
toolGroups: ['TrackCommentOptions'],
},
{
templateArea: 'BottomRightInfo',
toolGroups: ['InfoToolGroup'],
},
],
SchemaService: DefaultSchema,
TitleService: { updateTitle },
TitleService: {},
RulesService: [emDash, ellipsis],
ShortCutsService: {},
EnableTrackChangeService: { enabled: true, toggle: true },
......
......@@ -253,6 +253,14 @@ export default css`
left: -5px;
}
.insertion .show-insertion {
color: black;
}
.deletion .hide-deletion {
display: none;
}
span.comment {
border-bottom: 2px solid gold;
border-radius: 3px 3px 0 0;
......
......@@ -126,7 +126,7 @@ const CommentTrackToolsContainer = styled.div`
position: fixed;
padding-top: 5px;
right: 30px;
z-index: 2;
z-index: 1;
background: white;
padding-left: 5%;
`
......
......@@ -169,7 +169,7 @@ const Connected = props => {
tagsLoading,
}) => {
const user = Object.assign({}, currentUser, {
color: getUserWithColor(teams),
userColor: getUserWithColor(teams),
})
if (loading || waxLoading || teamsLoading || tagsLoading)
return <Loading />
......@@ -187,7 +187,7 @@ const Connected = props => {
} else if (rules.canEditReview) {
editing = 'review'
}
console.log('user', user)
return (
<WaxPubsweet
addCustomTags={addCustomTags}
......
This diff is collapsed.
......@@ -225,6 +225,8 @@ services:
db:
image: postgres:12-alpine
ports:
- 5435:5432
environment:
- POSTGRES_DB=editoria_dev
- POSTGRES_USER=dev_user
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment