edit

pradoslaw · Dec 6, 2024 · 56cd6d1 · 56cd6d1
1 parent e5e15c7
commit 56cd6d1
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 55 deletions.
diff --git a/app/Feature/Trial/TrialService.php b/app/Feature/Trial/TrialService.php
@@ -11,7 +11,7 @@ public function __construct(private Guest $guest)
 
     public function isChoiceModern(): bool
     {
-        return true;
+        return false;
     }
 
     public function setChoice(string $choice): void
@@ -60,7 +60,7 @@ public function setBadgeNarrow(bool $narrow): void
 
     public function getUserStage(): string
     {
-        return 'stage-none';
+        return $this->guest->getSetting('surveyStage', 'stage-invited');
     }
 
     public function getUserChoice(): string

diff --git a/app/Services/Session/Renderer.php b/app/Services/Session/Renderer.php
@@ -1,7 +1,7 @@
 <?php
 namespace Coyote\Services\Session;
 
-use Coyote\Domain\Online\FakeSessionRepository;
+use Coyote\Domain\Online\SessionRepository;
 use Coyote\Domain\Online\Viewers;
 use Coyote\Domain\Online\ViewersStore;
 use Coyote\Domain\Spacer;
@@ -13,9 +13,9 @@ class Renderer
     private Spacer $spacer;
 
     public function __construct(
-        private FakeSessionRepository $session,
-        private ViewersStore          $store,
-        private Request               $request,
+        private SessionRepository $session,
+        private ViewersStore      $store,
+        private Request           $request,
     )
     {
         $this->spacer = new Spacer(8);

diff --git a/config/laravel-menu.php b/config/laravel-menu.php
@@ -21,12 +21,12 @@
     ],
 
     '__master_menu___' => [
-        'Forum'      => ['route' => 'forum.home', 'class' => 'nav-item dropdown designer-navbar-text'],
-        'Mikroblogi' => ['route' => 'microblog.home', 'class' => 'nav-item designer-navbar-text'],
-        'Praca'      => ['route' => 'job.home', 'class' => 'nav-item designer-navbar-text'],
+        'Forum'      => ['route' => 'forum.home', 'class' => 'nav-item dropdown'],
+        'Mikroblogi' => ['route' => 'microblog.home', 'class' => 'nav-item'],
+        'Praca'      => ['route' => 'job.home', 'class' => 'nav-item'],
         'Kompendium' => [
             'url'      => 'Kategorie',
-            'class'    => 'nav-item dropdown designer-navbar-text',
+            'class'    => 'nav-item dropdown',
             'children' => [
                 'Delphi'       => ['url' => 'Delphi'],
                 'C/C++'        => ['url' => 'C'],

diff --git a/resources/feature/lookAndFeel/lookAndFeel.scss b/resources/feature/lookAndFeel/lookAndFeel.scss
@@ -1,7 +1,6 @@
 @import "../theme/theme";
 @import "bootstrap/scss/mixins/breakpoints";
-
-@import "../sass/pages/homepage_modern";
+@import "../../sass/pages/homepage_modern";
 @import "style-guide";
 
 @mixin size($size) {
@@ -49,13 +48,13 @@ body {
   @include background-theme($background-light, $background-dark);
 }
 
-.designer-post {
+.neon-post {
   border-radius: $tile-radius;
   border: none;
 
   @include background-theme($tile-background-light, $tile-background-dark);
 
-  .designer-post-header {
+  .neon-post-header {
     @include background-theme($tile-background-light, $tile-background-dark);
   }
 
@@ -65,15 +64,15 @@ body {
     border-bottom-right-radius: $tile-radius;
   }
 
-  .designer-post-header {
+  .neon-post-header {
     border-bottom-width: $tile-border-width;
   }
 
   .designer-post-footer {
     border-top-width: $tile-border-width;
   }
 
-  .designer-post-header,
+  .neon-post-header,
   .designer-post-footer {
     @include light {
       border-color: $tile-border-primary-light;
@@ -84,7 +83,7 @@ body {
   }
 }
 
-.designer-aside {
+.neon-forum-aside {
   @include background-theme($background-light, $background-dark);
   padding: 24px;
   border-radius: $tile-radius;
@@ -106,7 +105,7 @@ body {
   }
 }
 
-.designer-section-heading, h4.heading { // TODO remove h4.heading
+.neon-section-heading, h4.heading { // TODO remove h4.heading
   border-bottom-width: $tile-border-width !important;
   @include light {
     border-bottom-color: $tile-border-secondary-light;
@@ -243,7 +242,7 @@ header nav.navbar {
     }
   }
 
-  .designer-navbar-text {
+  .neon-navbar-text {
     @include light {
       color: $text-color-primary-light !important;
     }

diff --git a/resources/js/components/defaultAvatar.scss b/resources/js/components/defaultAvatar.scss
@@ -8,14 +8,4 @@
       color: currentColor;
     }
   }
-
-  body.theme-light & {
-    color: #435b00;
-    background: #f3f7e6;
-  }
-
-  body.theme-dark & {
-    color: #789b17;
-    background: #141414;
-  }
 }
diff --git a/resources/js/components/forum/post.vue b/resources/js/components/forum/post.vue
@@ -9,7 +9,7 @@
   </div>
   <div v-else
        :id="anchor"
-       class="card card-post designer-post"
+       class="card card-post neon-post"
        :class="[
          {'is-deleted': hidden, 'not-read': !post.is_read, 'highlight-flash': highlight, 'post-deleted-collapsed': isCollapsed},
          postIndentCssClasses
@@ -29,7 +29,7 @@
       <vue-icon name="postAuthorBlocked"/>
       Treść posta została ukryta, ponieważ autorem jest zablokowany przez Ciebie użytkownik.
     </div>
-    <div :class="{'collapse': isCollapsed, 'd-lg-block': !isCollapsed}" class="card-header d-none designer-post-header">
+    <div :class="{'collapse': isCollapsed, 'd-lg-block': !isCollapsed}" class="card-header d-none neon-post-header">
       <div class="row">
         <div class="col-2">
           <h5 class="mb-0 post-author designer-topic-user-name-post-author"

diff --git a/resources/js/components/navbar-toggle.ts b/resources/js/components/navbar-toggle.ts
@@ -151,7 +151,7 @@ createVueApp('NonAlertControls', '#non-alert-controls', {
   },
   template: `
     <div :class="['d-flex', 'align-items-center', 'h-100']" v-click-away="close">
-      <span :class="['position-relative', 'px-2', 'py-2', 'btn-toggle-theme', 'designer-navbar-text', {open}]" @click="toggleOpen" v-if="toggleEnabled" style="cursor:pointer;">
+      <span :class="['position-relative', 'px-2', 'py-2', 'btn-toggle-theme', 'neon-navbar-text', {open}]" @click="toggleOpen" v-if="toggleEnabled" style="cursor:pointer;">
         <vue-toggle-icon :icon="oppositeIcon"/>
         <div class="dropdown-menu dropdown-menu-end" style="display:block" v-show="open">
           <span v-for="(item, itemTheme, index) in items"

diff --git a/resources/js/components/notifications/notifications.vue b/resources/js/components/notifications/notifications.vue
@@ -1,6 +1,6 @@
 <template>
   <li :class="{'open': isOpen}" v-click-away="hideDropdown">
-    <span @click="toggleDropdown" class="nav-link nav-control-icon designer-navbar-text">
+    <span @click="toggleDropdown" class="nav-link nav-control-icon neon-navbar-text">
       <span v-show="count > 0" class="badge">{{ count }}</span>
       <vue-icon name="navigationNotifications"/>
     </span>

diff --git a/resources/js/components/pm/inbox.vue b/resources/js/components/pm/inbox.vue
@@ -1,6 +1,6 @@
 <template>
   <li :class="{'open': isOpen}" v-click-away="hideDropdown">
-    <span @click="loadMessages" class="nav-link nav-control-icon designer-navbar-text">
+    <span @click="loadMessages" class="nav-link nav-control-icon neon-navbar-text">
       <span v-show="count > 0" class="badge">{{ count }}</span>
       <vue-icon name="navigationPrivateMessages"/>
     </span>

diff --git a/resources/sass/core/_dark_topic.scss b/resources/sass/core/_dark_topic.scss
@@ -331,8 +331,6 @@ body.theme-dark {
 
   aside {
     &#sidebar {
-      //background-color: #252525; // this is replaced by designer-aside
-      //border-color: #789b17;  // this is replaced by designer-aside
       border-width: 1px;
       box-shadow: none;
     }

diff --git a/resources/sass/pages/_homepage_modern.scss b/resources/sass/pages/_homepage_modern.scss
@@ -3,7 +3,6 @@
 @import "bootstrap/scss/mixins/breakpoints";
 @import "bootstrap/scss/mixins/text-truncate";
 @import "../../feature/theme/theme";
-@import "../../janek/style-guide";
 
 @mixin size($size) {
   @if ($size == 'intermediate') {

diff --git a/resources/views/adm/flag/show/post.twig b/resources/views/adm/flag/show/post.twig
@@ -8,8 +8,8 @@
     <span>Kategoria: <a href="{{ post.forum.href }}">{{ post.forum.label }}</a></span>
   </p>
 
-  <div class="card card-post mb-3">
-    <div class="card-header">
+  <div class="card card-post neon-post mb-3">
+    <div class="card-header neon-post-header">
       <div class="row">
         <div class="col-2">{{ post.author.mention }}</div>
         <div class="col-10"><small>{{ post.createdAt.ago }}</small></div>
@@ -38,7 +38,7 @@
         </style>
       </div>
     </div>
-    <div class="card-footer">
+    <div class="card-footer neon-post-footer">
       <div class="row">
         <div class="col-2"></div>
         <div class="col-10 text-end text-muted">

diff --git a/resources/views/components/viewers.twig b/resources/views/components/viewers.twig
@@ -1,5 +1,5 @@
 <div class="box">
-  <h4 class="heading {{ isHomepageModern ? 'mb-3 py-0' }}">
+  <h4 class="heading {{ isHomepageModern ? 'mb-3 py-0' }} neon-section-heading">
     {% if iconVisible %}
       {% if local %}
         {{ icon('viewersOnlineLocal') }}

diff --git a/resources/views/forum/home.twig b/resources/views/forum/home.twig
@@ -36,7 +36,7 @@
     {% block side_menu %}
       {% include 'forum.partials.post_count' %}
       <div class="box mb-5">
-        <h4 class="heading">
+        <h4 class="heading neon-section-heading">
           {{ icon('forumActions') }}
           Akcje
         </h4>

diff --git a/resources/views/forum/partials/sidebar.twig b/resources/views/forum/partials/sidebar.twig
@@ -1,4 +1,4 @@
-<aside class="sticky-aside designer-aside" id="sidebar">
+<aside class="sticky-aside neon-forum-aside" id="sidebar">
   {% block side_menu %}
   {% endblock %}
 

diff --git a/resources/views/forum/topic.twig b/resources/views/forum/topic.twig
@@ -41,8 +41,8 @@
         {% endif %}
       </div>
       {% for post in posts.data %}
-        <div class="card card-post">
-          <div class="card-header d-none d-lg-block">
+        <div class="card card-post neon-post">
+          <div class="card-header d-none d-lg-block neon-post-header">
             <div class="row">
               <div class="col-2">
                 <div style="height: 20px"></div>
@@ -84,7 +84,7 @@
             </div>
           </div>
 
-          <div class="card-footer">
+          <div class="card-footer neon-post-footer">
             <div class="row">
               <div class="d-none d-lg-block col-lg-2"></div>
 

diff --git a/resources/views/layout.twig b/resources/views/layout.twig
@@ -75,13 +75,13 @@
       <div class="container-3xl d-flex flex-wrap">
         <a rel="home" class="navbar-brand order-0" href="{{ route('home') }}" title="4programmers.net - Strona główna">
           <img
-              class="logo"
+              class="logo neon-logo"
               alt="4programmers.net"
-              data-src-light="{{ 'img/logo-modern.svg' }}"
-              data-src-dark="{{ 'img/logo-modern.svg' }}"
+              data-src-light="{{ cdn(lookAndFeelModern ? 'img/logo-modern.svg' : 'img/logo-light.svg') }}"
+              data-src-dark="{{ cdn(lookAndFeelModern ? 'img/logo-modern.svg' : 'img/logo-dark.svg') }}"
               src="{{ __dark_theme 
-                ? cdn('img/logo-modern.svg') 
-                : cdn('img/logo-modern.svg') 
+                ? cdn(lookAndFeelModern ? 'img/logo-modern.svg' : 'img/logo-dark.svg') 
+                : cdn(lookAndFeelModern ? 'img/logo-modern.svg' : 'img/logo-light.svg') 
               }}"
           />
         </a>
@@ -90,7 +90,7 @@
           <ul class="navbar-nav">
             {% for item in __master_menu.roots() %}
               <li class="{{ item.attr.class }}">
-                <a href="{{ item.url }}" class="nav-link">
+                <a href="{{ item.url }}" class="nav-link neon-navbar-link">
                   {{ item.title|raw }}
                 </a>
 
@@ -108,7 +108,7 @@
               </li>
             {% endfor %}
             <li class="nav-item">
-              <a href="/events" class="nav-link designer-navbar-text">
+              <a href="/events" class="nav-link neon-navbar-text">
                 Wydarzenia
               </a>
             </li>
@@ -176,7 +176,7 @@
           </div>
         {% else %}
           <div class="form-inline order-2 ms-auto">
-            <a class="btn btn-sm btn-login me-1 designer-login-button-tertiary" href="{{ route('login') }}" style="border:none;">
+            <a class="btn btn-sm btn-login me-1 neon-navbar-link designer-login-button-tertiary" href="{{ route('login') }}" style="border:none;">
               Zaloguj się
             </a>
             <a class="btn btn-sm btn-primary btn-register" href="{{ route('register') }}">

diff --git a/resources/views/microblog/aside.twig b/resources/views/microblog/aside.twig
@@ -30,7 +30,7 @@
 
     {% if tags.tech is not empty %}
       <div class="box mt-2">
-        <h4 class="heading designer-section-heading">
+        <h4 class="heading neon-section-heading">
           {{ icon('tagsPopularLanguage') }}
           Technologie
         </h4>