Merge branch 'master' of github.com:hydephp/hyde

hydephp · Mar 24, 2022 · 7916482 · 7916482
2 parents dac6016 + 6f87da2
commit 7916482
Show file tree

Hide file tree

Showing 18 changed files with 765 additions and 36 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "hyde/framework": "dev-master",
+        "hyde/framework": "^0.5.0",
         "illuminate/view": "^9.0",
         "laminas/laminas-text": "*",
         "laravel-zero/framework": "^9.0",
@@ -50,5 +50,8 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "bin": ["hyde"]
+    "bin": ["hyde"],
+    "suggest": {
+        "torchlight/torchlight-commonmark" : "Hyde has automatic support for the Torchlight syntax highlighting API which is highly reccomended if your site uses code snippets."
+    }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
@@ -71,6 +71,7 @@
     'providers' => [
         App\Providers\AppServiceProvider::class,
         Hyde\Framework\HydeServiceProvider::class,
+        Hyde\Framework\HomeServiceProvider::class,
     ],
 
     'aliases' => [

diff --git a/config/commands.php b/config/commands.php
@@ -42,11 +42,12 @@
     'add' => [
         Hyde\Framework\Commands\BuildStaticSiteCommand::class,
         Hyde\Framework\Commands\Debug::class,
-        Hyde\Framework\Commands\InspireCommand::class,
         Hyde\Framework\Commands\MakePostCommand::class,
         Hyde\Framework\Commands\MakeValidatorCommand::class,
         Hyde\Framework\Commands\HydePublishViewsCommand::class,
         Hyde\Framework\Commands\HydePublishConfigsCommand::class,
+        Hyde\Framework\Commands\HydePublishHomepageCommand::class,
+        Hyde\Framework\Commands\HydeInstallerCommand::class,
         Hyde\Framework\Commands\Validate::class,
     ],
 
@@ -70,6 +71,7 @@
         Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
         LaravelZero\Framework\Commands\StubPublishCommand::class,
         Hyde\Framework\Commands\MakeValidatorCommand::class,
+        Hyde\Framework\Commands\PublishStubsCommand::class,
         Hyde\Framework\Commands\Debug::class,
     ],
 

diff --git a/config/hyde.php b/config/hyde.php
@@ -31,7 +31,7 @@
     |
     */
 
-    'name' => 'HydePHP',
+    'name' => env('SITE_NAME', 'HydePHP'),
 
 
     /*
@@ -45,7 +45,7 @@
     | If you are serving your site from a subdirectory, you will
     | need to include that in the path without a trailing slash.
     |
-    | Example: https://example.com/blog
+    | Example: https://example.org/blog
     |
     */
     'site_url' => env('SITE_URL', null),
@@ -90,6 +90,8 @@
         Features::bladePages(),
         Features::markdownPages(),
         Features::documentationPages(),
+
+        Features::torchlight(),
     ],
 
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,10 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
+        <testsuite name="Setup" stopOnFailure="true">
+            <!-- Contains Smoke Tests -->
+            <directory suffix="Test.php">./tests/Setup</directory>
+        </testsuite>
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
@@ -21,12 +25,15 @@
     </testsuites>
     <coverage processUncoveredFiles="true">
         <include>
-            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">./vendor/hyde/framework/src</directory>
         </include>
     </coverage>
     <groups>
         <exclude>
             <group>validators</group>
         </exclude>
     </groups> 
+    <php>
+        <env name="ENV" value="testing"/>
+    </php>
 </phpunit>
diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php
@@ -39,12 +39,19 @@ class="text-5xl font-extrabold leading-10 tracking-tight text-left text-gray-100
                     <span class="block text-4xl md:text-5xl mb-4 sm:mb-0">You're running on</span> <span
                         class="relative mt-2 text-transparent bg-clip-text bg-gradient-to-br logo-gradient md:inline-block drop-shadow-2xl tracking-normal">HydePHP</span>
                 </h1>
-                <div class="mx-auto mt-8 sm:mt-4 text-gray-200 md:mt-8 md:max-w-2xl md:text-center lg:text-lg">
-                    <p aria-label="About Hyde">
+                <div class="mx-auto mt-8 sm:mt-4 text-gray-200 md:mt-8 md:max-w-2xl md:text-center">
+                    <p aria-label="About Hyde" class="lg:text-lg">
                         Leap into the future of static HTML blogs and documentation with the tools you already know and
                         love. Made with Tailwind, Laravel, and Coffee.
                     </p>
-                    <p aria-label="Getting Started" class="mt-4 text-white flex flex-wrap justify-center">
+                    <p aria-label="About this page" class="mt-4 mb-4">
+                        This is the default homepage stored as index.blade.php, however you can publish any of the built in views using the following command:
+
+                        <!-- Syntax highlighted by torchlight.dev -->
+                        <pre style="margin-top: 1.5rem; margin-bottom: 1.5rem;"><code data-theme="material-theme-palenight" data-lang="bash" class="torchlight" style="background-color: #292D3E; padding: 0.5rem 1rem; border-radius: 0.25rem;"><span style="color: #FFCB6B;">php hyde</span> <span style="color: #C3E88D;">publish:homepage</span></code></pre>
+
+                    </p>
+                    <p aria-label="Getting started" class="mt-4 md:mt-8 text-white flex flex-wrap justify-center">
                         <a href="https://hydephp.github.io/docs/docs" class="uppercase font-bold text-sm flex text-center m-2 mx-3">
                             Documentation
                         </a>