diff --git a/app/Http/Controllers/FrontIndexController.php b/app/Http/Controllers/FrontIndexController.php index 3ed63f4..fa0e169 100644 --- a/app/Http/Controllers/FrontIndexController.php +++ b/app/Http/Controllers/FrontIndexController.php @@ -7,6 +7,8 @@ use App\Models\Location; class FrontIndexController extends Controller { + private $limit = 15; + public function start() { $locations = Location::where("active", true)->get(); @@ -21,4 +23,33 @@ class FrontIndexController extends Controller 'title' => "The Bad Space" ]); } + + public function listings(int $pageNum = 1) + { + $range = $pageNum * $this->limit - $this->limit; + $active = Location::where("active", true)->get(); + $locations = Location::where("active", true) + ->limit($this->limit)->offset($range)->orderByDesc('id')->get(); + $pageCount = ceil(count($active) / $this->limit); + + $next = $pageNum + 1; + if ($next > $pageCount) { + $next = 1; + } + + $prev = $pageNum - 1; + + if ($prev <= 0) { + $prev = $pageCount; + } + + return view('front.listing', [ + 'title' => "Listings", + "totalPages" => $pageCount, + "prev" => $prev, + "next" => $next, + 'pageNum' => $pageNum, + 'locations' => $locations + ]); + } } diff --git a/public/assets/css/front/index.css b/public/assets/css/front/index.css index 9523734..617ac2f 100644 --- a/public/assets/css/front/index.css +++ b/public/assets/css/front/index.css @@ -18,16 +18,10 @@ form.index-search-form { padding: 30px 0; } -input[type="text"]:focus { - outline: solid var(--highlight); - background-color: var(--highlight); -} - form.index-search-form > input[type="text"] { width: 91%; height: 50px; font: 44px var(--base-type); - transition: all 0.2s linear; } form.index-search-form > button { diff --git a/public/assets/css/global/fonts/Rubik/rubik-bold.ttf b/public/assets/css/global/fonts/Rubik/rubik-bold.ttf new file mode 100644 index 0000000..10e508c Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-bold.ttf differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-bold.woff b/public/assets/css/global/fonts/Rubik/rubik-bold.woff new file mode 100644 index 0000000..6bbd130 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-bold.woff differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-bold.woff2 b/public/assets/css/global/fonts/Rubik/rubik-bold.woff2 new file mode 100644 index 0000000..5b2301d Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-bold.woff2 differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-light.ttf b/public/assets/css/global/fonts/Rubik/rubik-light.ttf new file mode 100644 index 0000000..d231ee9 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-light.ttf differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-light.woff b/public/assets/css/global/fonts/Rubik/rubik-light.woff new file mode 100644 index 0000000..118c490 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-light.woff differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-light.woff2 b/public/assets/css/global/fonts/Rubik/rubik-light.woff2 new file mode 100644 index 0000000..7aca0ad Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-light.woff2 differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-medium.ttf b/public/assets/css/global/fonts/Rubik/rubik-medium.ttf new file mode 100644 index 0000000..00f9211 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-medium.ttf differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-medium.woff b/public/assets/css/global/fonts/Rubik/rubik-medium.woff new file mode 100644 index 0000000..e2209d9 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-medium.woff differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-medium.woff2 b/public/assets/css/global/fonts/Rubik/rubik-medium.woff2 new file mode 100644 index 0000000..d924774 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-medium.woff2 differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-regular.ttf b/public/assets/css/global/fonts/Rubik/rubik-regular.ttf new file mode 100644 index 0000000..aad7a38 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-regular.ttf differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-regular.woff b/public/assets/css/global/fonts/Rubik/rubik-regular.woff new file mode 100644 index 0000000..64304d5 Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-regular.woff differ diff --git a/public/assets/css/global/fonts/Rubik/rubik-regular.woff2 b/public/assets/css/global/fonts/Rubik/rubik-regular.woff2 new file mode 100644 index 0000000..fe294fd Binary files /dev/null and b/public/assets/css/global/fonts/Rubik/rubik-regular.woff2 differ diff --git a/public/assets/css/global/forms.css b/public/assets/css/global/forms.css index 39fe46c..0053aa9 100644 --- a/public/assets/css/global/forms.css +++ b/public/assets/css/global/forms.css @@ -8,6 +8,13 @@ input[type="text"] { display: inline-block; background: var(--white); color: var(--primary); + transition: all 0.2s linear; +} + +input[type="text"]:focus, +input[type="password"]:focus { + outline: solid var(--highlight); + background-color: var(--highlight); } textarea { diff --git a/public/assets/css/global/type/AlteHaasGroteskBold.ttf b/public/assets/css/global/type/AlteHaasGroteskBold.ttf deleted file mode 100644 index d310391..0000000 Binary files a/public/assets/css/global/type/AlteHaasGroteskBold.ttf and /dev/null differ diff --git a/public/assets/css/global/type/AlteHaasGroteskBold.woff b/public/assets/css/global/type/AlteHaasGroteskBold.woff deleted file mode 100644 index ebc8cd1..0000000 Binary files a/public/assets/css/global/type/AlteHaasGroteskBold.woff and /dev/null differ diff --git a/public/assets/css/global/type/AlteHaasGroteskRegular.ttf b/public/assets/css/global/type/AlteHaasGroteskRegular.ttf deleted file mode 100644 index ff5edb9..0000000 Binary files a/public/assets/css/global/type/AlteHaasGroteskRegular.ttf and /dev/null differ diff --git a/public/assets/css/global/type/AlteHaasGroteskRegular.woff b/public/assets/css/global/type/AlteHaasGroteskRegular.woff deleted file mode 100644 index c9e89e7..0000000 Binary files a/public/assets/css/global/type/AlteHaasGroteskRegular.woff and /dev/null differ diff --git a/public/assets/css/global/type/tabler-icons.ttf b/public/assets/css/global/type/tabler-icons.ttf deleted file mode 100644 index 593c1d5..0000000 Binary files a/public/assets/css/global/type/tabler-icons.ttf and /dev/null differ diff --git a/public/assets/css/global/type/tabler-icons.woff b/public/assets/css/global/type/tabler-icons.woff deleted file mode 100644 index 4dec2b8..0000000 Binary files a/public/assets/css/global/type/tabler-icons.woff and /dev/null differ diff --git a/public/assets/css/global/typography.css b/public/assets/css/global/typography.css index ccc1bb1..19f6249 100644 --- a/public/assets/css/global/typography.css +++ b/public/assets/css/global/typography.css @@ -1,44 +1,71 @@ +/* RUBIK */ @font-face { - font-family: altehaasgrotesk; + font-family: rubik; + src: url("fonts/Rubik/rubik-light.ttf") format("truetype"), + url("fonts/Rubik/rubik-light.woff") format("woff"), + url("fonts/Rubik/rubik-light.woff2") format("woff2"); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: rubik; + src: url("fonts/Rubik/rubik-regular.ttf") format("truetype"), + url("fonts/Rubik/rubik-regular.woff") format("woff"), + url("fonts/Rubik/rubik-regular.woff2") format("woff2"); font-weight: 400; font-style: normal; - src: url("type/AlteHaasGroteskRegular.woff") format("woff"), - url("type/AlteHaasGroteskRegular.ttf") format("ttf"); } @font-face { - font-family: altehaasgrotesk; + font-family: rubik; + src: url("fonts/Rubik/rubik-medium.ttf") format("truetype"), + url("fonts/Rubik/rubik-medium.woff") format("woff"), + url("fonts/Rubik/rubik-medium.woff2") format("woff2"); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: rubik; + src: url("fonts/Rubik/rubik-bold.ttf") format("truetype"), + url("fonts/Rubik/rubik-bold.woff") format("woff"), + url("fonts/Rubik/rubik-bold.woff2") format("woff2"); font-weight: 600; - font-style: oblique; - src: url("type/AlteHaasGroteskBold.woff") format("woff"), - url("type/AlteHaasGroteskBold.ttf") format("ttf"); + font-style: normal; } :root { - --base-type: altehaasgrotesk, helvetica, arial, sans-serif; + --base-type: rubik, helvetica, arial, sans-serif; --mono-type: "Lucida Console", monaco, monospace; } h1, h2, h3 { - color: var(--secondary); + color: var(--white); + font-family: var(--title-type); } h1 { - font-size: 2.5em; - font-weight: 700; - line-height: 1em; + font-size: 4em; + font-weight: 500; + font-kerning: normal; + letter-spacing: -5px; + text-transform: uppercase; + line-height: 0.75em; + margin: 40px 0; } h2 { - font-size: 1.8em; - font-weight: 600; + font-size: 3em; + font-weight: 400; + line-height: 0.8em; } h3 { - font-size: 1.2em; - font-weight: 500; + font-size: 2em; + font-weight: 300; } main > article > h1 { diff --git a/resources/views/frame.blade.php b/resources/views/frame.blade.php index 307a845..d116895 100644 --- a/resources/views/frame.blade.php +++ b/resources/views/frame.blade.php @@ -3,6 +3,8 @@ + + @yield('title') @@ -14,7 +16,7 @@
- +
@@ -25,8 +27,8 @@ About
- - Listing + + Listings
The Den diff --git a/resources/views/front/listing.blade.php b/resources/views/front/listing.blade.php index e69de29..6a56215 100644 --- a/resources/views/front/listing.blade.php +++ b/resources/views/front/listing.blade.php @@ -0,0 +1,20 @@ +@extends('frame') +@section('title', 'The Bad Space|Listings') + @section('main-content') + @parent +
+ +
+ @endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 41a6533..363b438 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,6 +19,7 @@ use App\Http\Controllers\LocationController; //front Route::get("/", [FrontIndexController::class, 'start']); +Route::get("/listings/{pageNum}", [FrontIndexController::class, 'listings']); //auth Route::get("/login", [AuthController::class, 'showLogin']);