From a0c7bbe5df6b7a68556972af0358b95887e942b4 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Fri, 27 Aug 2021 13:14:31 +0100
Subject: [PATCH] Blockbase: Add social navigation to blockbase themes

---
 blockbase/block-template-parts/header.html      | 1 +
 blockbase/functions.php                         | 7 ++++---
 mayland-blocks/block-template-parts/header.html | 1 +
 mayland-blocks/functions.php                    | 7 -------
 quadrat/block-template-parts/header.html        | 1 +
 quadrat/functions.php                           | 7 -------
 seedlet-blocks/block-template-parts/header.html | 2 ++
 seedlet-blocks/functions.php                    | 7 -------
 skatepark/functions.php                         | 8 --------
 9 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/blockbase/block-template-parts/header.html b/blockbase/block-template-parts/header.html
index ee9829a999..2a35d35b8e 100644
--- a/blockbase/block-template-parts/header.html
+++ b/blockbase/block-template-parts/header.html
@@ -4,5 +4,6 @@
 	<!-- wp:site-title /-->
 	<!-- wp:site-tagline {"fontSize":"tiny"} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
+	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"social"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/blockbase/functions.php b/blockbase/functions.php
index 3fd82103a4..f6335dac75 100644
--- a/blockbase/functions.php
+++ b/blockbase/functions.php
@@ -30,10 +30,11 @@ function blockbase_support() {
 			)
 		);
 
-		// This theme has one menu location.
+		// Register two nav menus
 		register_nav_menus(
 			array(
 				'primary' => __( 'Primary Navigation', 'blockbase' ),
+				'social' => __( 'Social Navigation', 'blockbase' )
 			)
 		);
 
@@ -191,8 +192,8 @@ function blockbase_social_menu_render( $block_content, $block ) {
 		$nav_menu_locations = get_nav_menu_locations();
 		$social_menu_id = $nav_menu_locations['social'];
 		$class_name = 'is-style-logos-only';
-		if( !empty( $block['attrs']['itemsJustification'] ) && $block['attrs']['itemsJustification'] === 'right' ) {
-			$class_name .= ' items-justified-right';
+		if( !empty( $block['attrs']['itemsJustification'] ) ) {
+			$class_name .= ' items-justified-' . $block['attrs']['itemsJustification'];
 		}
 		$block_content = '<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--primary)","className":"' . $class_name . '"} --><ul class="wp-block-social-links has-icon-color ' . $class_name . '">';
 		$menu = wp_get_nav_menu_items( $social_menu_id );
diff --git a/mayland-blocks/block-template-parts/header.html b/mayland-blocks/block-template-parts/header.html
index df620e50d1..0a16240cfd 100644
--- a/mayland-blocks/block-template-parts/header.html
+++ b/mayland-blocks/block-template-parts/header.html
@@ -5,5 +5,6 @@
 <!-- wp:site-tagline {"fontSize":"tiny"} /-->
 <!-- wp:navigation {"orientation":"horizontal","textColor":"foreground-light","itemsJustification":"right","fontSize":"small","isResponsive":true,"__unstableLocation":"primary"} -->
 <!-- /wp:navigation -->
+<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
 </div>
 <!-- /wp:group -->
diff --git a/mayland-blocks/functions.php b/mayland-blocks/functions.php
index 53a0811cab..c95d6cc234 100644
--- a/mayland-blocks/functions.php
+++ b/mayland-blocks/functions.php
@@ -10,13 +10,6 @@ function mayland_blocks_support() {
 			)
 		);
 
-		// This theme has one menu location.
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'mayland-blocks' ),
-			)
-		);
-
 	}
 	add_action( 'after_setup_theme', 'mayland_blocks_support' );
 endif;
diff --git a/quadrat/block-template-parts/header.html b/quadrat/block-template-parts/header.html
index 312f44c9cc..7d7632772a 100644
--- a/quadrat/block-template-parts/header.html
+++ b/quadrat/block-template-parts/header.html
@@ -4,5 +4,6 @@
 	<!-- wp:site-title /-->
 	<!-- wp:site-tagline {"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
+	<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
 </header>
 <!-- /wp:group -->
diff --git a/quadrat/functions.php b/quadrat/functions.php
index b2fc4b5ba9..336028213b 100644
--- a/quadrat/functions.php
+++ b/quadrat/functions.php
@@ -17,13 +17,6 @@ function quadrat_support() {
 			'starter-content',
 			$quadrat_starter_content
 		);
-
-		// This theme uses wp_nav_menu() in two locations.
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'quadrat' ),
-			)
-		);
 	}
 	add_action( 'after_setup_theme', 'quadrat_support' );
 endif;
diff --git a/seedlet-blocks/block-template-parts/header.html b/seedlet-blocks/block-template-parts/header.html
index ca903a93c4..97ec124b03 100644
--- a/seedlet-blocks/block-template-parts/header.html
+++ b/seedlet-blocks/block-template-parts/header.html
@@ -11,6 +11,8 @@
 <!-- wp:navigation {"itemsJustification":"center","isResponsive":true,"__unstableLocation":"primary"} -->
 <!-- /wp:navigation -->
 
+<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"center","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
+
 <!-- wp:spacer {"height":60} -->
 <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
diff --git a/seedlet-blocks/functions.php b/seedlet-blocks/functions.php
index ea391ff237..caa759c9d8 100755
--- a/seedlet-blocks/functions.php
+++ b/seedlet-blocks/functions.php
@@ -12,13 +12,6 @@ function seedlet_blocks_support() {
 		)
 	);
 
-	// This theme has one menu location.
-	register_nav_menus(
-		array(
-			'primary' => __( 'Primary Navigation', 'seedlet-blocks' ),
-		)
-	);
-
 }
 add_action( 'after_setup_theme', 'seedlet_blocks_support' );
 
diff --git a/skatepark/functions.php b/skatepark/functions.php
index 4fd18198f2..b52916524b 100644
--- a/skatepark/functions.php
+++ b/skatepark/functions.php
@@ -9,14 +9,6 @@ function skatepark_support() {
 				'/assets/theme.css',
 			)
 		);
-
-		//Primary navigation is used on the header and the footer pattern
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'skatepark' ),
-				'social' => __( 'Social Navigation', 'skatepark' )
-			)
-		);
 	}
 	add_action( 'after_setup_theme', 'skatepark_support' );
 endif;