Skip to content

Commit

Permalink
Restyle homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
danon committed Nov 6, 2024
1 parent 8d7c669 commit c5f02ab
Show file tree
Hide file tree
Showing 19 changed files with 698 additions and 342 deletions.
16 changes: 16 additions & 0 deletions app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Coyote\Services\Microblogs\Builder;
use Coyote\Services\Parser\Extensions\Emoji;
use Coyote\Services\Session\Renderer;
use Coyote\User;
use Illuminate\Contracts\Cache;
use Illuminate\View\View;
use Neon\Domain;
Expand Down Expand Up @@ -59,6 +60,8 @@ public function index(): View
),

'globalViewers' => $this->globalViewers(),
'members' => $this->members(),
'lookAndFeel' => 'lookAndFeelModern',
])
->with('settings', $this->getSettings());
}
Expand Down Expand Up @@ -97,4 +100,17 @@ private function flags(): array
->get();
return FlagResource::collection($resourceFlags)->toArray($this->request);
}

private function members(): array
{
/** @var Renderer $renderer */
$renderer = app(Renderer::class);

$viewers = $renderer->sessionViewers('/');
return [
'usersTotal' => User::query()->count(),
'usersOnline' => \count($viewers->users),
'guestsOnline' => $viewers->guestsCount,
];
}
}
7 changes: 7 additions & 0 deletions app/Services/Session/Members.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php
namespace Coyote\Services\Session;

class Members
{

}
10 changes: 5 additions & 5 deletions app/Services/Session/Renderer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace Coyote\Services\Session;

use Coyote\Domain\Online\SessionRepository;
use Coyote\Domain\Online\FakeSessionRepository;
use Coyote\Domain\Online\Viewers;
use Coyote\Domain\Online\ViewersStore;
use Coyote\Domain\Spacer;
Expand All @@ -13,9 +13,9 @@ class Renderer
private Spacer $spacer;

public function __construct(
private SessionRepository $session,
private ViewersStore $store,
private Request $request,
private FakeSessionRepository $session,
private ViewersStore $store,
private Request $request,
)
{
$this->spacer = new Spacer(8);
Expand All @@ -41,7 +41,7 @@ public function render(string $requestUri, bool $local, bool $iconVisible = true
]);
}

private function sessionViewers(string $requestUri): Viewers
public function sessionViewers(string $requestUri): Viewers
{
$sessions = $this->session->sessionsIn($requestUri);
if ($this->isUserLogged()) {
Expand Down
2 changes: 1 addition & 1 deletion public/img/logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/img/logo-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions resources/feature/theme/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,36 @@
}
}
}

@mixin theme {
/**
* The dark() and light() mixins increase selector specificity.
* In some cases, it's necessary to apply a common style to both
* themes, overriding a previously defined style.
* Thus, we need to artificially elevate the specificity
* of the style, without actually changing any style.
*/
html.theme-light &,
html.theme-dark &,
{
@content;
}
}

@mixin color-theme($light, $dark) {
@include light {
color: $light;
}
@include dark {
color: $dark;
}
}

@mixin background-theme($light, $dark) {
@include light {
background: $light;
}
@include dark {
background: $dark;
}
}
1 change: 0 additions & 1 deletion resources/feature/viewersOnline/viewers-online.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
.viewers-users-group {
// More horizontal space for pills,
// it's acceptable for them to overflow a little.
margin-left: -6px;
margin-right: -12px;
}

Expand Down
13 changes: 6 additions & 7 deletions resources/js/components/microblog/comment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,25 @@
</a>
</li>
<li class="list-inline-item">
<a
<span
@click="checkAuth(vote, comment)"
@mouseenter.once="loadVoters(comment)"
:aria-label="commentVoters"
:class="{'vote-active': comment.is_voted}"
href="javascript:"
data-balloon-pos="up"
data-balloon-break>
{{ commentLabel }}
</a>
</span>
</li>
<li class="list-inline-item">
<a @click="checkAuth(reply)" href="javascript:">
<span @click="checkAuth(reply)">
Odpowiedz
</a>
</span>
</li>
<li v-if="isAuthorized" class="list-inline-item">
<a href="javascript:" :data-metadata="comment.metadata" :data-url="comment.url">
<span :data-metadata="comment.metadata" :data-url="comment.url">
Zgłoś
</a>
</span>
</li>
</ul>

