Commit cae4dea8 authored by Michael Iseard's avatar Michael Iseard
Browse files

Merge remote-tracking branch 'origin/master'

parents 688eaf8e 55504c61
......@@ -15,17 +15,17 @@ Use the [yarn](https://yarnpkg.com/) and [composer](https://getcomposer.org/) pa
````bash
# install dependencies
yarn install
npm install
composer install
# start development
yarn run start
npm run watch
# build assets for export
yarn run build:production
npm run production
# export plugin to KUDOS_EXPORT folder and produce installable zip
yarn export
npm run export
````
### Docker
......
......@@ -8,7 +8,7 @@
"monolog/monolog": "^2.0",
"twig/twig": "^3.0",
"ext-json": "*",
"php": "7.2||^8.0",
"php": "^7.2||^8.0",
"woocommerce/action-scheduler": "^3.1",
"php-di/php-di": "^6.3",
"php-di/invoker": "2.0.0",
......
import {Btn} from "./Btn"
import {KudosLogo} from "./KudosLogo"
import {KudosLogo} from "../../../common/components/KudosLogo"
import {__} from "@wordpress/i18n"
import {applyFilters} from "@wordpress/hooks"
......
import {NewCampaignPanel} from "../Panels/NewCampaignPanel"
import {CampaignPanel} from "../Panels/CampaignPanel"
import {getQueryVar} from "../../../../helpers/util"
import {getQueryVar} from "../../../../common/helpers/util"
import {__} from "@wordpress/i18n"
import {Card, CardHeader, CardDivider, SelectControl} from "@wordpress/components"
import {Fragment, useState} from "@wordpress/element"
......
......@@ -12,7 +12,7 @@ import api from '@wordpress/api'
import {Notice} from './Components/Notice'
import {Header} from './Components/Header'
import {IntroGuide} from "./Components/IntroGuide"
import {getQueryVar, updateQueryParameter} from "../../helpers/util"
import {getQueryVar, updateQueryParameter} from "../../common/helpers/util"
import {MollieTab} from "./Components/Tabs/MollieTab"
import {CampaignsTab} from "./Components/Tabs/CampaignsTab"
import {CustomizeTab} from "./Components/Tabs/CustomizeTab"
......
import {KudosLogo} from "../../admin/Settings/Components/KudosLogo"
import {KudosLogo} from "../../common/components/KudosLogo"
const KudosButton = ({children, className, color}) => {
......
import {registerBlockType} from '@wordpress/blocks'
import Save from "./save"
import Edit from "./edit"
import logo from '../../images/logo-colour.svg'
import {KudosLogo} from "../../common/components/KudosLogo";
/**
* Register block.
*/
export default registerBlockType('iseardmedia/kudos-button', {
icon: <img width="30" src={logo} alt="Kudos Logo"/>,
icon: <KudosLogo/>,
edit: Edit,
save: Save
})
......@@ -4,8 +4,8 @@ import MicroModal from 'micromodal'
import 'jquery-validation'
import '../images/logo-colour-40.png' // used as email attachment
import '../images/logo-colour.svg'
import {getStyle, isVisible} from "../helpers/util"
import {handleMessages} from "../helpers/modal"
import {getStyle, isVisible} from "../common/helpers/util"
import {handleMessages} from "../common/helpers/modal"
import {__} from "@wordpress/i18n"
import {
......@@ -16,7 +16,7 @@ import {
resetForm,
resetProgressBar,
valueChange
} from "../helpers/form"
} from "../common/helpers/form"
jQuery(document).ready(($) => {
......
Supports Markdown
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