diff --git a/src/actions/index.js b/src/actions/index.js index 88c9e07..6fefa9e 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -8,7 +8,7 @@ import { GET_CHART_DATA_FROM_VISUALIZATION, GET_NAVSITEMAP, SET_CURRENT_VERSION, -} from '~/constants/ActionTypes'; +} from '@eeacms/volto-forests-theme/constants/ActionTypes'; export function setCurrentVersion(payload) { return { diff --git a/src/components/theme/CatalogueViews/AppHeader.jsx b/src/components/theme/CatalogueViews/AppHeader.jsx index 1550a70..3869368 100644 --- a/src/components/theme/CatalogueViews/AppHeader.jsx +++ b/src/components/theme/CatalogueViews/AppHeader.jsx @@ -31,7 +31,10 @@ import { getWorkflow, purgeMessages, } from '@plone/volto/actions'; -import { getFrontpageSlides, getDefaultHeaderImage } from '~/actions'; +import { + getFrontpageSlides, + getDefaultHeaderImage, +} from '@eeacms/volto-forests-theme/actions'; import { getPortlets } from '@eeacms/volto-addons-forest/actions'; class App extends Component { diff --git a/src/components/theme/CountryPageView/CountryPageView.jsx b/src/components/theme/CountryPageView/CountryPageView.jsx index 50bfc23..a33b3e3 100644 --- a/src/components/theme/CountryPageView/CountryPageView.jsx +++ b/src/components/theme/CountryPageView/CountryPageView.jsx @@ -25,7 +25,7 @@ import { // setFolderHeader, setFolderTabs, getParentFolderData, -} from '~/actions'; +} from '@eeacms/volto-forests-theme/actions'; import config from '@plone/volto/registry'; diff --git a/src/components/theme/CountryView/CountryView.jsx b/src/components/theme/CountryView/CountryView.jsx index 6d48959..dbffd44 100644 --- a/src/components/theme/CountryView/CountryView.jsx +++ b/src/components/theme/CountryView/CountryView.jsx @@ -8,7 +8,7 @@ import { Helmet } from '@plone/volto/helpers'; import { Link } from 'react-router-dom'; import { Container } from 'semantic-ui-react'; import { connect } from 'react-redux'; -import { setFolderTabs } from '~/actions'; +import { setFolderTabs } from '@eeacms/volto-forests-theme/actions'; /** * Full view component class. @@ -105,14 +105,14 @@ class FullView extends Component { renderTabs(nextContent) { const items = nextContent ? nextContent.items : this.props.content.items; - const content = items.filter(i => i.title !== 'folder_info'); + const content = items.filter((i) => i.title !== 'folder_info'); const tabs = (
- {content.map(item => ( + {content.map((item) => ( { const blocksFieldname = getBlocksFieldname(item); diff --git a/src/components/theme/SiteMap/SiteMap.jsx b/src/components/theme/SiteMap/SiteMap.jsx index f38ef2a..4010a9f 100644 --- a/src/components/theme/SiteMap/SiteMap.jsx +++ b/src/components/theme/SiteMap/SiteMap.jsx @@ -1,16 +1,13 @@ - import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { compose } from 'redux'; import { asyncConnect } from 'redux-connect'; -import { Link } from 'react-router-dom' +import { Link } from 'react-router-dom'; import { getBaseUrl } from '@plone/volto/helpers'; -import { - getNavigation, -} from '@plone/volto/actions'; -import { getNavSiteMap } from '~/actions'; +import { getNavigation } from '@plone/volto/actions'; +import { getNavSiteMap } from '@eeacms/volto-forests-theme/actions'; /** * @export @@ -18,67 +15,67 @@ import { getNavSiteMap } from '~/actions'; * @extends {Component} */ class SiteMap extends Component { - /** - * Property types. - * @property {Object} propTypes Property types. - * @static - */ - static propTypes = { - pathname: PropTypes.string.isRequired, - getNavSiteMap: PropTypes.func.isRequired, - }; + /** + * Property types. + * @property {Object} propTypes Property types. + * @static + */ + static propTypes = { + pathname: PropTypes.string.isRequired, + getNavSiteMap: PropTypes.func.isRequired, + }; - componentDidMount() { - this.props.getNavSiteMap(getBaseUrl(this.props.location.pathname), 100); - } - /** - * Render method. - * @method render - * @returns {string} Markup for the component. - */ - render() { - const { navigation } = this.props; + componentDidMount() { + this.props.getNavSiteMap(getBaseUrl(this.props.location.pathname), 100); + } + /** + * Render method. + * @method render + * @returns {string} Markup for the component. + */ + render() { + const { navigation } = this.props; - const TreeMap = ({ data }) => { + const TreeMap = ({ data }) => { + return ( + + ); + }; - return ( - - - - ); - } + return ( + + + + ); + } } export const __test__ = connect( - (state, props) => ({ - pathname: props.location.pathname, - content: state.content.data, - }), - {}, + (state, props) => ({ + pathname: props.location.pathname, + content: state.content.data, + }), + {}, )(SiteMap); export default compose( - asyncConnect([ - { - key: 'navigation', - promise: ({ location, store: { dispatch } }) => - dispatch(getNavSiteMap(getBaseUrl(location.pathname), 100)), - }, - ]), - connect((state, props) => ({ pathname: props.location.pathname }), { getNavSiteMap }), -)(SiteMap); \ No newline at end of file + asyncConnect([ + { + key: 'navigation', + promise: ({ location, store: { dispatch } }) => + dispatch(getNavSiteMap(getBaseUrl(location.pathname), 100)), + }, + ]), + connect((state, props) => ({ pathname: props.location.pathname }), { + getNavSiteMap, + }), +)(SiteMap); diff --git a/src/customizations/volto/components/theme/App/App.jsx b/src/customizations/volto/components/theme/App/App.jsx index 849ce74..01defbb 100644 --- a/src/customizations/volto/components/theme/App/App.jsx +++ b/src/customizations/volto/components/theme/App/App.jsx @@ -40,7 +40,10 @@ import { getWorkflow, purgeMessages, } from '@plone/volto/actions'; -import { getFrontpageSlides, getDefaultHeaderImage } from '~/actions'; +import { + getFrontpageSlides, + getDefaultHeaderImage, +} from '@eeacms/volto-forests-theme/actions'; import { getPortlets } from '@eeacms/volto-addons-forest/actions'; import clearSVG from '@plone/volto/icons/clear.svg'; diff --git a/src/customizations/volto/components/theme/Footer/Footer.jsx b/src/customizations/volto/components/theme/Footer/Footer.jsx index 54c7fe5..7dc4666 100644 --- a/src/customizations/volto/components/theme/Footer/Footer.jsx +++ b/src/customizations/volto/components/theme/Footer/Footer.jsx @@ -20,7 +20,7 @@ import ccsLogo from './climateChange.svg'; import { compose } from 'redux'; import { connect } from 'react-redux'; import config from '@plone/volto/registry'; -import { setCurrentVersion } from '~/actions'; +import { setCurrentVersion } from '@eeacms/volto-forests-theme/actions'; /** * Component to display the footer. diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx index aed8c6e..5b11167 100644 --- a/src/customizations/volto/components/theme/Header/Header.jsx +++ b/src/customizations/volto/components/theme/Header/Header.jsx @@ -10,9 +10,9 @@ import { connect } from 'react-redux'; import { Logo, Navigation, Breadcrumbs } from '@plone/volto/components'; -import HeaderImage from '~/components/theme/Header/HeaderImage'; -import HomepageSlider from '~/components/theme/Header/HomepageSlider'; -import MobileSearchWidget from '~/components/theme/MobileSearchWidget/MobileSearchWidget'; +import HeaderImage from '@eeacms/volto-forests-theme/components/theme/Header/HeaderImage'; +import HomepageSlider from '@eeacms/volto-forests-theme/components/theme/Header/HomepageSlider'; +import MobileSearchWidget from '@eeacms/volto-forests-theme/components/theme/MobileSearchWidget/MobileSearchWidget'; import Sticky from 'react-stickynode'; import HeaderBackground from './header-bg.png'; diff --git a/src/customizations/volto/components/theme/Navigation/Navigation.jsx b/src/customizations/volto/components/theme/Navigation/Navigation.jsx index dddf1aa..e8b4863 100644 --- a/src/customizations/volto/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/volto/components/theme/Navigation/Navigation.jsx @@ -12,7 +12,7 @@ import { Link } from 'react-router-dom'; import { defineMessages, injectIntl } from 'react-intl'; import { Menu, Dropdown } from 'semantic-ui-react'; import cx from 'classnames'; -import { getBasePath } from '~/helpers'; +import { getBasePath } from '@eeacms/volto-forests-theme/helpers'; import SearchBlock from '@eeacms/volto-addons-forest/SearchBlock/View'; import { Icon } from '@plone/volto/components'; import zoomSVG from '@plone/volto/icons/zoom.svg'; diff --git a/src/customizations/volto/components/theme/View/ListingView.jsx b/src/customizations/volto/components/theme/View/ListingView.jsx index 80b66fc..211cca5 100644 --- a/src/customizations/volto/components/theme/View/ListingView.jsx +++ b/src/customizations/volto/components/theme/View/ListingView.jsx @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Helmet } from '@plone/volto/helpers'; // import { Link } from 'react-router-dom'; -import { getLocalnavigation } from '~/actions'; +import { getLocalnavigation } from '@eeacms/volto-forests-theme/actions'; import { connect } from 'react-redux'; import { compose } from 'redux'; import { getBaseUrl } from '@plone/volto/helpers'; // , flattenToAppURL diff --git a/src/index.js b/src/index.js index 34f6ab8..4d48f1e 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import { installBlocks } from '@eeacms/volto-plotlycharts'; import { applyConfig as installFiseFrontend } from './localconfig'; import ObjectListInlineWidget from './components/manage/Widgets/ObjectListInlineWidget'; -import reducers from '~/reducers'; +import reducers from '@eeacms/volto-forests-theme/reducers'; import '@plone/volto/config'; diff --git a/src/localconfig.js b/src/localconfig.js index b8c065f..16bcaad 100644 --- a/src/localconfig.js +++ b/src/localconfig.js @@ -2,23 +2,23 @@ import { defineMessages } from 'react-intl'; import TokenWidget from '@plone/volto/components/manage/Widgets/TokenWidget'; -import CountryView from '~/components/theme/CountryView/CountryView'; +import CountryView from '@eeacms/volto-forests-theme/components/theme/CountryView/CountryView'; // import CountryPageView from '~/components/theme/CountryPageView/CountryPageView'; //import HomepageView from '~/components/theme/HomepageView/HomepageView'; -import NewsView from '~/components/theme/NewsView/NewsView'; -import RefreshView from '~/components/theme/RefreshView/RefreshView'; +import NewsView from '@eeacms/volto-forests-theme/components/theme/NewsView/NewsView'; +import RefreshView from '@eeacms/volto-forests-theme/components/theme/RefreshView/RefreshView'; import chartIcon from '@plone/volto/icons/world.svg'; -import DefaultViewWide from '~/components/theme/DefaultViewWide/DefaultViewWide'; -import DefaultView from '~/customizations/volto/components/theme/View/DefaultView'; +import DefaultViewWide from '@eeacms/volto-forests-theme/components/theme/DefaultViewWide/DefaultViewWide'; +import DefaultView from '@eeacms/volto-forests-theme/customizations/volto/components/theme/View/DefaultView'; -import ForestMetadata from '~/components/theme/Viewlets/ForestMetadata'; +import ForestMetadata from '@eeacms/volto-forests-theme/components/theme/Viewlets/ForestMetadata'; -import NavigationBlockEdit from '~/components/manage/Blocks/NavigationBlock/Edit'; -import NavigationBlockView from '~/components/manage/Blocks/NavigationBlock/View'; +import NavigationBlockEdit from '@eeacms/volto-forests-theme/components/manage/Blocks/NavigationBlock/Edit'; +import NavigationBlockView from '@eeacms/volto-forests-theme/components/manage/Blocks/NavigationBlock/View'; -import RedirectView from '~/components/theme/View/RedirectView'; +import RedirectView from '@eeacms/volto-forests-theme/components/theme/View/RedirectView'; import { uniqBy } from 'lodash'; defineMessages({ diff --git a/src/reducers/current_version.js b/src/reducers/current_version.js index 5df810a..c583d66 100644 --- a/src/reducers/current_version.js +++ b/src/reducers/current_version.js @@ -3,7 +3,7 @@ * @module reducers/frontpage_slides */ -import { SET_CURRENT_VERSION } from '~/constants/ActionTypes'; +import { SET_CURRENT_VERSION } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/default_header_image.js b/src/reducers/default_header_image.js index 0a32e50..95a8ee0 100644 --- a/src/reducers/default_header_image.js +++ b/src/reducers/default_header_image.js @@ -5,7 +5,7 @@ import { map } from 'lodash'; -import { GET_DEFAULT_HEADER_IMAGE } from '~/constants/ActionTypes'; +import { GET_DEFAULT_HEADER_IMAGE } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/folder_header.js b/src/reducers/folder_header.js index 42e4468..83ed16a 100644 --- a/src/reducers/folder_header.js +++ b/src/reducers/folder_header.js @@ -3,7 +3,7 @@ * @module reducers/frontpage_slides */ -import { SET_FOLDER_HEADER } from '~/constants/ActionTypes'; +import { SET_FOLDER_HEADER } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/folder_tabs.js b/src/reducers/folder_tabs.js index fc7e256..68190e7 100644 --- a/src/reducers/folder_tabs.js +++ b/src/reducers/folder_tabs.js @@ -1,4 +1,4 @@ -import { SET_FOLDER_TABS } from '~/constants/ActionTypes'; +import { SET_FOLDER_TABS } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/frontpage_slides.js b/src/reducers/frontpage_slides.js index 47a33d1..7e675f0 100644 --- a/src/reducers/frontpage_slides.js +++ b/src/reducers/frontpage_slides.js @@ -5,7 +5,7 @@ import { map } from 'lodash'; -import { GET_FRONTPAGESLIDES } from '~/constants/ActionTypes'; +import { GET_FRONTPAGESLIDES } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/index.js b/src/reducers/index.js index 6e51106..ebb27f4 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -4,14 +4,14 @@ */ import defaultReducers from '@plone/volto/reducers'; -import frontpage_slides from '~/reducers/frontpage_slides'; -import folder_header from '~/reducers/folder_header'; -import folder_tabs from '~/reducers/folder_tabs'; -import default_header_image from '~/reducers/default_header_image'; -import parent_folder_data from '~/reducers/parent_folder_data'; -import localnavigation from '~/reducers/localnavigation'; -import navSiteMap from '~/reducers/sitemap'; -import current_version from '~/reducers/current_version'; +import frontpage_slides from '@eeacms/volto-forests-theme/reducers/frontpage_slides'; +import folder_header from '@eeacms/volto-forests-theme/reducers/folder_header'; +import folder_tabs from '@eeacms/volto-forests-theme/reducers/folder_tabs'; +import default_header_image from '@eeacms/volto-forests-theme/reducers/default_header_image'; +import parent_folder_data from '@eeacms/volto-forests-theme/reducers/parent_folder_data'; +import localnavigation from '@eeacms/volto-forests-theme/reducers/localnavigation'; +import navSiteMap from '@eeacms/volto-forests-theme/reducers/sitemap'; +import current_version from '@eeacms/volto-forests-theme/reducers/current_version'; /** * Root reducer. diff --git a/src/reducers/localnavigation.js b/src/reducers/localnavigation.js index cab5e3f..771f4ea 100644 --- a/src/reducers/localnavigation.js +++ b/src/reducers/localnavigation.js @@ -1,4 +1,4 @@ -import { GET_LOCALNAVIGATION } from '~/constants/ActionTypes'; +import { GET_LOCALNAVIGATION } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/parent_folder_data.js b/src/reducers/parent_folder_data.js index 9e53572..7460f03 100644 --- a/src/reducers/parent_folder_data.js +++ b/src/reducers/parent_folder_data.js @@ -3,7 +3,7 @@ * @module reducers/frontpage_slides */ -import { GET_PARENT_FOLDER_DATA } from '~/constants/ActionTypes'; +import { GET_PARENT_FOLDER_DATA } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/src/reducers/set_folder_header.js b/src/reducers/set_folder_header.js index ae8646c..bd8c81e 100644 --- a/src/reducers/set_folder_header.js +++ b/src/reducers/set_folder_header.js @@ -3,7 +3,7 @@ * @module reducers/frontpage_slides */ -import { SET_FOLDER_HEADER } from '~/constants/ActionTypes'; +import { SET_FOLDER_HEADER } from '@eeacms/volto-forests-theme/constants/ActionTypes'; const initialState = { error: null, diff --git a/theme/theme.config b/theme/theme.config index cd1b3b5..ef9e428 100644 --- a/theme/theme.config +++ b/theme/theme.config @@ -72,13 +72,13 @@ @themesFolder : '~volto-themes'; /* Path to site override folder */ -@siteFolder : "~@package/../theme/site"; +@siteFolder : "~@eeacms/volto-ims-theme/../theme/site"; /******************************* Import Theme *******************************/ @import (multiple) "~semantic-ui-less/theme.less"; -@fontPath : "../../@{theme}/assets/fonts"; +@fontPath : "~volto-themes/@{theme}/assets/fonts"; /* End Config */ \ No newline at end of file