Add recognition for drafter v4 and update bootstrap

Author: SMillerDev

phpdraft

@@ -12,9 +12,8 @@ require_once 'vendor/autoload.php';
 
 use PHPDraft\In\ApibFileParser;
 use PHPDraft\Out\UI;
-use PHPDraft\Parse\Drafter;
-use PHPDraft\Parse\DrafterAPI;
 use PHPDraft\Parse\JsonToHTML;
+use PHPDraft\Parse\ParserFactory;
 
 define('VERSION', '0');
 try
@@ -27,58 +26,25 @@ try
 
     try
     {
-        $json    = new Drafter($apib);
-        $offline = TRUE;
+        $parser = ParserFactory::get();
+        $parser = $parser->init($apib);
     }
     catch (\PHPDraft\Parse\ResourceException $exception)
     {
-        file_put_contents('php://stderr', "Offline drafter not available.\n");
-        if (!defined('DRAFTER_ONLINE_MODE') || DRAFTER_ONLINE_MODE !== 1)
-        {
-            ask_version();
-        }
-    }
-    if (!$offline)
-    {
-        try
-        {
-            $json   = new DrafterAPI($apib);
-            $online = TRUE;
-        }
-        catch (\PHPDraft\Parse\ResourceException $exception)
-        {
-            file_put_contents('php://stderr', $exception->getMessage() . "\n");
-        }
-    }
-    if (!$online && !$offline)
-    {
-        throw new \RuntimeException('Could not find a suitable drafter version', 1);
+        file_put_contents('php://stderr', "No drafter available.\n");
+        return;
     }
 
-
-    $html          = new JsonToHTML($json->parseToJson());
+    $html          = new JsonToHTML($parser->parseToJson());
     $html->sorting = $values['sorting'];
     $generator     = $html->get_html($values['template'], $values['image'], $values['css'], $values['js']);
 }
-catch (RuntimeException $exception)
+catch (\PHPDraft\Parse\ExecutionException $exception)
 {
     file_put_contents('php://stderr', $exception->getMessage() . PHP_EOL);
     exit($exception->getCode());
 }
 
-function ask_version()
-{
-    $options = [
-        'y' => 'Yes',
-        'n' => 'No',
-    ];
-    $answer  = UI::ask('Do you want to use the online version? [y/n]', $options, 'y');
-    if (!$answer)
-    {
-        throw new \RuntimeException('Could not find a suitable drafter version', 1);
-    }
-}
-
 function phpdraft_var_dump(...$vars)
 {
     if (defined('__PHPDRAFT_PHAR__'))

src/PHPDraft/Out/HTML/default.css

@@ -23,7 +23,7 @@ button.extra-info.btn:focus {
     box-shadow: none;
     outline: 0;
 }
-.request-panel > code, .popover-content {
+.request-card > code, .popover-content {
     word-break: break-all;
 }
 
@@ -37,8 +37,11 @@ body .media h1.media-heading .form-control{
     float: right;
 }
 
+div.card {
+    margin: 10px auto;
+}
 
-.panel-title var, h4.response var {
+.card-title var, h4.response var {
     padding: 6px 12px;
     margin-right: 12px;
     border-radius: 3px;
@@ -54,7 +57,7 @@ h4.response.error var {
     background: rgba(201, 12, 0, 0.1);
 }
 
-.panel-title code {
+.card-title code {
     color: #000;
     background-color: rgba(255, 255, 255, 0.7);
     padding: 1px 4px;
@@ -63,7 +66,7 @@ h4.response.error var {
     border-radius: 3px
 }
 
-.panel-title a.transition-title {
+.card-title a.transition-title {
     padding: 6px 0;
 }
 
@@ -84,27 +87,27 @@ body .col-md-10 h3:first-child {
     line-height: 26px;
 }
 
-.method-nav ul li a span {
+.method-nav ul li a i {
     color: #fff;
     padding: 0 5px;
     box-sizing: padding-box;
     border-radius: 15px;
     line-height: 22px;
 }
 
-.POST:not(.structure) > .panel-heading, span.POST {
+.POST:not(.structure) > .card-header, span.POST {
     background: #62c462;
 }
 
-.GET:not(.structure) > .panel-heading, span.GET {
+.GET:not(.structure) > .card-header, span.GET {
     background: #5bc0de;
 }
 
-.DELETE:not(.structure) > .panel-heading, span.DELETE {
+.DELETE:not(.structure) > .card-header, span.DELETE {
     background: #ee5f5b;
 }
 
-.PUT:not(.structure) > .panel-heading, span.PUT {
+.PUT:not(.structure) > .card-header, span.PUT {
     background: #f89406;
 }
 
@@ -133,7 +136,7 @@ a.code {
     white-space: pre-wrap;
 }
 
-.panel-body {
+.card-body {
     position: relative;
 }
 
@@ -153,6 +156,6 @@ a.code {
     border-bottom-right-radius: 0px
 }
 
-h5.response-body, h4.request {
+/*h5.response-body, h4.request {
     cursor: pointer;
-}
+}*/

src/PHPDraft/Out/HTML/default.js

@@ -22,20 +22,20 @@ $(function () {
     };
 });
 
-$('.collapse.request-panel').on('shown.bs.collapse', function () {
-    $(this).parent().find('h4.request .glyphicon.indicator').removeClass('glyphicon-menu-up').addClass('glyphicon-menu-down');
+$('.collapse.request-card').on('shown.bs.collapse', function () {
+    $(this).parent().find('h6.request .fas.indicator').removeClass('fa-angle-up').addClass('fa-angle-down');
 }).on('hidden.bs.collapse', function () {
-    $(this).parent().find('h4.request .glyphicon.indicator').removeClass('glyphicon-menu-down').addClass('glyphicon-menu-up');
+    $(this).parent().find('h6.request .fas.indicator').removeClass('fa-angle-down').addClass('fa-angle-up');
 });
 
-$('.collapse.response-panel').on('shown.bs.collapse', function () {
-    $(this).parent().find('h4.response .glyphicon.indicator').removeClass('glyphicon-menu-up').addClass("glyphicon-menu-down");
+$('.collapse.response-card').on('shown.bs.collapse', function () {
+    $(this).parent().find('h6.response .fas.indicator').removeClass('fa-angle-up').addClass("fa-angle-down");
 }).on('hidden.bs.collapse', function () {
-    $(this).parent().find('h4.response .glyphicon.indicator').removeClass('glyphicon-menu-down').addClass("glyphicon-menu-up");
+    $(this).parent().find('h6.response .fas.indicator').removeClass('fa-angle-down').addClass("fa-angle-up");
 });
 
 $('pre.collapse.response-body').on('shown.bs.collapse', function () {
-    $(this).parent().find('h5.response-body .glyphicon.indicator').removeClass('glyphicon-menu-up').addClass('glyphicon-menu-down');
+    $(this).parent().find('h6.response-body .fas.indicator').removeClass('fa-angle-up').addClass('fa-angle-down');
 }).on('hidden.bs.collapse', function () {
-    $(this).parent().find('h5.response-body .glyphicon.indicator').removeClass('glyphicon-menu-down').addClass('glyphicon-menu-up');
+    $(this).parent().find('h6.response-body .fas.indicator').removeClass('fa-angle-down').addClass('fa-angle-up');
 });