Merge branch 'main' of github.com:jahseng-lee/nomad-station

jahseng-lee · Dec 12, 2023 · b7a9b9a · b7a9b9a
2 parents dafdb5b + c9775d7
commit b7a9b9a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 12 deletions.
diff --git a/app/assets/stylesheets/chats.scss b/app/assets/stylesheets/chats.scss
@@ -1,6 +1,6 @@
 body {
-  height: 100vh;
-  max-height: 100vh;
+  height: 100svh;
+  max-height: 100svh;
 
   display: flex;
   flex-direction: column;

diff --git a/app/assets/stylesheets/location.scss b/app/assets/stylesheets/location.scss
@@ -12,6 +12,14 @@
   }
 }
 
+.emergency-number {
+  display: flex;
+
+  span:first-child {
+    flex-grow: 1;
+  }
+}
+
 .hero {
   text-align: center;
 
@@ -23,10 +31,14 @@
   }
 }
 
-.emergency-number {
-  display: flex;
+.location-tabs {
+  ul {
+    overflow-x: auto;
+    flex-wrap: nowrap;
 
-  span:first-child {
-    flex-grow: 1;
+    li {
+      display: inline-block;
+      float: none;
+    }
   }
 }
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
@@ -25,6 +25,9 @@ application.register("modal", ModalController)
 import NavbarLinkController from "./navbar_link_controller"
 application.register("navbar-link", NavbarLinkController)
 
+import PagyController from "./pagy_controller"
+application.register("pagy", PagyController)
+
 import SearchCountriesController from "./search_countries_controller"
 application.register("search-countries", SearchCountriesController)
 

diff --git a/app/javascript/controllers/pagy_controller.js b/app/javascript/controllers/pagy_controller.js
@@ -0,0 +1,8 @@
+import { Controller } from "@hotwired/stimulus"
+import Pagy from "pagy-module";
+
+export default class extends Controller {
+  connect() {
+    Pagy.init(this.element)
+  }
+}
diff --git a/app/views/channels/_chat_message.html.erb b/app/views/channels/_chat_message.html.erb
@@ -16,7 +16,7 @@
         </div>
       <% else %>
         <div class="profile-picture chat-profile-picture placeholder">
-          <span><%= helper_user_initials(user: current_user) %></span>
+          <span><%= helper_user_initials(user: user) %></span>
         </div>
       <% end %>
     <% end %>

diff --git a/app/views/locations/_tabs.html.erb b/app/views/locations/_tabs.html.erb
@@ -1,5 +1,5 @@
-<div class="mb-3" data-controller="location-tabs">
-  <ul class="nav nav-pills">
+<div class="location-tabs mb-3" data-controller="location-tabs">
+  <ul class="nav nav-pills justify-content-center">
     <li class="nav-item">
       <%= link_to(
         "Overview",

diff --git a/app/views/search_locations/_location_search_section.html.erb b/app/views/search_locations/_location_search_section.html.erb
@@ -121,7 +121,7 @@
     <% end %>
   </div>
 
-  <div class="pagination-nav-container">
-    <%== pagy_bootstrap_nav(@pagy) %>
+  <div data-controller="pagy" class="pagination-nav-container">
+    <%== pagy_bootstrap_nav_js(@pagy) %>
   </div>
 </div>
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "sass": "^1.68.0"
   },
   "scripts": {
-    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets --loader:.js=jsx",
+    "build": "NODE_PATH=\"$(bundle show 'pagy')/lib/javascripts\" esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets --loader:.js=jsx",
     "build:css:compile": "sass ./app/assets/stylesheets/application.bootstrap.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules",
     "build:css:prefix": "postcss ./app/assets/builds/application.css --use=autoprefixer --output=./app/assets/builds/application.css",
     "build:css": "yarn build:css:compile && yarn build:css:prefix",