Merge branch 'develop'

Author: aristath

.distignore

@@ -10,6 +10,7 @@
 .env.example
 .gitignore
 .gitattributes
+.php-cs-fixer.dist.php
 composer.json
 composer.lock
 package.json

.gitignore

@@ -3,6 +3,7 @@
 .phpunit.result.cache
 node_modules
 .DS_Store
+.php-cs-fixer.cache
 
 # Playwright
 test-results/

.php-cs-fixer.dist.php

@@ -0,0 +1,19 @@
+<?php
+
+$finder = ( new PhpCsFixer\Finder() )
+	->in( __DIR__ )
+	->exclude(
+		[
+			'tests/',
+			'vendor/',
+			'node_modules/',
+		]
+	);
+
+return ( new PhpCsFixer\Config() )->setRules(
+	[
+		'native_function_invocation' => [
+			'include' => [ '@all' ],
+		],
+	]
+)->setFinder( $finder );

CHANGELOG.md

@@ -1,3 +1,14 @@
+= 1.6.0 =
+
+Enhancements:
+
+* Allow users to collect extra points for previous months' badges.
+* Added WP-CLI commands to manage recommendations.
+
+Under the hood:
+
+* Ravi's Recommendations are now a custom post type.
+
 = 1.5.0 =
 
 Added these recommendations from Ravi:

assets/css/admin.css

@@ -137,8 +137,6 @@
 			}
 		}
 	}
-
-
 }
 
 .prpl-hidden {
@@ -281,7 +279,6 @@ button.prpl-info-icon {
 	}
 }
 
-
 /*------------------------------------*\
   Buttons
 \*------------------------------------*/
@@ -481,3 +478,33 @@ button.prpl-info-icon {
 	grid-template-columns: repeat(2, 1fr);
 	gap: var(--prpl-padding);
 }
+
+/*------------------------------------*\
+	Loader.
+	See https://cssloaders.github.io/ for more.
+\*------------------------------------*/
+.prpl-loader {
+	width: 48px;
+	height: 48px;
+	border: 5px solid #fff;
+	border-bottom-color: transparent;
+	border-radius: 50%;
+	display: inline-block;
+	box-sizing: border-box;
+	animation: rotation 1s linear infinite;
+	z-index: 20;
+	position: absolute;
+	top: calc(50% - 24px);
+	left: calc(50% - 24px);
+}
+
+@keyframes rotation {
+
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}

assets/css/dashboard-widgets/score.css

@@ -3,7 +3,7 @@
 /**
  * Admin widget.
  *
- * Dependencies: progress-planner/web-components/prpl-suggested-task, progress-planner/web-components/prpl-badge
+ * Dependencies: progress-planner/suggested-task, progress-planner/web-components/prpl-badge
  */
 #progress_planner_dashboard_widget_score {
 

assets/css/page-widgets/suggested-tasks.css

@@ -3,7 +3,7 @@
 /**
  * Suggested tasks widget.
  *
- * Dependencies: progress-planner/web-components/prpl-suggested-task, progress-planner/web-components/prpl-badge
+ * Dependencies: progress-planner/suggested-task, progress-planner/web-components/prpl-badge
  */
 
 .prpl-widget-wrapper.prpl-suggested-tasks {
@@ -96,16 +96,19 @@
 
 .prpl-dashboard-widget-suggested-tasks {
 
+	&:not(:has(.prpl-suggested-tasks-loading)):not(:has(.prpl-suggested-tasks-list li)) {
+
+		.prpl-no-suggested-tasks {
+			display: block;
+		}
+	}
+
 	&:has(.prpl-suggested-tasks-list li) {
 
 		.prpl-widget-title {
 			display: flex;
 		}
 
-		.prpl-no-suggested-tasks {
-			display: none;
-		}
-
 		hr {
 			display: block;
 		}
@@ -116,11 +119,16 @@
 		display: none;
 	}
 
-	.prpl-no-suggested-tasks {
-		display: block;
+	.prpl-no-suggested-tasks,
+	.prpl-suggested-tasks-loading {
+		display: none;
 		background-color: var(--prpl-background-green);
 		padding: calc(var(--prpl-padding) / 2);
 	}
+
+	.prpl-suggested-tasks-loading {
+		display: block;
+	}
 }
 
 .prpl-suggested-tasks-list {
@@ -132,11 +140,8 @@
 		border-bottom: none;
 	}
 
-	prpl-suggested-task:nth-child(odd) {
-
-		.prpl-suggested-task {
-			background-color: #f9fafb;
-		}
+	.prpl-suggested-task:nth-child(odd) {
+		background-color: #f9fafb;
 	}
 
 	/* If task has disabled checkbox it's title should be italic. */
@@ -223,7 +228,6 @@
 	flex-direction: column;
 	justify-content: space-between;
 
-
 	.progress-label {
 		display: inline-block;
 	}
@@ -544,7 +548,6 @@
 					}
 				}
 
-
 				/* Checkmark */
 				.prpl-custom-control::after {
 					content: "";

assets/css/page-widgets/todo.css

@@ -1,7 +1,7 @@
 /**
  * TODOs widget.
  *
- * Dependencies: progress-planner/web-components/prpl-suggested-task
+ * Dependencies: progress-planner/suggested-task
  */
 
 .prpl-widget-wrapper.prpl-todo {
@@ -145,7 +145,6 @@
 		}
 	}
 
-
 	#create-todo-item {
 		padding: 0 16px;
 	}
@@ -192,3 +191,22 @@
 		display: none;
 	}
 }
+
+#todo-list {
+
+	&:has(.prpl-loader) {
+		position: relative;
+
+		&::before {
+			content: "";
+			display: block;
+			width: 100%;
+			height: 100%;
+			background-color: rgba(0, 0, 0, 0.2);
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 10;
+		}
+	}
+}

assets/css/page-widgets/whats-new.css

@@ -25,7 +25,6 @@
 			}
 		}
 
-
 		img {
 			width: 100%;
 		}

assets/css/settings-page.css

@@ -48,8 +48,6 @@
 				padding: var(--prpl-settings-page-gap) var(--prpl-settings-page-gap) 2rem var(--prpl-settings-page-gap);
 			}
 		}
-
-
 	}
 
 	.prpl-settings-section-title {
@@ -108,7 +106,6 @@
 			}
 		}
 
-
 		.item-actions,
 		.prpl-select-page {
 			display: flex;
@@ -251,7 +248,6 @@
 
 }
 
-
 /* License */
 .prpl-column-license {
 
@@ -298,7 +294,6 @@
 
 }
 
-
 /* Grid layout for wrapper for:
 - Valuable post types
 - Default login destination