diff --git a/images/usr_avatar.png b/images/usr_avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..7eed5af69f73d2b9e491ca736f38c648070c6c6f Binary files /dev/null and b/images/usr_avatar.png differ diff --git a/remember_laravel/.env.example b/remember_laravel/.env.example index cdf8d263a54e748a0cbfc8d05c2fcfa00d70a223..1ae0f8a4b45149123340c0c26a0e0a69a8cd725a 100755 --- a/remember_laravel/.env.example +++ b/remember_laravel/.env.example @@ -1,4 +1,4 @@ -APP_NAME=Laravel +APP_NAME="Remember PET" APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/remember_laravel/app/Http/Controllers/GalleryController.php b/remember_laravel/app/Http/Controllers/GalleryController.php index 7b438fe093d48cfad5c996c28eec1e2f2a490bd1..c4255c47b70be60cdc16421b67b6e60ddff85c74 100755 --- a/remember_laravel/app/Http/Controllers/GalleryController.php +++ b/remember_laravel/app/Http/Controllers/GalleryController.php @@ -16,12 +16,12 @@ class GalleryController extends Controller { $search = request()->query('search'); if($search){ // testa se ha um request de search - $images = Image::where('title', 'LIKE', '%' . $search . '%')->orderBy('title')->paginate(10); + $images = Image::where('title', 'LIKE', '%' . $search . '%')->orderBy('year', 'desc')->paginate(4); } else{ - $images = Image::paginate(10); + $images = Image::orderBy('year', 'desc')->paginate(4); } - $imageYears = ImageYears::orderBy('year')->get(); + $imageYears = ImageYears::orderBy('year', 'desc')->get(); return view('dashboard.galeria.index')->with(['images' => $images, 'imageYears' => $imageYears, 'search' => $search]); } diff --git a/remember_laravel/app/Http/Controllers/HomeController.php b/remember_laravel/app/Http/Controllers/HomeController.php index e65fcfe605fb2617b5c7175364e55d965790898f..f3ef284a13ef5408d36d495fcdd46084c2d223c5 100755 --- a/remember_laravel/app/Http/Controllers/HomeController.php +++ b/remember_laravel/app/Http/Controllers/HomeController.php @@ -51,12 +51,12 @@ class HomeController extends Controller { $search = request()->query('search'); if($search){ // testa se ha um request de search - $images = Image::where('title', 'LIKE', '%' . $search . '%')->orderBy('title')->paginate(10); + $images = Image::where('title', 'LIKE', '%' . $search . '%')->orderBy('year', 'desc')->paginate(4); } else{ - $images = Image::orderBy('title')->paginate(10); + $images = Image::orderBy('year', 'desc')->paginate(4); } - $imageYears = ImageYears::orderBy('year')->get(); + $imageYears = ImageYears::orderBy('year', 'desc')->get(); return view('frontend.gallery.index')->with(['images' => $images, 'imageYears' => $imageYears, 'frase' => $this->frase(), 'search' => $search]); } diff --git a/remember_laravel/app/ImageYears.php b/remember_laravel/app/ImageYears.php new file mode 100644 index 0000000000000000000000000000000000000000..f89ab09cc0759319af9b89ebb28061d469d0db9f --- /dev/null +++ b/remember_laravel/app/ImageYears.php @@ -0,0 +1,19 @@ +<?php + +namespace App; + +use Illuminate\Database\Eloquent\Model; + +class ImageYears extends Model +{ + protected $primaryKey = 'id'; + + protected $fillable = [ + 'year' + ]; + + public function images() + { + return $this->hasMany(Image::class, 'year'); + } +} diff --git a/remember_laravel/database/migrations/2021_10_26_174858_create_image_years_table.php b/remember_laravel/database/migrations/2021_10_26_174858_create_image_years_table.php new file mode 100644 index 0000000000000000000000000000000000000000..c7d8f08ad71e2742083b66a0dfa033916851f49b --- /dev/null +++ b/remember_laravel/database/migrations/2021_10_26_174858_create_image_years_table.php @@ -0,0 +1,32 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreateImageYearsTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('image_years', function (Blueprint $table) { + $table->increments('id'); + $table->unsignedInteger('year'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('image_years'); + } +} diff --git a/remember_laravel/database/migrations/2021_10_26_180313_create_images_table.php b/remember_laravel/database/migrations/2021_10_26_180313_create_images_table.php new file mode 100644 index 0000000000000000000000000000000000000000..d28399c11586103b356a2dcd1fb350328b122034 --- /dev/null +++ b/remember_laravel/database/migrations/2021_10_26_180313_create_images_table.php @@ -0,0 +1,36 @@ +<?php + +use Illuminate\Support\Facades\Schema; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Database\Migrations\Migration; + +class CreateImagesTable extends Migration +{ + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::create('images', function (Blueprint $table) { + $table->increments('id'); + $table->string('title'); + $table->text('description'); + $table->string('path'); + $table->unsignedInteger('year'); + $table->timestamps(); + $table->foreign('year')->references('year')->on('image_years')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('images'); + } +} diff --git a/remember_laravel/public/css/style.css b/remember_laravel/public/css/style.css index a4888e8a1e0fb33134914cfabfcfe066f0cbf5b4..6e06c182114aaacfe1dadb24a36f2e6e6e259c32 100755 --- a/remember_laravel/public/css/style.css +++ b/remember_laravel/public/css/style.css @@ -243,3 +243,13 @@ textarea { padding-top:30px; padding-bottom: 30px; } + +.int_img_max_i{ + max-height: 350px !important; + max-width: 650px !important; +} + +.int_img_max_s{ + max-height: 600px !important; + max-width: 1000px !important; +} diff --git a/remember_laravel/resources/views/dashboard/entrevista/show.blade.php b/remember_laravel/resources/views/dashboard/entrevista/show.blade.php index 947494e7702a3fc31912fef5ea33731700ab228b..bb9b5c8ccf95cb6c294a98dda4c3c2a713371713 100755 --- a/remember_laravel/resources/views/dashboard/entrevista/show.blade.php +++ b/remember_laravel/resources/views/dashboard/entrevista/show.blade.php @@ -30,8 +30,8 @@ <div class="card-box"> <h4 class="m-t-0 m-b-10 header-title" align="center">{{ $interview->name }}</h4> <div class="text-center" style="margin-bottom: 15px"> - <img class="img-fluid rounded mb-5 mb-md-0" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" - height="500" width="auto" alt="{{ $interview->name }}"> + <img class="img-fluid rounded mb-5 mb-md-0" style="max-width: 1000px" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" + height="500px" width="auto" alt="{{ $interview->name }}"> </div> <p class="m-b-40">{{ $interview->sumary }}</p> <p class="m-b-30">{!! $interview->content !!}</p> diff --git a/remember_laravel/resources/views/frontend/interviews/index.blade.php b/remember_laravel/resources/views/frontend/interviews/index.blade.php index 2176c975d59637178a24e7d3b620670460789906..e20e4c069c2ab8dde87c959f1ddff6b0a60ce3d3 100755 --- a/remember_laravel/resources/views/frontend/interviews/index.blade.php +++ b/remember_laravel/resources/views/frontend/interviews/index.blade.php @@ -22,12 +22,12 @@ </div> @forelse($interviews as $interview) - <!-- Project One --> + <!-- entrevista --> <div class="row"> <div class="col-md-7 text-center"> <a href="#"> - <img class="img-fluid rounded mb-3 mb-md-0" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" - height="300" width="auto" alt="{{ $interview->name }}"> + <img class="img-fluid rounded mb-3 mb-md-0 int_img_max_i" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" + height="350px" width="auto" alt="{{ $interview->name }}"> </a> </div> <div class="col-md-5"> diff --git a/remember_laravel/resources/views/frontend/interviews/show.blade.php b/remember_laravel/resources/views/frontend/interviews/show.blade.php index f0fb08228fd40948f5723e5c5e87bfd9e2ca69be..19ba9b8ffe88be2b4662900ebdeed2c97a6db476 100755 --- a/remember_laravel/resources/views/frontend/interviews/show.blade.php +++ b/remember_laravel/resources/views/frontend/interviews/show.blade.php @@ -6,12 +6,12 @@ <section class="gallery-block cards-gallery"> <div class="container"> - <div class="heading"> + <div class="heading text-center"> <h1 class="text-uppercase">{{ $interview->name }}</h1> </div> <div class="text-center" style="margin-bottom: 15px"> - <img class="img-fluid rounded mb-5 mb-md-0" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" - height="700" width="auto" alt="{{ $interview->name }}"> + <img class="img-fluid rounded mb-5 mb-md-0 int_img_max_s" src="{{ asset('storage/images/entrevistas/' . $interview->image_path) }}" + height="600px" width="auto" alt="{{ $interview->name }}"> </div> <div class="text-center" style="font-size: 23px; margin-bottom: 50px"> {{ $interview->sumary }}