Commit 3c095c8d authored by Alexandros Georgantas's avatar Alexandros Georgantas

Merge branch 'fixes-beta-release' into 'master'

Fixes beta release

See merge request editoria/editoria!146
parents c32cb16b 26e10194
......@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.2.0"></a>
# [0.2.0](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-api@0.1.6...editoria-api@0.2.0) (2019-08-01)
### Bug Fixes
* **applicationmanager:** fix models retrieve confgi form db ([e441cb1](https://gitlab.coko.foundation/editoria/editoria/commit/e441cb1))
* **applicationparameters:** rename config to applicationmanager props everywhere ([47b3538](https://gitlab.coko.foundation/editoria/editoria/commit/47b3538))
* **navigation:** fix navigation of editor link ([c569dc2](https://gitlab.coko.foundation/editoria/editoria/commit/c569dc2))
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
### Features
* **applicationmanager:** get live updates subscriptions ([632e471](https://gitlab.coko.foundation/editoria/editoria/commit/632e471))
* **applicationparameters:** get config from db create graphql query ([3a34792](https://gitlab.coko.foundation/editoria/editoria/commit/3a34792))
* **dynamicomponenttype:** add graphql schema query mutations table ([4e4081d](https://gitlab.coko.foundation/editoria/editoria/commit/4e4081d))
* **header:** easier navigation between bookcomponents ([9e675af](https://gitlab.coko.foundation/editoria/editoria/commit/9e675af))
* **tags:** add resolvers, graphql schema ([88bb4ca](https://gitlab.coko.foundation/editoria/editoria/commit/88bb4ca))
* **template manager:** init template manager ([cd51950](https://gitlab.coko.foundation/editoria/editoria/commit/cd51950))
<a name="0.1.6"></a>
## [0.1.6](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-api@0.1.5...editoria-api@0.1.6) (2019-05-28)
......
{
"name": "editoria-api",
"version": "0.1.6",
"version": "0.2.0",
"description": "GraphQl API for Editoria",
"main": "index.js",
"keywords": [
......@@ -14,9 +14,9 @@
"author": "Alexandros Georgantas",
"license": "ISC",
"dependencies": {
"cheerio": "^1.0.0-rc.2",
"editoria-data-model": "^0.1.2",
"apollo-server": "*",
"cheerio": "^1.0.0-rc.2",
"editoria-data-model": "^0.2.0",
"highlight.js": "^9.13.1",
"html-epub": "git+https://git@gitlab.coko.foundation/pubsweet/html-epub#updated-libtidy",
"mkdirp": "^0.5.1",
......
......@@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="1.3.0"></a>
# [1.3.0](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-bookbuilder@1.2.6...pubsweet-component-bookbuilder@1.3.0) (2019-08-01)
### Bug Fixes
* **applicationmanager:** add data-test-id for testing purposes ([5562b9a](https://gitlab.coko.foundation/editoria/editoria/commit/5562b9a))
* **applicationmanager:** broke state of bookcomponent ([3cc4f83](https://gitlab.coko.foundation/editoria/editoria/commit/3cc4f83))
* **applicationmanager:** fix models retrieve confgi form db ([41f9a92](https://gitlab.coko.foundation/editoria/editoria/commit/41f9a92))
* **applicationmanager:** fix models retrieve confgi form db ([e441cb1](https://gitlab.coko.foundation/editoria/editoria/commit/e441cb1))
* **applicationmanager:** set default componentType for missing wax config ([8f9932c](https://gitlab.coko.foundation/editoria/editoria/commit/8f9932c))
* **applicationparameters:** rename config to applicationmanager props everywhere ([47b3538](https://gitlab.coko.foundation/editoria/editoria/commit/47b3538))
* **dynamiccomponenttypes:** add data-test-id for tests ([fd52e45](https://gitlab.coko.foundation/editoria/editoria/commit/fd52e45))
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
* **waxPubsweet:** fix subscritpions ([ef11796](https://gitlab.coko.foundation/editoria/editoria/commit/ef11796))
### Features
* **applicationmanager:** get live updates subscriptions ([632e471](https://gitlab.coko.foundation/editoria/editoria/commit/632e471))
* **applicationparameters:** get config from db create graphql query ([3a34792](https://gitlab.coko.foundation/editoria/editoria/commit/3a34792))
* **header:** easier navigation between bookcomponents ([9e675af](https://gitlab.coko.foundation/editoria/editoria/commit/9e675af))
<a name="1.2.6"></a>
## [1.2.6](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-bookbuilder@1.2.5...pubsweet-component-bookbuilder@1.2.6) (2019-05-28)
......
{
"name": "pubsweet-component-bookbuilder",
"version": "1.2.6",
"version": "1.3.0",
"description": "",
"main": "index.js",
"scripts": {
......@@ -18,7 +18,7 @@
"classnames": "^2.2.5",
"codemirror": "^5.45.0",
"config": "^3.1.0",
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"lodash": "4.17.4",
"pubsweet-client": "^9.2.3",
"react": "^16.2.0",
......
......@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.1.7"></a>
## [0.1.7](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-common@0.1.6...editoria-common@0.1.7) (2019-08-01)
### Bug Fixes
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
<a name="0.1.6"></a>
## [0.1.6](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-common@0.1.5...editoria-common@0.1.6) (2019-05-28)
......
{
"name": "editoria-common",
"version": "0.1.6",
"version": "0.1.7",
"description": "Common react components for the editoria project",
"main": "index.js",
"author": "",
......
......@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.3.0"></a>
# [0.3.0](https://gitlab.coko.foundation/editoria/editoria-dashboard/compare/pubsweet-component-editoria-dashboard@0.2.6...pubsweet-component-editoria-dashboard@0.3.0) (2019-08-01)
### Bug Fixes
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria-dashboard/commit/8868af9))
### Features
* **applicationparameters:** get config from db create graphql query ([3a34792](https://gitlab.coko.foundation/editoria/editoria-dashboard/commit/3a34792))
<a name="0.2.6"></a>
## [0.2.6](https://gitlab.coko.foundation/editoria/editoria-dashboard/compare/pubsweet-component-editoria-dashboard@0.2.5...pubsweet-component-editoria-dashboard@0.2.6) (2019-05-28)
......
{
"name": "pubsweet-component-editoria-dashboard",
"version": "0.2.6",
"version": "0.3.0",
"description": "The application dashboard for the Editoria project.",
"main": "index.js",
"scripts": {
......@@ -18,7 +18,7 @@
"license": "ISC",
"dependencies": {
"@pubsweet/ui": "^10.3.0",
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"formik": "^1.5.1",
"lodash": "4.17.4",
"pubsweet-client": "^9.2.3",
......
......@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.2.0"></a>
# [0.2.0](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-data-model@0.1.2...editoria-data-model@0.2.0) (2019-08-01)
### Bug Fixes
* **applicationmanager:** fix models retrieve confgi form db ([e441cb1](https://gitlab.coko.foundation/editoria/editoria/commit/e441cb1))
* **data model:** additions in template and file clean up ([ba558f1](https://gitlab.coko.foundation/editoria/editoria/commit/ba558f1))
* **datamodel:** target property added ([52cef1e](https://gitlab.coko.foundation/editoria/editoria/commit/52cef1e))
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
* **test:** make them run after pubsweet upgrade ([1c50b43](https://gitlab.coko.foundation/editoria/editoria/commit/1c50b43))
### Features
* **applicationmanage:** create query ([02c84dd](https://gitlab.coko.foundation/editoria/editoria/commit/02c84dd))
* **data model:** support of files, files trnsaltions and templates ([283e762](https://gitlab.coko.foundation/editoria/editoria/commit/283e762))
* **data-model:** include in TOC, running headers support in DM ([e1ae06a](https://gitlab.coko.foundation/editoria/editoria/commit/e1ae06a))
* **dynamicomponenttype:** add graphql schema query mutations table ([4e4081d](https://gitlab.coko.foundation/editoria/editoria/commit/4e4081d))
* **tags:** add resolvers, graphql schema ([88bb4ca](https://gitlab.coko.foundation/editoria/editoria/commit/88bb4ca))
<a name="0.1.2"></a>
## [0.1.2](https://gitlab.coko.foundation/editoria/editoria/compare/editoria-data-model@0.1.1...editoria-data-model@0.1.2) (2019-05-28)
......
{
"name": "editoria-data-model",
"version": "0.1.2",
"version": "0.2.0",
"description": "Data model definitions for Editoria",
"main": "index.js",
"keywords": [
......
......@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.2.4"></a>
## [0.2.4](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-editoria-global-teams@0.2.3...pubsweet-component-editoria-global-teams@0.2.4) (2019-08-01)
### Bug Fixes
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
<a name="0.2.3"></a>
## [0.2.3](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-editoria-global-teams@0.2.2...pubsweet-component-editoria-global-teams@0.2.3) (2019-05-28)
......
{
"name": "pubsweet-component-editoria-global-teams",
"version": "0.2.3",
"version": "0.2.4",
"description": "",
"main": "index.js",
"scripts": {
......@@ -15,7 +15,7 @@
"dependencies": {
"classnames": "^2.2.5",
"config": "^3.1.0",
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"font-awesome": "4.7.0",
"formik": "^0.11.11",
"lodash": "4.17.4",
......
......@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="1.0.3"></a>
## [1.0.3](https://gitlab.coko.foundation/editoria/editoria/compare/jest-environment-db@1.0.2...jest-environment-db@1.0.3) (2019-08-01)
### Bug Fixes
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
* **test:** make them run after pubsweet upgrade ([1c50b43](https://gitlab.coko.foundation/editoria/editoria/commit/1c50b43))
<a name="1.0.2"></a>
## [1.0.2](https://gitlab.coko.foundation/editoria/editoria/compare/jest-environment-db@1.0.1...jest-environment-db@1.0.2) (2019-04-12)
......
{
"name": "jest-environment-db",
"version": "1.0.2",
"version": "1.0.3",
"description": "",
"main": "index.js",
"private": true,
......
......@@ -3,6 +3,26 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.2.0"></a>
# [0.2.0](https://gitlab.coko.foundation/editoria/editoria-navigation/compare/pubsweet-component-editoria-navigation@0.1.5...pubsweet-component-editoria-navigation@0.2.0) (2019-08-01)
### Bug Fixes
* **applicationmanager:** set default componentType for missing wax config ([8f9932c](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/8f9932c))
* **applicationparameters:** rename config to applicationmanager props everywhere ([47b3538](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/47b3538))
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/8868af9))
### Features
* **applicationmanage:** create query ([02c84dd](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/02c84dd))
* **applicationmanager:** get live updates subscriptions ([632e471](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/632e471))
* **applicationparameters:** get config from db create graphql query ([3a34792](https://gitlab.coko.foundation/editoria/editoria-navigation/commit/3a34792))
<a name="0.1.5"></a>
## [0.1.5](https://gitlab.coko.foundation/editoria/editoria-navigation/compare/pubsweet-component-editoria-navigation@0.1.4...pubsweet-component-editoria-navigation@0.1.5) (2019-05-28)
......
{
"name": "pubsweet-component-editoria-navigation",
"version": "0.1.5",
"version": "0.2.0",
"description": "The navigation for the Editoria project.",
"main": "index.js",
"keywords": [
......@@ -14,7 +14,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"lodash": "4.17.4",
"pubsweet-client": "^9.2.3",
"react": "^16.2.0",
......
# Change Log
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.1.1"></a>
## 0.1.1 (2019-08-01)
### Bug Fixes
* **app:** fixes for the beta release ([2ee72a4](https://gitlab.coko.foundation/editoria/editoria-templates/commit/2ee72a4))
{
"name": "pubsweet-component-editoria-templates",
"version": "0.1.0",
"version": "0.1.1",
"description": "The application dashboard for the Editoria project.",
"main": "index.js",
"scripts": {
......@@ -18,7 +18,7 @@
"license": "ISC",
"dependencies": {
"@pubsweet/ui": "^10.3.0",
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"formik": "^1.5.1",
"lodash": "4.17.4",
"pubsweet-client": "^9.2.3",
......@@ -27,8 +27,8 @@
"react-modal": "^3.6.1",
"react-powerplug": "^1.0.0",
"react-router-dom": "^5.0.0",
"styled-components": "^4.1.3",
"react-select":"^3.0.4"
"react-select": "^3.0.4",
"styled-components": "^4.1.3"
},
"devDependencies": {
"enzyme": "^2.9.1",
......
......@@ -99,8 +99,9 @@ const Container = styled.div`
align-items: flex-start;
justify-content: flex-start;
position: relative;
margin-right: calc(1.5 * ${th('gridUnit')});
display: flex;
flex-basis: 33%;
flex-basis: 32.6%;
height: 282px;
/* min-width:390px; */
margin-bottom: calc(3 * ${th('gridUnit')});
......
......@@ -6,10 +6,13 @@ import { Template } from '../../ui'
const GridContainer = styled.div`
align-items: center;
justify-content: space-between;
justify-content: flex-start;
flex-wrap: wrap;
display: flex;
flex-basis: 100%;
div:nth-child(3n + 3) {
margin-right: 0;
}
`
const TemplatesGrid = props => {
......
......@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="1.0.2"></a>
## [1.0.2](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-vivliostyle-viewer@1.0.1...pubsweet-component-vivliostyle-viewer@1.0.2) (2019-08-01)
### Bug Fixes
* **test:** make test work for editoria ([8868af9](https://gitlab.coko.foundation/editoria/editoria/commit/8868af9))
<a name="1.0.1"></a>
## [1.0.1](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-vivliostyle-viewer@1.0.0...pubsweet-component-vivliostyle-viewer@1.0.1) (2018-11-20)
......
{
"name": "pubsweet-component-vivliostyle-viewer",
"version": "1.0.1",
"version": "1.0.2",
"description": "",
"main": "index.js",
"scripts": {
......
......@@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.10.0"></a>
# [0.10.0](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-wax@0.9.1...pubsweet-component-wax@0.10.0) (2019-08-01)
### Bug Fixes
* **app:** fixes for the beta release ([2ee72a4](https://gitlab.coko.foundation/editoria/editoria/commit/2ee72a4))
* **applicationmanager:** set default componentType for missing wax config ([8f9932c](https://gitlab.coko.foundation/editoria/editoria/commit/8f9932c))
* **customtags:** connect to editoria ([5f165a5](https://gitlab.coko.foundation/editoria/editoria/commit/5f165a5))
* **header:** add header to editor ([44f3521](https://gitlab.coko.foundation/editoria/editoria/commit/44f3521))
* **headertest:** fix header for test ([5a607d7](https://gitlab.coko.foundation/editoria/editoria/commit/5a607d7))
* **navigation:** clear uneened code ([54e4085](https://gitlab.coko.foundation/editoria/editoria/commit/54e4085))
* **navigation:** fix navigation of editor link ([c569dc2](https://gitlab.coko.foundation/editoria/editoria/commit/c569dc2))
* **navigation:** same width to all div ([97d8754](https://gitlab.coko.foundation/editoria/editoria/commit/97d8754))
* **wax:** height fo wax ([0ce2bfd](https://gitlab.coko.foundation/editoria/editoria/commit/0ce2bfd))
* **waxPubsweet:** fix subscritpions ([ef11796](https://gitlab.coko.foundation/editoria/editoria/commit/ef11796))
### Features
* **header:** easier navigation between bookcomponents ([9e675af](https://gitlab.coko.foundation/editoria/editoria/commit/9e675af))
* **tags:** add resolvers, graphql schema ([88bb4ca](https://gitlab.coko.foundation/editoria/editoria/commit/88bb4ca))
<a name="0.9.1"></a>
## [0.9.1](https://gitlab.coko.foundation/editoria/editoria/compare/pubsweet-component-wax@0.9.0...pubsweet-component-wax@0.9.1) (2019-05-28)
......
{
"name": "pubsweet-component-wax",
"description": "PubSweet component for the Wax collaborative document editor",
"version": "0.9.1",
"version": "0.10.0",
"main": "index.js",
"keywords": [
"wax",
......@@ -12,7 +12,7 @@
"dependencies": {
"@pubsweet/ui-toolkit": "^2.2.0",
"config": "^3.1.0",
"editoria-common": "^0.1.6",
"editoria-common": "^0.1.7",
"lodash": "4.17.4",
"pubsweet-client": "^9.2.3",
"react": "^16.2.0",
......@@ -21,7 +21,7 @@
"react-powerplug": "^1.0.0",
"react-router-dom": "^5.0.0",
"styled-components": "^4.2.0",
"wax-editor-react": "^0.2.17"
"wax-editor-react": "^0.2.19"
},
"devDependencies": {
"babel-cli": "^6.26.0",
......
......@@ -18,14 +18,20 @@ const BookTitle = styled.div`
const WithLinkDecoration = styled.div`
a {
text-decoration: none;
color: black;
:hover {
border-bottom: 1px solid black;
}
}
`
const Header = styled.div`
display: flex;
align-items:center;
justify-content: space-around;
> div {
width: 33%;
text-align:center;
width: 30%;
}
`
......@@ -57,7 +63,10 @@ const WaxHeader = ({ bookComponent }) => {
<div>
{prevBookComponent && (
<WithLinkDecoration data-testid="previous-component">
{withLink(prevBookComponent.title, createUrl(prevBookComponent))}
{withLink(
`${prevBookComponent.title}`,
createUrl(prevBookComponent),
)}
</WithLinkDecoration>
)}
</div>
......@@ -65,7 +74,10 @@ const WaxHeader = ({ bookComponent }) => {
<div>
{nextBookComponent && (
<WithLinkDecoration data-testid="next-component">
{withLink(nextBookComponent.title, createUrl(nextBookComponent))}
{withLink(
`${nextBookComponent.title}`,
createUrl(nextBookComponent),
)}
</WithLinkDecoration>
)}
</div>
......
......@@ -6,7 +6,6 @@ import config from 'config'
import Wax from 'wax-editor-react'
import WaxHeader from './WaxHeader'
const Container = styled.div`
display: flex;
flex-direction: column;
......@@ -251,15 +250,17 @@ export class WaxPubsweet extends React.Component {
renderWax(editing) {
const { bookComponent, history, user, tags } = this.props
const waxConfig = {
layout: config.wax.layout,
lockWhenEditing: config.wax.lockWhenEditing,
theme: config.wax.theme,
autoSave: config.wax.autoSave,
menus:
menus: (
config.wax[bookComponent.divisionType.toLowerCase()][
bookComponent.componentType
] || ['component'].menus,
] || config.wax[bookComponent.divisionType.toLowerCase()].default
).menus,
}
const { layout, autoSave, menus } = waxConfig
......@@ -360,7 +361,6 @@ export class WaxPubsweet extends React.Component {
if (get(bookComponent, 'componentType') === 'chapter') {
chapterNumber = get(bookComponent, 'componentTypeOrder')
}
return (
<Container>
......
This diff is collapsed.
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