Redesign

Envoy.blade.php

@@ -2,9 +2,23 @@
 require __DIR__.'/vendor/autoload.php';
 \Dotenv\Dotenv::create(\Illuminate\Support\Env::getRepository(), __DIR__)->load();
 
-$server = "myray.app";
+$environment ??= 'staging';
+$branch ??= 'main';
+
+$server = match($environment) {
+    'next' => 'next.myray.app',
+    'production' => 'myray.app',
+    default => 'next.myray.app',
+};
+
+$branch = match($environment) {
+    'next' => 'redesign',
+    'production' => 'main',
+    default => 'redesign',
+};
+
 $userAndServer = 'forge@'. $server;
-$repository = "spatie/{$server}";
+$repository = "spatie/myray.app";
 $baseDir = "/home/forge/{$server}";
 $releasesDir = "{$baseDir}/releases";
 $persistentDir = "{$baseDir}/persistent";
@@ -41,8 +55,8 @@ function logMessage($message) {
 
 @task('startDeployment', ['on' => 'local'])
 {{ logMessage("🏃  Starting deployment...") }}
-git checkout main
-git pull origin main
+git checkout {{ $branch }}
+git pull origin {{ $branch }}
 @endtask
 
 @task('cloneRepository', ['on' => 'remote'])
@@ -56,7 +70,7 @@ function logMessage($message) {
 mkdir {{ $newReleaseDir }};
 
 # Clone the repo
-git clone --depth 1 [email protected]:{{ $repository }} {{ $newReleaseName }}
+git clone --depth 1 [email protected]:{{ $repository }} --branch {{ $branch }} {{ $newReleaseName }}
 
 # Configure sparse checkout
 cd {{ $newReleaseDir }}
@@ -152,7 +166,7 @@ function logMessage($message) {
 @task('deployOnlyCode',['on' => 'remote'])
 {{ logMessage("💻  Deploying code changes...") }}
 cd {{ $currentDir }}
-git pull origin main
+git pull origin {{ $branch }}
 php artisan config:clear
 php artisan cache:clear
 php artisan config:cache

app/Domain/Docs/BladeParsingExtension.php

@@ -12,86 +12,73 @@
 use League\CommonMark\Extension\CommonMark\Node\Inline\Code;
 use League\CommonMark\Extension\ExtensionInterface;
 use \League\CommonMark\Environment\EnvironmentBuilderInterface;
+use League\CommonMark\Node\Inline\Text;
 use League\CommonMark\Output\RenderedContent;
 use League\CommonMark\Renderer\HtmlRenderer;
 
 class BladeParsingExtension implements ExtensionInterface
 {
-    private EnvironmentBuilderInterface $environment;
-
     protected array $rendered = [];
 
+    protected array $components = [
+        '<x-docs.integrations-overview />',
+    ];
+
     public function register(EnvironmentBuilderInterface $environment): void
     {
-        $this->environment = $environment;
-
         $environment->addEventListener(
             DocumentParsedEvent::class, [$this, 'onDocumentParsed'], -10
         );
 
         $environment->addEventListener(
-            DocumentRenderedEvent::class, [$this, 'onDocumentRendered'], 10
+            DocumentRenderedEvent::class, [$this, 'onDocumentRendered'], 10000
         );
     }
 
-    public function onDocumentParsed(DocumentParsedEvent $event)
+    public function onDocumentParsed(DocumentParsedEvent $event): void
     {
-        // Walk through every node in the document
         foreach ($event->getDocument()->iterator() as $node) {
-            // We're only looking for code nodes.
-            if (!$this->isCodeNode($node)) {
+            if (!$this->isKnownComponent($node)) {
                 continue;
             }
 
-            // Create a unique, random ID
             $id = Str::uuid()->toString();
 
-            // Create a new HTML block that just has our placeholder
             $replacement = new HtmlBlock(HtmlBlock::TYPE_6_BLOCK_ELEMENT);
 
             $replacement->setLiteral("[[replace:$id]]");
 
-            // Replace the code node with our placeholder
             $node->replaceWith($replacement);
 
-            // Create an identical renderer to the main one
-            $renderer = new HtmlRenderer($this->environment);
-
-            // Render the code node and stash it away.
-            $this->rendered[$id] = $renderer->renderNodes([$node]);
+            $this->rendered[$id] = Blade::render($node->getLiteral());
         }
     }
 
-    public function onDocumentRendered(DocumentRenderedEvent $event)
+    public function onDocumentRendered(DocumentRenderedEvent $event): void
     {
         $search = [];
-
         $replace = [];
 
-        // Gather up all the placeholders and their real content
         foreach ($this->rendered as $id => $content) {
             $search[] = "[[replace:$id]]";
             $replace[] = $content;
         }
 
-        // The HTML that Commonmark generated
         $content = $event->getOutput()->getContent();
 
-        // First render the output without code blocks.
-        $content = Blade::render($content);
-
-        // Then add the code blocks back in.
         $content = Str::replace($search, $replace, $content);
 
-        // And replace the entire response with our new, Blade-processed output.
         $event->replaceOutput(
             new RenderedContent($event->getOutput()->getDocument(), $content)
         );
     }
 
-    protected function isCodeNode($node)
+    protected function isKnownComponent($node): bool
     {
-        return $node instanceof FencedCode
-            || $node instanceof IndentedCode;
+        if (!$node instanceof Text) {
+            return false;
+        }
+
+        return in_array($node->getLiteral(), $this->components);
     }
 }

app/Http/Front/Controllers/DocsController.php

@@ -8,6 +8,7 @@ class DocsController
 {
     private DocTree $docTree;
 
+
     public function __construct()
     {
         $this->docTree = DocTree::build();
@@ -42,13 +43,18 @@ public function show(string $slug)
 
         $category = $this->docTree->findCategory($page->category);
 
+        $index = $category->pages->search(fn ($p) => $p->slug === $page->slug);
+
+        $prev = $category->pages->get($index - 1);
+        $next = $category->pages->get($index + 1);
+
         $categories = [];
         while($category !== null) {
             $categories[] = $category;
             $category = $category->parent ?? null;
         }
         $categories = array_reverse($categories);
 
-        return view('front.docs.index', compact('page', 'slug', 'categories'));
+        return view('docs.show', compact('page', 'slug', 'categories', 'prev', 'next'));
     }
 }

app/Http/Front/Controllers/HomeController.php

@@ -15,7 +15,7 @@ public function __invoke(Request $request)
 
         $prices = SpatiePriceApi::getPriceForPurchasable($purchasableId);
 
-        return view('front.home.index', [
+        return view('home.index', [
             'downloadLinkMacIntel' => spatieUrl('https://spatie.be/products/ray/download/macosIntel/latest'),
             'downloadLinkMacAppleSilicon' => spatieUrl('https://spatie.be/products/ray/download/macosAppleSilicon/latest'),
             'downloadLinkWindows' => spatieUrl('https://spatie.be/products/ray/download/windows/latest'),
@@ -33,14 +33,14 @@ protected function getTestimonials(): Collection
         return collect([
             new Testimonial(
                 name: 'Taylor Otwell',
-                text: 'Ray is <strong class=" font-black text-2xl block">Life</strong>',
+                text: '<span class="text-2xl">Ray is life</span>',
                 image: 'taylor',
                 url: 'https://twitter.com/taylorotwell',
                 title: 'Laravel Founder & Creator',
             ),
             new Testimonial(
                 name: 'Michael Dyrynda',
-                text: 'As an amateur developer that swears by <code>dd()</code>, I was thrilled to hear about Ray. Now
+                text: 'As an amateur developer that swears by dd(), I was thrilled to hear about Ray. Now
     I can <strong class="font-semibold">feel like a real developer</strong>, even without using \'real\'
     debugging tools!',
                 image: 'michael',
@@ -56,8 +56,8 @@ protected function getTestimonials(): Collection
             ),
             new Testimonial(
                 name: 'Nuno Maduro',
-                text: 'Ray is a part of my <strong class="font-semibold">Essentials</strong> toolbox. It has the
-        snapiness of a real debugger, but the simplicity of <code>dd()</code>',
+                text: 'Ray is a part of my <strong class="font-bold">Essentials</strong> toolbox. It has the
+        snapiness of a real debugger, but the simplicity of dd()',
                 image: 'nuno',
                 url: 'https://twitter.com/enunomaduro',
                 title: 'Software engineer at Laravel',
@@ -127,7 +127,7 @@ protected function getTestimonials(): Collection
             ),
             new Testimonial(
                 name: 'Caneco',
-                text: 'dd() is for now, ray() is forever… or at least until you clear your log screen.',
+                text: 'dd() is for now, Ray() is forever… or at least until you clear your log screen.',
                 image: 'caneco',
                 url: 'https://twitter.com/caneco',
                 title: 'Full Stack Developer at Mediacare',
@@ -148,7 +148,7 @@ protected function getTestimonials(): Collection
             ),
             new Testimonial(
                 name: 'Daniel Koop',
-                text: 'I have just started using ray and I just love the simplicity of the tool. It is a neat way for debugging without a configuration hassle and I love the pause feature rather than running sleep.',
+                text: 'I have just started using Ray and I just love the simplicity of the tool. It is a neat way for debugging without a configuration hassle and I love the pause feature rather than running sleep.',
                 image: 'mrkoopie',
                 url: 'https://twitter.com/mrkoopie',
                 title: 'WordPress and Laravel developer',
@@ -204,7 +204,7 @@ protected function getTestimonials(): Collection
             ),
             new Testimonial(
                 name: 'Andre Biel',
-                text: 'Despite being awesome in so many different ways, ray is the missing dd() for pure API applications.',
+                text: 'Despite being awesome in so many different ways, Ray is the missing dd() for pure API applications.',
                 image: 'andre',
                 url: 'https://twitter.com/the_real_biel',
                 title: 'Co-founder Nice Outside',
@@ -225,7 +225,7 @@ protected function getTestimonials(): Collection
             ),
             new Testimonial(
                 name: 'JL',
-                text: "Ray is a 'ray' of sunshine that saves me time digging into log files or the response tab in chrome. Wordpress, Laravel, Yii: I've used ray everywhere and it's done nothing but make me more productive.",
+                text: "Ray is a 'ray' of sunshine that saves me time digging into log files or the response tab in Chrome. Wordpress, Laravel, Yii: I've used Ray everywhere and it's done nothing but make me more productive.",
                 image: 'jl',
                 url: 'https://twitter.com/JLadHDeveloper',
                 title: 'Full Stack Wildcard Developer',

app/Http/Front/Controllers/PostsController.php

@@ -12,7 +12,7 @@ public function index()
     {
         $posts = ContentApi::getPosts('ray', request('page', 1), theme: 'nord');
 
-        return view('front.blog.index', [
+        return view('blog.index', [
             'posts' => $posts,
         ]);
     }
@@ -31,7 +31,7 @@ public function detail(string $slug)
 
         abort_if(is_null($post), 404);
 
-        return view('front.blog.show', [
+        return view('blog.show', [
             'post' => $post,
         ]);
     }

app/Livewire/DocSearch.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire;
 
-use Illuminate\Support\Collection;
 use Livewire\Component;
 use Spatie\SiteSearch\Search;
 use Spatie\SiteSearch\SearchResults\SearchResults;

app/Providers/AppServiceProvider.php

@@ -22,8 +22,6 @@ public function boot(): void
             'error' => 'alert-error',
         ]);
 
-        Blade::component('app.components.buyButton', 'buy-button');
-
         Blade::directive('markdown', function () {
             return "<?php echo (new \League\CommonMark\CommonMarkConverter())->convertToHtml(<<<HEREDOC";
         });

app/View/Components/DocsNavigation.php

@@ -15,6 +15,6 @@ public function render(): View|Closure|string
 
         $slug = request()->route()->parameter('slug');
 
-        return view('components.docs-navigation', compact('navigation', 'slug'));
+        return view('components.docs.navigation.index', compact('navigation', 'slug'));
     }
 }

app/View/Components/Download.php

@@ -10,7 +10,7 @@ class Download extends Component
 {
     public function render(): View|Closure|string
     {
-        return view('components.download', [
+        return view('components.download.template', [
             'downloadLinkMacIntel' => spatieUrl('https://spatie.be/products/ray/download/macosIntel/latest'),
             'downloadLinkMacAppleSilicon' => spatieUrl('https://spatie.be/products/ray/download/macosAppleSilicon/latest'),
             'downloadLinkWindows' => spatieUrl('https://spatie.be/products/ray/download/windows/latest'),

app/View/Components/IntegrationsOverview.php → app/View/Components/docs/IntegrationsOverview.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\View\Components;
+namespace App\View\Components\docs;
 
 use Closure;
 use Illuminate\Contracts\View\View;
@@ -24,6 +24,6 @@ public function render(): View|Closure|string
                 $doc->parts[count($doc->parts) -1] === '_index.md';
         });
 
-        return view('components.integrations-overview', compact('docs'));
+        return view('components.docs.integrations-overview', compact('docs'));
     }
 }

composer.json

@@ -21,6 +21,7 @@
         "aws/aws-sdk-php": "^3.211",
         "blade-ui-kit/blade-ui-kit": "^0.4",
         "fakerphp/faker": "^1.9.1",
+        "gehrisandro/tailwind-merge-laravel": "^1.2",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/framework": "^10.8",
         "laravel/socialite": "^5.6",