Use existing copyright component in footer (#827)

* use existing copyright component in footer * removed typography component from copyright * return getManifestByDir
infinum · May 15, 2024 · b7f2e79 · b7f2e79
1 parent 341c42b
commit b7f2e79
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 26 deletions.
diff --git a/blocks/init/src/Blocks/components/copyright/components/copyright-editor.js b/blocks/init/src/Blocks/components/copyright/components/copyright-editor.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { selector, checkAttr, classnames } from '@eightshift/frontend-libs/scripts';
+import { RichText } from '@wordpress/block-editor';
+import { selector, checkAttr, classnames, getAttrKey } from '@eightshift/frontend-libs/scripts';
 import manifest from './../manifest.json';
 
 export const CopyrightEditor = (attributes) => {
@@ -11,12 +12,12 @@ export const CopyrightEditor = (attributes) => {
 		selectorClass = componentClass,
 		blockClass,
 		additionalClass,
+		setAttributes
 	} = attributes;
 
 	const copyrightUse = checkAttr('copyrightUse', attributes, manifest);
-	const copyrightBy = checkAttr('copyrightBy', attributes, manifest);
-	const copyrightYear = checkAttr('copyrightYear', attributes, manifest) ?? new Date().getFullYear();
 	const copyrightContent = checkAttr('copyrightContent', attributes, manifest);
+	const copyrightYear = new Date().getFullYear();
 
 	const copyrightClass = classnames(
 		selector(componentClass, componentClass),
@@ -30,7 +31,12 @@ export const CopyrightEditor = (attributes) => {
 
 	return (
 		<div className={copyrightClass}>
-			&copy; {copyrightBy} {copyrightYear} - {copyrightContent}
+			&copy;{copyrightYear} | <RichText
+				value={copyrightContent}
+				onChange={(value) => setAttributes({ [getAttrKey('copyrightContent', attributes, manifest)]: value })}
+				keepPlaceholderOnFocus
+				allowedFormats={[]}
+			/>
 		</div>
 	);
 };
diff --git a/blocks/init/src/Blocks/components/copyright/components/copyright-options.js b/blocks/init/src/Blocks/components/copyright/components/copyright-options.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { Toggle, checkAttr, getAttrKey } from '@eightshift/frontend-libs/scripts';
+import manifest from '../manifest.json';
+
+export const CopyrightOptions = (attributes) => {
+	const {
+		setAttributes
+	} = attributes;
+
+	const copyrightUse = checkAttr('copyrightUse', attributes, manifest);
+
+	return (
+		<Toggle
+			label={__('Copyright', 'eightshift-frontend-libs')}
+			checked={copyrightUse}
+			onChange={(value) => setAttributes({ [getAttrKey('copyrightUse', attributes, manifest)]: value })}
+			reducedBottomSpacing
+		/>
+	);
+};
diff --git a/blocks/init/src/Blocks/components/copyright/copyright.php b/blocks/init/src/Blocks/components/copyright/copyright.php
@@ -20,8 +20,7 @@
 $blockClass = $attributes['blockClass'] ?? '';
 $selectorClass = $attributes['selectorClass'] ?? $componentClass;
 
-$copyrightBy = Components::checkAttr('copyrightBy', $attributes, $manifest);
-$copyrightYear = Components::checkAttr('copyrightYear', $attributes, $manifest);
+$copyrightYear = date('Y');
 $copyrightContent = Components::checkAttr('copyrightContent', $attributes, $manifest);
 
 $copyrightClass = Components::classnames([
@@ -32,5 +31,5 @@
 
 ?>
 <div class="<?php echo esc_attr($copyrightClass); ?>">
-	<?php echo esc_html("&copy; {$copyrightBy} {$copyrightYear} - {$copyrightContent}"); ?>
+	<?php echo esc_html("&copy;{$copyrightYear} | {$copyrightContent}"); ?>
 </div>
diff --git a/blocks/init/src/Blocks/components/copyright/manifest.json b/blocks/init/src/Blocks/components/copyright/manifest.json
@@ -3,26 +3,14 @@
 	"componentName": "copyright",
 	"title": "Copyright",
 	"componentClass": "copyright",
-	"example": {
-		"attributes": {
-			"copyrightBy": "Eightshift",
-			"copyrightContent": "Made with ❤️ by Team Eightshift",
-			"copyrightUse": true
-		}
-	},
 	"attributes": {
-		"copyrightBy": {
-			"type": "string"
-		},
-		"copyrightYear": {
-			"type": "string"
-		},
-		"copyrightContent": {
-			"type": "string"
-		},
 		"copyrightUse": {
 			"type": "boolean",
 			"default": true
+		},
+		"copyrightContent": {
+			"type": "string",
+			"default": "Made with ❤️ by Team Eightshift"
 		}
 	}
 }
diff --git a/blocks/init/src/Blocks/custom/site-footer/components/site-footer-editor.js b/blocks/init/src/Blocks/custom/site-footer/components/site-footer-editor.js
@@ -42,7 +42,7 @@ export const SiteFooterEditor = ({ attributes, setAttributes }) => {
 				})}
 			/>
 
-			<ParagraphEditor
+			<CopyrightEditor
 				{...props('copyright', attributes, {
 					blockClass: blockClass,
 					selectorClass: 'copyright',

diff --git a/blocks/init/src/Blocks/custom/site-footer/components/site-footer-options.js b/blocks/init/src/Blocks/custom/site-footer/components/site-footer-options.js
@@ -4,6 +4,7 @@ import { PanelBody } from '@wordpress/components';
 import { props } from '@eightshift/frontend-libs/scripts';
 import { ImageOptions } from '../../../components/image/components/image-options';
 import { SocialNetworksOptions } from '../../../components/social-networks/components/social-networks-options';
+import { CopyrightOptions } from '../../../components/copyright/components/copyright-options';
 
 export const SiteFooterOptions = ({ attributes, setAttributes }) => {
 	return (
@@ -16,6 +17,12 @@ export const SiteFooterOptions = ({ attributes, setAttributes }) => {
 				reducedBottomSpacing
 			/>
 
+			<CopyrightOptions
+				{...props('copyright', attributes, { setAttributes })}
+				label={__('Copyright', 'eightshift-frontend-libs')}
+				reducedBottomSpacing
+			/>
+
 			<SocialNetworksOptions
 				{...props('socialNetworks', attributes, { setAttributes })}
 				hideModeSelector

diff --git a/blocks/init/src/Blocks/custom/site-footer/manifest.json b/blocks/init/src/Blocks/custom/site-footer/manifest.json
@@ -32,7 +32,7 @@
 	},
 	"components": {
 		"logo": "image",
-		"copyright": "paragraph",
+		"copyright": "copyright",
 		"socialNetworks": "social-networks"
 	}
 }
diff --git a/blocks/init/src/Blocks/custom/site-footer/site-footer.php b/blocks/init/src/Blocks/custom/site-footer/site-footer.php
@@ -48,7 +48,7 @@ class="<?php echo esc_attr($linkClass); ?>"
 	echo Components::render('social-networks', Components::props('socialNetworks', $attributes, [
 		'blockClass' => $blockClass,
 	])),
-	Components::render('paragraph', Components::props('copyright', $attributes, [
+	Components::render('copyright', Components::props('copyright', $attributes, [
 		'blockClass' => $blockClass,
 		'selectorClass' => 'copyright',
 	]));