From 99481ac24945ed9b0207e284d45bc953a5f8a534 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 18 Feb 2024 20:03:33 -0500 Subject: [PATCH] Remove `develop` dir --- .gitignore | 22 +++--- {develop => app}/cache/.gitkeep | 0 {develop => app}/database/.gitkeep | 0 {develop => app}/logs/.gitkeep | 0 {develop => app}/sessions/.gitkeep | 0 {develop => app}/storage/.gitkeep | 0 app/tests/AdminTestCase.php | 4 +- bakery | 4 +- composer.json | 1 - develop/App.php | 75 ------------------- develop/config/default.php | 18 ----- .../templates/content/scripts_site.html.twig | 3 - .../content/stylesheets_site.html.twig | 3 - public/index.php | 4 +- 14 files changed, 17 insertions(+), 117 deletions(-) rename {develop => app}/cache/.gitkeep (100%) rename {develop => app}/database/.gitkeep (100%) rename {develop => app}/logs/.gitkeep (100%) rename {develop => app}/sessions/.gitkeep (100%) rename {develop => app}/storage/.gitkeep (100%) delete mode 100644 develop/App.php delete mode 100755 develop/config/default.php delete mode 100644 develop/templates/content/scripts_site.html.twig delete mode 100644 develop/templates/content/stylesheets_site.html.twig diff --git a/.gitignore b/.gitignore index 6ac0296..e74d702 100644 --- a/.gitignore +++ b/.gitignore @@ -8,24 +8,24 @@ _meta/ # Ignore personal config files (dev) -develop/.env +app/.env # Ignore lock files composer.lock # Ignore log, cache, sessions and storage directories -develop/cache/* -develop/database/* -develop/logs/* -develop/sessions/* -develop/storage/* +app/cache/* +app/database/* +app/logs/* +app/sessions/* +app/storage/* # Unignore log, cache, sessions and storage .gitkeeps -!develop/cache/.gitkeep -!develop/database/.gitkeep -!develop/logs/.gitkeep -!develop/sessions/.gitkeep -!develop/storage/.gitkeep +!app/cache/.gitkeep +!app/database/.gitkeep +!app/logs/.gitkeep +!app/sessions/.gitkeep +!app/storage/.gitkeep # Ignore Composer vendor vendor/ diff --git a/develop/cache/.gitkeep b/app/cache/.gitkeep similarity index 100% rename from develop/cache/.gitkeep rename to app/cache/.gitkeep diff --git a/develop/database/.gitkeep b/app/database/.gitkeep similarity index 100% rename from develop/database/.gitkeep rename to app/database/.gitkeep diff --git a/develop/logs/.gitkeep b/app/logs/.gitkeep similarity index 100% rename from develop/logs/.gitkeep rename to app/logs/.gitkeep diff --git a/develop/sessions/.gitkeep b/app/sessions/.gitkeep similarity index 100% rename from develop/sessions/.gitkeep rename to app/sessions/.gitkeep diff --git a/develop/storage/.gitkeep b/app/storage/.gitkeep similarity index 100% rename from develop/storage/.gitkeep rename to app/storage/.gitkeep diff --git a/app/tests/AdminTestCase.php b/app/tests/AdminTestCase.php index ea2be74..9e62381 100644 --- a/app/tests/AdminTestCase.php +++ b/app/tests/AdminTestCase.php @@ -10,7 +10,7 @@ namespace UserFrosting\Sprinkle\Admin\Tests; -use UserFrosting\Develop\Admin\App; +use UserFrosting\Sprinkle\Admin\Admin; use UserFrosting\Testing\TestCase; /** @@ -18,5 +18,5 @@ */ class AdminTestCase extends TestCase { - protected string $mainSprinkle = App::class; + protected string $mainSprinkle = Admin::class; } diff --git a/bakery b/bakery index 850cc99..ab4daf4 100644 --- a/bakery +++ b/bakery @@ -27,10 +27,10 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) { } use UserFrosting\Bakery\Bakery; -use UserFrosting\Develop\Admin\App; +use UserFrosting\Sprinkle\Admin\Admin; /** * Get and run CLI App */ -$bakery = new Bakery(App::class); +$bakery = new Bakery(Admin::class); $bakery->run(); diff --git a/composer.json b/composer.json index c5d35c8..645f041 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ }, "autoload-dev": { "psr-4": { - "UserFrosting\\Develop\\Admin\\": "develop/", "UserFrosting\\Sprinkle\\Admin\\Tests\\": "app/tests/" } } diff --git a/develop/App.php b/develop/App.php deleted file mode 100644 index b4616be..0000000 --- a/develop/App.php +++ /dev/null @@ -1,75 +0,0 @@ - [ - 'admin' => [ - 'email' => 'example@example.com', - 'name' => 'Site Administrator', - ], - ], -]; diff --git a/develop/templates/content/scripts_site.html.twig b/develop/templates/content/scripts_site.html.twig deleted file mode 100644 index 810687a..0000000 --- a/develop/templates/content/scripts_site.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{# This file should contain the list of javascript script to include site wide. It will be injected into the base template #} -{# The `app` entry from Webpack config is loaded here #} -{% block scripts_site %}{{ encore_entry_script_tags('app') }}{% endblock %} \ No newline at end of file diff --git a/develop/templates/content/stylesheets_site.html.twig b/develop/templates/content/stylesheets_site.html.twig deleted file mode 100644 index 4f31547..0000000 --- a/develop/templates/content/stylesheets_site.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{# This file should contain the list of css to include site wide. It will be injected into the base template headers #} -{# The `app` entry from Webpack config is loaded here #} -{% block stylesheets_site %}{{ encore_entry_link_tags('app') }}{% endblock %} \ No newline at end of file diff --git a/public/index.php b/public/index.php index 400a0e0..a1922c5 100755 --- a/public/index.php +++ b/public/index.php @@ -15,8 +15,8 @@ // First off, we'll grab the Composer dependencies require_once __DIR__ . '/../vendor/autoload.php'; -use UserFrosting\Develop\Admin\App; +use UserFrosting\Sprinkle\Admin\Admin; use UserFrosting\UserFrosting; -$uf = new UserFrosting(App::class); +$uf = new UserFrosting(Admin::class); $uf->run();