Move s3-page to s3/s3-options-page.php

Author: john-shaffer

flake.nix

@@ -39,16 +39,18 @@
             let base = baseNameOf path;
             in type == "directory" && base == "src"
             || pkgs.lib.hasInfix "/src/" path || type == "directory" && base
-            == "views" || type == "regular" && pkgs.lib.hasSuffix ".php" base
-            || base == "composer.json" || base == "composer.lock";
+            == "views" || pkgs.lib.hasInfix "/views/" path || type == "regular"
+            && pkgs.lib.hasSuffix ".php" base || base == "composer.json"
+            || base == "composer.lock";
         };
         wp2staticSrcDev = pkgs.lib.cleanSourceWith {
           src = self;
           filter = path: type:
             let base = baseNameOf path;
             in type == "directory" && base == "src" || type == "directory"
             && base == "tests" || pkgs.lib.hasInfix "/tests/" path || type
-            == "directory" && base == "views" || type == "regular"
+            == "directory" && base == "views"
+            || pkgs.lib.hasInfix "/views/" path || type == "regular"
             && pkgs.lib.hasSuffix ".php" base || base == "composer.json" || base
             == "composer.lock" || base == "phpcs.xml" || base == "phpunit.xml";
         };

src/S3/Controller.php

@@ -73,7 +73,7 @@ public static function renderS3Page(): void {
             is_file( $s3_path ) ?
                 \WP2Static\SiteInfo::getUrl( 'uploads' ) . 'wp2static-processed-site.s3' : '#';
 
-        require_once __DIR__ . '/../views/s3-page.php';
+        require_once __DIR__ . '/../../views/s3/s3-options-page.php';
     }