#1 Dingo api Support feature

netojose · netojose · commit ef5c44df5d35 · 2018-07-29T11:24:59.000+01:00
diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php
@@ -5,17 +5,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
-    <link rel="stylesheet" href="{{route('apiexplorer.asset', ['file' => 'styles.css'])}}">
+    <link rel="stylesheet" href="{{route('laravelapiexplorer.asset', ['file' => 'styles.css'])}}">
     <style>
         body {margin: 0;}
     </style>
     <script>
-        window.api_info_url = "{{route('apiexplorer.info')}}";
+        window.api_info_url = "{{route('laravelapiexplorer.info')}}";
     </script>
     <title>API explorer</title>
 </head>
 <body>
     <div id="app"></div>
-    <script src="{{route('apiexplorer.asset', ['file' => 'bundle.js'])}}"></script>
+    <script src="{{route('laravelapiexplorer.asset', ['file' => 'bundle.js'])}}"></script>
 </body>
 </html>
diff --git a/src/LaravelApiExplorer.php b/src/LaravelApiExplorer.php
@@ -26,23 +26,45 @@ public function getConfig() {
     private function getRoutes() {
         $routes = [];
         $routeCollection = Route::getRoutes();
-        $allRoutes = $routeCollection->getRoutes();
+
+        $laravelRoutes = $routeCollection->getRoutes();
+        $dingoRoutes = $this->getDingoRoutes();
+
+        $allRoutes = array_merge($laravelRoutes, $dingoRoutes);
         
-        return $this->filterRoutes($allRoutes);;
+        return $this->filterRoutes($allRoutes);
+    }
+
+    private function getDingoRoutes() {
+
+        if(!class_exists(\Dingo\Api\Routing\Router::class)){
+            return [];
+        }
+
+        $dingoRouter = app('Dingo\Api\Routing\Router');
+        $versions = $dingoRouter->getRoutes();
+        $routes = [];
+        foreach($versions as $version){
+            $routes[] = $version->getRoutes();
+        }
+
+        $routes = collect($routes)->flatten()->toArray();
+
+        return $routes;
     }
 
     private function filterRoutes($routes) {
         $filtered = [];
 
-        $match = config('laravelapiexplorer.match');
+        $match = trim(config('laravelapiexplorer.match'), '/');
         $ignoreList = collect(config('laravelapiexplorer.ignore'));
         $ignoreList->push('laravelapiexplorer.view');
         $ignoreList->push('laravelapiexplorer.info');
         $ignoreList->push('laravelapiexplorer.asset');
 
         foreach($routes as $route) {
             $name = $route->getName();
-            $uri = $route->uri();
+            $uri = trim($route->uri(), '/');
 
             if(
                 !str_is($match, $name) &&
@@ -91,7 +113,7 @@ private function formatRoute($route) {
             'name' => $route->getName(),
             'description' => $description,
             'url' => url($uri),
-            'uri' => $uri,
+            'uri' => trim($uri, '/'),
             'exists' => $exists,
             'http_verb' => $httpVerb,
             'controller' => $controller,
diff --git a/src/routes.php b/src/routes.php
@@ -4,7 +4,7 @@
 
 if($enabled){
     $prefix = config('laravelapiexplorer.route');
-    Route::namespace('\NetoJose\LaravelApiExplorer')->prefix($prefix)->name('apiexplorer.')->group(function () {
+    Route::namespace('\NetoJose\LaravelApiExplorer')->prefix($prefix)->name('laravelapiexplorer.')->group(function () {
         Route::get('/', 'LaravelApiExplorerController@getView')->name('view');
         Route::get('info', 'LaravelApiExplorerController@getInfo')->name('info');
         Route::get('assets/{file}', 'LaravelApiExplorerController@getAsset')->where('file', '^([a-z0-9_\-\.]+).(js|css|svg)$')->name('asset');
