From 08ecbe31da19cbb49e863989bda8713628ef1ae4 Mon Sep 17 00:00:00 2001 From: bad Date: Wed, 24 Nov 2021 11:34:46 +0100 Subject: [PATCH] Garbage commit, squash me --- .editorconfig | 9 +-------- app/Http/Controllers/CartController.php | 6 ++++-- app/Http/Controllers/MainPageController.php | 3 ++- app/Http/Controllers/OrderController.php | 6 +++--- app/Http/Middleware/AdminAuth.php | 2 +- app/Models/Order.php | 2 +- app/Models/Product.php | 3 ++- app/Models/User.php | 10 ++++++---- config/admin.php | 6 +++--- database/factories/ProductFactory.php | 2 +- database/seeders/DatabaseSeeder.php | 2 +- resources/scss/app.scss | 10 +++++++++- resources/views/layouts/app.blade.php | 8 +++++--- resources/views/login.blade.php | 18 +++++++----------- 14 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1671c9b..37bd171 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,15 +4,8 @@ root = true charset = utf-8 end_of_line = lf insert_final_newline = true -indent_style = space -indent_size = 4 +indent_style = tabs trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false - -[*.{yml,yaml}] -indent_size = 2 - -[docker-compose.yml] -indent_size = 4 diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 4ab8f05..9fa008a 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -23,14 +23,16 @@ class CartController extends Controller //return view("product/view", ["product" => $product]); } - public function addToCart(Product $product) { + public function addToCart(Product $product) + { $user = Auth::user(); $user->cart()->syncWithoutDetaching([$product->uuid]); return back(); } - public function removeFromCart(Product $product) { + public function removeFromCart(Product $product) + { $user = Auth::user(); $user->cart()->detach($product); return back(); diff --git a/app/Http/Controllers/MainPageController.php b/app/Http/Controllers/MainPageController.php index d8d2a71..0ab9064 100644 --- a/app/Http/Controllers/MainPageController.php +++ b/app/Http/Controllers/MainPageController.php @@ -7,7 +7,8 @@ use Illuminate\Http\Request; class MainPageController extends Controller { - public function index() { + public function index() + { $products = Product::query()->latest()->limit(100)->get(); return view("index", ["products" => $products]); } diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index 52f847b..e445bd2 100644 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -57,7 +57,7 @@ class OrderController extends Controller $order = new Order($products); $order->user()->associate($user); - $order->cost = array_reduce($products,fn ($c, $i) => $c+=$i->price,0); + $order->cost = array_reduce($products, fn ($c, $i) => $c+=$i->price, 0); return $order->save(); }); @@ -94,8 +94,8 @@ class OrderController extends Controller $validated = $request->validate([ 'address' => 'string', ]); - if(isset($validated["address"])) { - $address = $order->address()->withDefault(fn() => new Addres($validated)); + if (isset($validated["address"])) { + $address = $order->address()->withDefault(fn () => new Addres($validated)); $address->address = $validated["address"]; $order->save(); } diff --git a/app/Http/Middleware/AdminAuth.php b/app/Http/Middleware/AdminAuth.php index 9f43e97..ed49a75 100644 --- a/app/Http/Middleware/AdminAuth.php +++ b/app/Http/Middleware/AdminAuth.php @@ -19,7 +19,7 @@ class AdminAuth public function handle(Request $request, Closure $next) { $user = Auth::user(); - if($user && $user->isAdmin()) { + if ($user && $user->isAdmin()) { return $next($request); } throw new AccessDeniedHttpException("You must be an admin to access this path"); diff --git a/app/Models/Order.php b/app/Models/Order.php index 7c70094..00973f6 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -23,6 +23,6 @@ class Order extends Model public function products() { - return $this->belongsToMany("App\Product", "orderProduct","productId", "orderId"); + return $this->belongsToMany("App\Product", "orderProduct", "productId", "orderId"); } } diff --git a/app/Models/Product.php b/app/Models/Product.php index baccc1b..11283e5 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -11,7 +11,8 @@ class Product extends Model use HasUUID; public $primaryKey = "uuid"; - public function images() { + public function images() + { return $this->hasMany(Image::class, "product_uuid", "uuid"); } diff --git a/app/Models/User.php b/app/Models/User.php index 2bd1a73..0365590 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -45,11 +45,13 @@ class User extends Authenticatable 'email_verified_at' => 'datetime', ]; - public function isAdmin() { - return $this->admin; + public function isAdmin() + { + return $this->admin; } - public function cart() { - return $this->belongsToMany(Product::class, "cart_items", "userID", "productID"); + public function cart() + { + return $this->belongsToMany(Product::class, "cart_items", "userID", "productID"); } } diff --git a/config/admin.php b/config/admin.php index 50912f7..c08963e 100644 --- a/config/admin.php +++ b/config/admin.php @@ -1,7 +1,7 @@ env("ADMIN_EMAIL"), - 'username' => env("ADMIN_USERNAME"), - 'password' => env("ADMIN_PASSWORD"), + 'email' => env("ADMIN_EMAIL"), + 'username' => env("ADMIN_USERNAME"), + 'password' => env("ADMIN_PASSWORD"), ]; diff --git a/database/factories/ProductFactory.php b/database/factories/ProductFactory.php index 0bb6495..916b33d 100644 --- a/database/factories/ProductFactory.php +++ b/database/factories/ProductFactory.php @@ -25,7 +25,7 @@ class ProductFactory extends Factory return [ 'uuid' => $this->faker->unique()->uuid(), 'name' => $this->faker->productName(), - 'price' => $this->faker->numberBetween(1,32124), + 'price' => $this->faker->numberBetween(1, 32124), 'description' => $this->faker->text(10000), ]; } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 3355f8d..0b5d3f6 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -20,7 +20,7 @@ class DatabaseSeeder extends Seeder $creds = [ 'email' => config('admin.email'), 'name' => config('admin.username'), - 'password' => config('admin.password'), + 'password' => config('admin.password'), ]; $creds["password"] = Hash::make($creds["password"]); $user = User::create($creds); diff --git a/resources/scss/app.scss b/resources/scss/app.scss index 6a7a391..b73561a 100644 --- a/resources/scss/app.scss +++ b/resources/scss/app.scss @@ -5,6 +5,12 @@ box-sizing: border-box; } + +a { + color: inherit; + text-decoration: inherit; +} + body { display: flex; flex-direction: column; @@ -22,10 +28,12 @@ nav, footer { nav { display: flex; align-items: center; + justify-content: space-between; + padding: 1em; } nav .fa { - font-size: 2em; + font-size: 4vh; } main { diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6bc3177..9a3fa0e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,15 +10,17 @@
@yield('main')
- diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index 8a42222..be3fac8 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -1,16 +1,11 @@ - - - - - - Document - - - +@extends('layouts.app') + +@section('title', "Sklep") + +@section('main') @if(Session::has('success'))
- {{Session::get('success')}} + {{ Session::get('success') }}
@endif
@@ -34,3 +29,4 @@
+@endsection()