From 0a64de23789b941500a25298f24574179636e37c Mon Sep 17 00:00:00 2001 From: ro Date: Mon, 22 Jan 2024 13:45:11 -0600 Subject: [PATCH] Link Updates, Recent Links on Index clean up Started the front end refresh by starting to plug in the new design on the index page. The search methodology was still not consistent, so that process was cleaned up to display what is actually being tracked based on the two action criteria, then updating the design for the location links to be clear and display the heat rating. Added a repo link to the About section. --- app/Http/Controllers/FrontIndexController.php | 22 ++++++---- public/assets/css/front/listing.css | 42 ++++++++++++++++++- public/assets/css/global/colors.css | 6 +-- .../assets/images/global/status-silence.svg | 4 +- .../assets/images/global/status-suspend.svg | 4 +- resources/views/front/about.blade.php | 2 +- resources/views/front/index.blade.php | 37 ++++++++++------ 7 files changed, 87 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/FrontIndexController.php b/app/Http/Controllers/FrontIndexController.php index dbb7060..58555dc 100644 --- a/app/Http/Controllers/FrontIndexController.php +++ b/app/Http/Controllers/FrontIndexController.php @@ -13,18 +13,24 @@ class FrontIndexController extends Controller public function start() { - $locations = Location::where("active", true)->get(); - $count = count($locations); - $recent = Location::where("active", true) + $sources = Source::where("active", true)->get(); + $locations = Location::where("active", true)->orderByDesc('updated_at')->get(); + $list = []; + foreach ($locations as $location) { + if (($location->block_count + $location->silence_count) > 2) { + array_push($list, $location); + } + } + + $recentList = Location::where("active", true) ->where('block_count', '>', 2) ->limit(10)->orderByDesc('updated_at')->get(); - //$result = DB::select("SELECT * FROM searchlocations('$terms')"); - return view('front.index', [ - 'count' => $count, - 'recent' => $recent, - 'title' => "The Bad Space" + 'count' => count($list), + 'sources' => count($sources), + 'recent' => $list, + 'title' => "The Bad Space" ]); } diff --git a/public/assets/css/front/listing.css b/public/assets/css/front/listing.css index bca702e..9c19ae3 100644 --- a/public/assets/css/front/listing.css +++ b/public/assets/css/front/listing.css @@ -37,7 +37,47 @@ section[role="listings"] div[role="paginate"] span { a.list-link { display: grid; - grid-template-columns: 30px 50px 30px 50px 300px; + grid-template-columns: 70px 80% 80px 80px; + gap: 10px; width: 80%; height: 45px; + padding-bottom: 20px; +} + +a.list-link > .item-rating { + background: var(--secondary); + border-radius: 3px; + color: var(--white); + font-weight: 500; + padding: 10px; +} + +a.list-link > .item-name { + background: var(--white); + border-radius: 3px; + color: var(--black); + font-weight: 400; + padding: 9px 5px; +} + +a.list-link > .item-silence { + background: var(--silence); + border-radius: 3px; + color: var(--black); + font-weight: 500; + padding: 10px; +} + +a.list-link > .item-block { + background: var(--suspend); + border-radius: 3px; + color: var(--black); + font-weight: 500; + padding: 10px; +} + +a.list-link > .item-silence > .item-icon, +a.list-link > .item-block > .item-icon { + width: 30px; + vertical-align: top; } diff --git a/public/assets/css/global/colors.css b/public/assets/css/global/colors.css index 76a31c5..8f0fc5a 100644 --- a/public/assets/css/global/colors.css +++ b/public/assets/css/global/colors.css @@ -2,12 +2,12 @@ /* BASE COLORS */ --primary: #140c08; --secondary: #d66365; - --highlight: #69b04f; + --highlight: #5c934c; --white: #efebe3; --grey: #abb7b7; --black: #32302f; --error: #b62520; - --silence: #ea6010; - --suspend: #fb263a; + --silence: #bd8d61; + --suspend: #bd6190; --primary-rgb: 20 13 13; } diff --git a/public/assets/images/global/status-silence.svg b/public/assets/images/global/status-silence.svg index 13fdd48..38eccda 100644 --- a/public/assets/images/global/status-silence.svg +++ b/public/assets/images/global/status-silence.svg @@ -1,6 +1,6 @@ - + - + diff --git a/public/assets/images/global/status-suspend.svg b/public/assets/images/global/status-suspend.svg index 49a4cf3..b0e0d08 100644 --- a/public/assets/images/global/status-suspend.svg +++ b/public/assets/images/global/status-suspend.svg @@ -1,6 +1,6 @@ - + - + diff --git a/resources/views/front/about.blade.php b/resources/views/front/about.blade.php index ad16afc..0ccde1d 100644 --- a/resources/views/front/about.blade.php +++ b/resources/views/front/about.blade.php @@ -18,7 +18,7 @@

Technical support provided by - Ro. + Ro. The repo can be found here.

How does it work?

The Bad Space is a collaboration of instances committed to actively moderating against racism, sexism, heterosexism, transphobia, ableism, casteism, or religion.

diff --git a/resources/views/front/index.blade.php b/resources/views/front/index.blade.php index b9be73c..d199817 100644 --- a/resources/views/front/index.blade.php +++ b/resources/views/front/index.blade.php @@ -17,27 +17,38 @@ Found {{count($results)}} results:
- @foreach($results as $location) - {{$location->name}}
- @endforeach + @for($i = 0; $i < 10; $i++) + {{$recent[$i]->name}}
+ @endfor @endisset
+

Recent Updates

+ @for($i = 0; $i < 10; $i++) + + @php + $action = $recent[$i]->block_count + $recent[$i]->silence_count; + $rating = ($action / $sources)*100; + @endphp + + {{$rating}}% + +
+ + {{$recent[$i]->silence_count}} +
+
+ + {{$recent[$i]->block_count}} +
+ + @endfor

Bad Space Stats

{{$count}}
Instances being tracked. -

Recent Updates

- @foreach($recent as $location) - - {{$location->block_count}} - - {{$location->silence_count}} - - - - @endforeach +
@endsection \ No newline at end of file