Merge pull request #6 from DiscipleTools/3.0-Upgrade

3.0 upgrade

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Build project
         run: |
           mkdir disciple-tools-streams
-          cp -r disciple-tools-streams.php admin languages metrics post-type spinner.svg version-control.json LICENSE SECURITY.md disciple-tools-streams/
+          cp -r disciple-tools-streams.php admin languages metrics magic post-type spinner.svg version-control.json LICENSE SECURITY.md disciple-tools-streams/
           zip -r disciple-tools-streams.zip disciple-tools-streams
       - name: Create Release
         id: create_release

disciple-tools-streams.php

@@ -2,15 +2,15 @@
 /**
  *Plugin Name: Disciple.Tools - Streams
  * Plugin URI: https://github.com/DiscipleTools/disciple-tools-streams
- * Description: Disciple.Tools Streams Extension adds recording of streams and cross reference them with contacts, churches, and locations.
+ * Description: Streams creates collections of work and a generational census reporting magic link system.
  * Text Domain: disciple-tools-streams
  * Domain Path: /languages
- * Version:  2.6
+ * Version:  3.0
  * Author URI: https://github.com/DiscipleTools
  * GitHub Plugin URI: https://github.com/DiscipleTools/disciple-tools-streams
  * Requires at least: 4.7.0
  * (Requires 4.7+ because of the integration of the REST API at 4.7 and the security requirements of this milestone version.)
- * Tested up to: 5.8
+ * Tested up to: 6.2
  *
  * @package Disciple_Tools
  * @link    https://github.com/DiscipleTools
@@ -122,24 +122,22 @@ private function __construct() {
     private function includes() {
 
         /* post type */
-        require_once( 'post-type/loader.php' );
-
-        require_once( 'sending/bulk-list-extension.php' );
-
-        /* site linking */
+        require_once( 'post-type/streams-post-type.php' );
+        require_once( 'post-type/bulk-list-extension.php' );
+        require_once( 'magic/magic-url-self-register.php' );
         require_once( 'admin/customize-site-linking.php' );
-        require_once( 'post-type/enqueue.php' );
-
 
         /* metrics */
-        require_once( 'metrics/mapbox-maps.php' );
-        require_once( 'metrics/mapbox-personal-maps.php' );
+        require_once( 'metrics/charts-loader.php' );
 
         /* magic links */
-        require_once( 'magic-link/magic-map.php' );
-        require_once( 'magic-link/magic-registration.php' );
-        require_once( 'magic-link/magic-retrieve-link.php' );
-        require_once( 'magic-link/access.php' );
+        require_once( 'magic/magic-map.php' );
+        require_once( 'magic/magic-reports.php' );
+
+        require_once( 'magic/magic-public-register.php' );
+        require_once( 'magic/magic-retrieve.php' );
+        require_once( 'magic/magic-join.php' );
+        require_once( 'magic/magic-create-child.php' );
     }
 
     /**