Skip to content

Commit e2615cd

Browse files
Update upload path and migrations
1 parent e2a3903 commit e2615cd

38 files changed

+68
-329
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11

22
## Change log
33

4+
* v0.0.26
5+
* Reorganized / grouped migrations
6+
* Upload uses the filesystems variable to check the upload folder
7+
* Changed columns `content` for` description`
48
* v0.0.25
59
* Changed route page to the end of the routes
610
* Changed route `admin/dashboard` for `admin`

TODO.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
## TODO
3+
4+
* Dinamic path to upload file in /config/filesystems.php
5+
- Get path in methods upload()
6+
7+
* Group migrations in database
8+
* Change columns 'content' for 'description'
9+
* Table 'blog_posts' columns seo is not null !?

app/Http/Controllers/Admin/Blog/PostsController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function store(Request $request)
5151
'publish_at' => 'required',
5252
'category_id' => 'required|integer',
5353
'title' => 'required',
54-
'content' => 'required',
54+
'description' => 'required',
5555
'status' => 'required|integer',
5656
]);
5757

@@ -60,7 +60,7 @@ public function store(Request $request)
6060
$post->publish_at = new Carbon($request->publish_at);
6161
$post->category_id = $request->category_id;
6262
$post->title = $request->title;
63-
$post->content = $request->content;
63+
$post->description = $request->description;
6464
$post->status = (isset($request->status) ? 1 : 0);
6565
$post->seo_title = $request->seo_title;
6666
$post->seo_description = $request->seo_description;
@@ -109,7 +109,7 @@ public function update(Request $request)
109109
'publish_at' => 'required',
110110
'category_id' => 'required|integer',
111111
'title' => 'required',
112-
'content' => 'required',
112+
'description' => 'required',
113113
'status' => 'required|integer',
114114
]);
115115

@@ -118,7 +118,7 @@ public function update(Request $request)
118118
$post->publish_at = new Carbon($request->publish_at);
119119
$post->category_id = $request->category_id;
120120
$post->title = $request->title;
121-
$post->content = $request->content;
121+
$post->description = $request->description;
122122
$post->status = (isset($request->status) ? 1 : 0);
123123
$post->seo_title = $request->seo_title;
124124
$post->seo_description = $request->seo_description;
@@ -148,7 +148,7 @@ public function destroy(Request $request)
148148

