fixed paths

tpaksu · Dec 25, 2019 · ee7e4aa · ee7e4aa
1 parent 828bcbc
commit ee7e4aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "tpaksu/laravel-todobar",
     "description": "A simple todo list drawer for development tasks listing",
     "type": "library",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "license": "MIT",
     "authors": [
         {

diff --git a/src/Controllers/TodoBarController.php b/src/Controllers/TodoBarController.php
@@ -9,15 +9,21 @@
 class TodoBarController extends Controller {
 
     public function getScripts(){
-        return "<script type='text/javascript'>" . file_get_contents(__DIR__."\\..\\assets\\todobar.js") . "</script>";
+        return "<script type='text/javascript'>" . file_get_contents($this->assets_path("todobar.js")) . "</script>";
     }
 
     public function getDrawer(){
         return View::make("laravel-todobar::todobar");
     }
 
     public function getStyles(){
-        return "<style>" . file_get_contents(dirname(__FILE__) . "\\..\\assets\\todobar" . (\config("todobar.dark_mode", false) === true ? "-dark" : "") . ".css") . "</style>";
+        $dark_mode = config("todobar.dark_mode", false);
+        $file = "todobar.css";
+        if($dark_mode){
+            $file = "todobar-dark.css";
+        }
+        $path = $this->assets_path($file);
+        return "<style>" . file_get_contents($path) . "</style>";
     }
 
     public function getInjection()
@@ -28,4 +34,9 @@ public function getInjection()
     public function inject(Response $response){
         $response->setContent(str_replace("</body>", "</body>" . $this->getInjection(), $response->getContent()));
     }
+
+    public function assets_path($file)
+    {
+        return implode(DIRECTORY_SEPARATOR, [__DIR__, "..", "assets", $file]);
+    }
 }