This commit is contained in:
Torsten 2020-03-06 07:45:04 +01:00
parent 4524d95a7c
commit 6e74aaf154
4 changed files with 7 additions and 7 deletions

View file

@ -3,10 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="eed7de89-f054-487c-bf59-36356758942b" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/store.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/auth/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/auth/Login.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/auth/Register.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/auth/Register.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/Gallery.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Gallery.vue" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View file

@ -61,6 +61,7 @@ class FileController extends Controller
public function createFolder(Request $request) {
Log::info("Incoming createFolder request");
Log::info("Folder name: ".$request->folder);
$f=Folder::create();
$f->name=$request->folder;
$f->save();

View file

@ -2125,8 +2125,8 @@ __webpack_require__.r(__webpack_exports__);
for (var i = 0; i < res.data.folders.length; i++) {
var folder = res.data.folders[i].folder_name;
var file = res.data.folders[i].file_name;
console.log('http://localhost:8000/upload/images/' + folder + "/" + file);
var thumbUrl = 'http://localhost:8000/upload/images/' + folder + "/thumbnail/" + file;
console.log(_this3.$store.state.app_url + '/upload/images/' + folder + "/" + file);
var thumbUrl = _this3.$store.state.app_url + '/upload/images/' + folder + "/thumbnail/" + file;
console.log(thumbUrl);
_this3.$store.state.files.push(thumbUrl);

View file

@ -206,8 +206,8 @@
for (var i=0; i<res.data.folders.length; i++) {
var folder=res.data.folders[i].folder_name;
var file =res.data.folders[i].file_name;
console.log('http://localhost:8000/upload/images/'+folder+"/"+file);
let thumbUrl='http://localhost:8000/upload/images/'+folder+"/thumbnail/"+file;
console.log(this.$store.state.app_url+'/upload/images/'+folder+"/"+file);
let thumbUrl=this.$store.state.app_url+'/upload/images/'+folder+"/thumbnail/"+file;
console.log(thumbUrl);
this.$store.state.files.push(thumbUrl);
}