149149
// Precisamos remover as imagens desse ID também
150150
// tem que ser um foreach porque é um array de galerias
151-
foreach ($request->contents as $id) {
151+
foreach ($request->posts as $id) {
152152
// Checamos se o diretório existe
153153
$path = self::UPLOAD_PATH.$id;
154154

@@ -180,7 +180,7 @@ public function upload(Request $request, $id = null)
180180

181181
$config = [
182182
'script_url' => route(self::UPLOAD_ROUTE, $path),
183-
'upload_dir' => base_path().'/public/uploads/'.self::UPLOAD_PATH.$path.'/',
183+
'upload_dir' => config('filesystems.disks.uploads.root').'/'.self::UPLOAD_PATH.$path.'/',
184184
'upload_url' => url('/').'/uploads/'.self::UPLOAD_PATH.$path.'/',
185185
'delete_type' => 'GET',
186186
];

app/Http/Controllers/Admin/Gallerys/GallerysController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ public function store(Request $request)
4545
{
4646
$this->validate($request, [
4747
'title' => 'required',
48-
'content' => 'required',
48+
'description' => 'required',
4949
'status' => 'required|integer',
5050
]);
5151

5252
$gallery = new Gallerys();
5353

5454
$gallery->title = $request->title;
55-
$gallery->content = $request->content;
55+
$gallery->description = $request->description;
5656
$gallery->order = $request->order;
5757
$gallery->status = (isset($request->status) ? 1 : 0);
5858
$gallery->seo_title = $request->seo_title;
@@ -99,14 +99,14 @@ public function update(Request $request)
9999
{
100100
$this->validate($request, [
101101
'title' => 'required',
102-
'content' => 'required',
102+
'description' => 'required',
103103
'status' => 'required|integer',
104104
]);
105105

106106
$gallery = Gallerys::find($request->id);
107107

108108
$gallery->title = $request->title;
109-
$gallery->content = $request->content;
109+
$gallery->description = $request->description;
110110
$gallery->order = $request->order;
111111
$gallery->status = (isset($request->status) ? 1 : 0);
112112
$gallery->seo_title = $request->seo_title;
@@ -169,7 +169,7 @@ public function upload(Request $request, $id = null)
169169

170170
$config = [
171171
'script_url' => route(self::UPLOAD_ROUTE, $path),
172-
'upload_dir' => base_path().'/public/uploads/'.self::UPLOAD_PATH.$path.'/',
172+
'upload_dir' => config('filesystems.disks.uploads.root').'/'.self::UPLOAD_PATH.$path.'/',
173173
'upload_url' => url('/').'/uploads/'.self::UPLOAD_PATH.$path.'/',
174174
'delete_type' => 'GET',
175175
];

app/Http/Controllers/Admin/Pages/ContentsController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public function store(Request $request)
4545
$this->validate($request, [
4646
'category_id' => 'required|integer',
4747
'title' => 'required',
48-
'content' => 'required',
48+
'description' => 'required',
4949
'status' => 'required|integer',
5050
]);
5151

5252
$content = new Contents();
5353

5454
$content->category_id = $request->category_id;
5555
$content->title = $request->title;
56-
$content->content = $request->content;
56+
$content->description = $request->description;
5757
$content->order = $request->order;
5858
$content->status = (isset($request->status) ? 1 : 0);
5959
$content->seo_title = $request->seo_title;
@@ -94,15 +94,15 @@ public function update(Request $request, $id)
9494
$this->validate($request, [
9595
'category_id' => 'required|integer',
9696
'title' => 'required',
97-
'content' => 'required',
97+
'description' => 'required',
9898
'status' => 'required|integer',
9999
]);
100100

101101
$content = Contents::find($id);
102102

103103
$content->category_id = $request->category_id;
104104
$content->title = $request->title;
105-
$content->content = $request->content;
105+
$content->description = $request->description;
106106
$content->order = $request->order;
107107
$content->status = (isset($request->status) ? 1 : 0);
108108
$content->seo_title = $request->seo_title;

app/Http/Controllers/Admin/Products/ContentsController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public function store(Request $request)
4949
$this->validate($request, [
5050
'category_id' => 'required|integer',
5151
'title' => 'required',
52-
'content' => 'required',
52+
'description' => 'required',
5353
'status' => 'required|integer',
5454
]);
5555

5656
$content = new Contents();
5757

5858
$content->category_id = $request->category_id;
5959
$content->title = $request->title;
60-
$content->content = $request->content;
60+
$content->description = $request->description;
6161
$content->information_technical = $request->information_technical;
6262
$content->price = $request->price;
6363
$content->price_per = $request->price_per;
@@ -109,15 +109,15 @@ public function update(Request $request)
109109
$this->validate($request, [
110110
'category_id' => 'required|integer',
111111
'title' => 'required',
112-
'content' => 'required',
112+
'description' => 'required',
113113
'status' => 'required|integer',
114114
]);
115115

116116
$content = Contents::find($request->id);
117117

118118
$content->category_id = $request->category_id;
119119
$content->title = $request->title;
120-
$content->content = $request->content;
120+
$content->description = $request->description;
121121
$content->information_technical = $request->information_technical;
122122
$content->price = $request->price;
123123
$content->price_per = $request->price_per;
@@ -183,7 +183,7 @@ public function upload(Request $request, $id = null)
183183

184184
$config = [
185185
'script_url' => route(self::UPLOAD_ROUTE, $path),
186-
'upload_dir' => base_path().'/public/uploads/'.self::UPLOAD_PATH.$path.'/',
186+
'upload_dir' => config('filesystems.disks.uploads.root').'/'.self::UPLOAD_PATH.$path.'/',
187187
'upload_url' => url('/').'/uploads/'.self::UPLOAD_PATH.$path.'/',
188188
'delete_type' => 'GET',
189189
];

database/migrations/2014_10_12_000000_create_users_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public function up()
1717
$table->string('name');
1818
$table->string('email')->unique();
1919
$table->string('password');
20+
$table->string('lang')->default('en');
2021
$table->rememberToken();
2122
$table->integer('status');
2223
$table->timestamps();

database/migrations/2016_06_01_022230_create_blog_category_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function up()
1515
Schema::create('blog_category', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 120);
18+
$table->integer('order')->default(0);
1819
$table->integer('status')->default(1);
1920
$table->softDeletes();
2021
$table->timestamps();

database/migrations/2016_06_01_022325_create_blog_posts_table.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ public function up()
1515
Schema::create('blog_posts', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 170);
18-
$table->text('content');
18+
$table->text('description');
1919
$table->integer('category_id')->unsigned();
2020
$table->foreign('category_id')->references('id')->on('blog_category');
2121
$table->integer('status')->default(1);
22-
$table->string('seo_title', 70);
23-
$table->string('seo_description', 170);
22+
$table->string('seo_title', 70)->nullable();
23+
$table->string('seo_description', 170)->nullable();
24+
$table->timestamp('publish_at')->nullable();
2425
$table->softDeletes();
2526
$table->timestamps();
2627
});

database/migrations/2016_06_01_022455_create_blog_comments_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function up()
1616
$table->increments('id');
1717
$table->string('name', 100);
1818
$table->string('email', 150);
19-
$table->text('content');
19+
$table->text('description');
2020
$table->integer('post_id')->unsigned();
2121
$table->foreign('post_id')->references('id')->on('blog_posts');
2222
$table->integer('status')->default(1);

database/migrations/2016_06_02_001633_create_pages_categorys_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function up()
1515
Schema::create('pages_categorys', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 120);
18+
$table->integer('order')->default(0);
1819
$table->integer('status')->default(1);
1920
$table->softDeletes();
2021
$table->timestamps();

database/migrations/2016_06_02_001721_create_pages_contents_table.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ public function up()
1515
Schema::create('pages_contents', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 170);
18-
$table->text('content');
18+
$table->text('description');
1919
$table->integer('category_id')->unsigned();
2020
$table->foreign('category_id')->references('id')->on('pages_categorys');
21+
$table->integer('order')->default(0);
2122
$table->integer('status')->default(1);
23+
$table->string('slug')->default('');
2224
$table->string('seo_title', 70);
2325
$table->string('seo_description', 170);
2426
$table->softDeletes();

database/migrations/2016_06_08_171056_create_products_category_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function up()
1515
Schema::create('products_categorys', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 120);
18+
$table->integer('order')->default(0);
1819
$table->integer('status')->default(1);
1920
$table->softDeletes();
2021
$table->timestamps();

database/migrations/2016_06_08_172543_create_products_contents_table.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ public function up()
1515
Schema::create('products_contents', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 170);
18-
$table->text('content');
18+
$table->text('description');
1919
$table->integer('category_id')->unsigned();
2020
$table->foreign('category_id')->references('id')->on('products_categorys');
21+
$table->string('information_technical')->nullable();
22+
$table->decimal('price', 15, 2)->nullable();
23+
$table->decimal('price_per', 15, 2)->nullable();
24+
$table->string('code')->nullable();
2125
$table->integer('status')->default(1);
2226
$table->string('seo_title', 70);
2327
$table->string('seo_description', 170);

database/migrations/2016_06_14_003311_create_gallerys_table.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public function up()
1515
Schema::create('gallerys', function (Blueprint $table) {
1616
$table->increments('id');
1717
$table->string('title', 170);
18-
$table->text('content')->nullable();
18+
$table->text('description')->nullable();
19+
$table->integer('order')->default(0);
1920
$table->integer('status')->default(1);
2021
$table->string('seo_title', 70);
2122
$table->string('seo_description', 170);

database/migrations/2016_08_17_233853_add_publish_at_table.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

database/migrations/2016_08_19_222158_add_lang_at_users_table.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

database/migrations/2016_08_23_054643_add_slug_to_pages_contents_table.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)