f

@@ -21,6 +21,7 @@ use Imagick;
 
 
 
 
 
 
+
 class ApiController extends Controller
 class ApiController extends Controller
 {
 {
 
 
@@ -43,7 +44,7 @@ class ApiController extends Controller
 
 
 
 
 
 
-        $storagePath = Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix();
+        $storagePath = Storage::disk('public')->getDriver()->getAdapter()->getPathPrefix();
         $folder = str_replace(' ', '-', $json->pdf[0]->name); // Replaces all spaces with hyphens.
         $folder = str_replace(' ', '-', $json->pdf[0]->name); // Replaces all spaces with hyphens.
         $folder = preg_replace('/[^A-Za-z0-9\-]/', '', $folder);
         $folder = preg_replace('/[^A-Za-z0-9\-]/', '', $folder);
 
 
@@ -57,18 +58,24 @@ class ApiController extends Controller
 
 
             $pdfLocation = $json->pdf[0]->pdfLocation;
             $pdfLocation = $json->pdf[0]->pdfLocation;
             $file = explode('/', $pdfLocation);
             $file = explode('/', $pdfLocation);
+            $file = end($file);
             $curl = new Curl();
             $curl = new Curl();
-            $curl->download($pdfLocation, $storagePath . $folder . '/' . end($file));
+            $curl->download($pdfLocation, $storagePath . $folder . '/' . $file);
             $curl->close();
             $curl->close();
+            $fileEntry = New FileEntryController();
+           // echo $storagePath . $folder . '/' . $file;
+            //$fileEntry->addfile( $folder . '/' . $file);
+
+
             $im = new Imagick();
             $im = new Imagick();
             $im->setResolution(300, 300);     //set the resolution of the resulting jpg
             $im->setResolution(300, 300);     //set the resolution of the resulting jpg
-            if (! is_readable($storagePath . $folder . '/' . end($file))) {
+            if (! is_readable($storagePath . $folder . '/' . $file)) {
                 echo 'file not readable';
                 echo 'file not readable';
                 exit();
                 exit();
             }
             }
-            $im->readImage($storagePath . $folder . '/' . end($file));    //[0] for the first page
+            $im->readImage($storagePath . $folder . '/' . $file);    //[0] for the first page
             $im->setImageFormat('jpg');
             $im->setImageFormat('jpg');
-            $fileName = end($file);
+            $fileName = $file;
             $fileName = explode('.', $fileName);
             $fileName = explode('.', $fileName);
             $im->writeImage($storagePath . $folder . '/' . $fileName[0].'.jpg');
             $im->writeImage($storagePath . $folder . '/' . $fileName[0].'.jpg');
 
 

@@ -3,7 +3,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
 use App\Fileentry;
 use App\Fileentry;
 use Request;
 use Request;
- 
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\File;
 use Illuminate\Http\Response;
 use Illuminate\Http\Response;
@@ -37,12 +37,13 @@ class FileEntryController extends Controller {
 		return redirect('fileentry');
 		return redirect('fileentry');
 		
 		
 	}
 	}
-	public function get($filename){
 
 
-		$entry = Fileentry::where('filename', '=', $filename)->firstOrFail();
-		$file = Storage::disk('local')->get($entry->filename);
+	public function get($folder, $filename){
+
+		//$entry = Fileentry::where('filename', '=', $filename)->firstOrFail();
+		$file = Storage::disk('public')->get($folder.'/'.$filename);
 
 
 		return (new Response($file, 200))
 		return (new Response($file, 200))
-			->header('Content-Type', $entry->mime);
+			->header('Content-Type', 'image/jpeg');
 	}
 	}
 }
 }

@@ -30,7 +30,7 @@ Route::group(array('prefix' => 'api/v1'), function($json)
 });
 });
 
 
 Route::get('fileentry', 'FileEntryController@index');
 Route::get('fileentry', 'FileEntryController@index');
-Route::get('fileentry/get/{filename}', [
+Route::get('fileentry/get/{folder}/{filename}', [
     'as' => 'getentry', 'uses' => 'FileEntryController@get']);
     'as' => 'getentry', 'uses' => 'FileEntryController@get']);
 Route::post('fileentry/add',[
 Route::post('fileentry/add',[
     'as' => 'addentry', 'uses' => 'FileEntryController@add']);
     'as' => 'addentry', 'uses' => 'FileEntryController@add']);

@@ -50,7 +50,7 @@ return [
 
 
         'public' => [
         'public' => [
             'driver' => 'local',
             'driver' => 'local',
-            'root' => storage_path('app/public'),
+            'root' => public_path()."/files",
             'visibility' => 'public',
             'visibility' => 'public',
         ],
         ],