Merge branch 'main' into allthebookmarks-com

2025-02-05 06:43:05 -05:00
parent 72cbdc222e
commit da6adc35b0
94 changed files with 329 additions and 189 deletions
--- a/composer.json
+++ b/composer.json
@ -23,7 +23,6 @@
    ],
    "require":
    {
-        "components/jquery": "1.9.*",
        "fortawesome/font-awesome": "4.7",
        "thetempusproject/bedrock": "1.1.5",
        "thetempusproject/canary": "1.0.9",
@ -39,14 +38,12 @@
        "classmap":
        [
            "app/classes",
-            "app/models"
-        ],
-        "psr-4":
-        {
-            "TheTempusProject\\Bedrock\\": "vendor/thetempusproject/bedrock",
-            "TheTempusProject\\Canary\\": "vendor/thetempusproject/canary",
-            "TheTempusProject\\Houdini\\": "vendor/thetempusproject/houdini"
-        }
+            "app/controllers",
+            "app/controllers/admin",
+            "app/controllers/api",
+            "app/models",
+            "app/plugins"
+        ]
    },
    "scripts":
    {