Expand Down
14 changes: 8 additions & 6 deletions resources/js/components/microblog/microblog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,14 @@
<div class="media microblog-input rounded border-top-0">
<div class="me-1">
<a v-profile="user.id">
<vue-avatar
:photo="user.photo"
:name="user.name"
:initials="user.initials"
class="i-35 d-block img-thumbnail"
/>
<div class="user-avatar-border i-35">
<vue-avatar
:photo="user.photo"
:name="user.name"
:initials="user.initials"
class="d-block img-thumbnail"
/>
</div>
</a>
</div>
<div class="media-body position-relative">
Expand Down
6 changes: 3 additions & 3 deletions resources/sass/core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
@import "core/dark_flash";
@import "core/dark_footer";
@import "core/dark_header";
@import "core/dark_homepage";
@import "core/dark_input";
@import "core/dark_job";
@import "core/dark_job_offers";
Expand All @@ -63,7 +62,8 @@
@import "core/dark_wiki";

@import "components/tags";
@import "components/forum/post"; // it needs to be here because post's placeholder use styles in this specific file
@import "components/forum/post";
// it needs to be here because post's placeholder use styles in this specific file

@import "pages/auth";
@import "pages/errors";
Expand All @@ -87,7 +87,7 @@

#cache-break {
opacity: 0.01; // increment this value to break cache

/**
* Webpack [contenthash] take into account contents of .css/.scss files,
* but PurgeCss removes unused css elements. When editing .twig file,
Expand Down
104 changes: 0 additions & 104 deletions resources/sass/core/_dark_homepage.scss

This file was deleted.

1 change: 0 additions & 1 deletion resources/sass/core/_dark_markdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ body.theme-dark {
pre,
{
color: #acacac;
background-color: #101010;
border: none;
}

Expand Down
3 changes: 1 addition & 2 deletions resources/sass/core/_dark_topic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ body.theme-dark {
header {
nav.navbar {
border-bottom-color: #2f2f2f;
border-bottom-width: 2px;

.nav-search {
.nav-search { // TODO remove this after new homepage
.search-bar {
background-color: #2a2a2a;

Expand Down
26 changes: 10 additions & 16 deletions resources/sass/core/_navs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@
}
}

.nav-pills {
.nav-link {
&.nav-link-style-only {
// Style an element to look like a nav link,
// without any functionality of nav link.
cursor: default;
}
}
}

.nav-tabs {
.nav-link.active {
border-top: 2px solid $alt-link-hover-color;
Expand All @@ -46,14 +36,18 @@
.nav-link {
cursor: pointer;
color: #777777;
}

.nav-link.active {
color: black;
&.active {
color: black;

&, &:hover, &:focus, &:active {
border-bottom: 2px solid $alt-link-hover-color;
margin-bottom: -1px;
&,
&:hover,
&:focus,
&:active,
{
border-bottom: 2px solid $alt-link-hover-color;
margin-bottom: -2px;
}
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions resources/sass/icons/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ $icon-admin-table-sort: $fa-var-sort;
$icon-admin-table-sort-asc: $fa-var-sort-down;
$icon-admin-table-sort-desc: $fa-var-sort-up;

@mixin icon {
i.fa-fw {
@content;
}
}

.fa-square-question:before {
content: "\f2fd";
}
Expand Down
2 changes: 1 addition & 1 deletion resources/sass/layout/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ footer {
}
}

#scroll-to-top {
.scroll-top {
@include floater;
box-sizing: content-box;
font-size: 16px;
Expand Down
Loading

0 comments on commit c5f02ab

Please sign in to comment.