@okjavis/nodebb-theme-javis 5.0.0 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okjavis/nodebb-theme-javis",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Modern, premium NodeBB theme for JAVIS Community - Extends Harmony with custom styling",
   "main": "theme.js",
   "scripts": {

package/plugin.json

@@ -18,7 +18,8 @@
     "static/lib/theme.js"
   ],
   "modules": {
-    "../admin/plugins/javis.js": "public/admin.js"
+    "../admin/plugins/javis.js": "public/admin.js",
+    "forum/search": "public/src/client/search.js"
   },
   "templates": "templates",
   "screenshot": "screenshot.png",

package/public/src/client/search.js

@@ -257,12 +257,14 @@ define('forum/search', [
 		categoryFilter.init(dropdownEl, {
 			selectedCids: _selectedCids,
 			updateButton: false, // prevent categoryFilter module from updating the button
+			states: [], // FIX: Disable watch states to remove "Watched categories" from dropdown
+			showLinks: true, // FIX: Show regular category links
 			onSelect: function (data) {
-				// Update selectedCids immediately when a category is clicked
+				// FIX: Update selectedCids immediately when a category is clicked
 				ajaxify.data.selectedCids = data.selectedCids;
 				selectedCids = data.selectedCids;
 
-				// Trigger search immediately
+				// FIX: Trigger search immediately without requiring additional clicks
 				const searchFiltersNew = getSearchDataFromDOM();
 				if (JSON.stringify(searchFilters) !== JSON.stringify(searchFiltersNew)) {
 					searchFilters = searchFiltersNew;

package/static/lib/theme.js

@@ -8,10 +8,22 @@
 
   var carouselCounter = 0;
 
+  // Patch search module to fix category filter
+  $(window).on('action:ajaxify.end', function(ev, data) {
+    if (data.url && data.url.startsWith('search')) {
+      patchSearchCategoryFilter();
+    }
+  });
+
   // Theme initialization
   $(document).ready(function() {
     console.log('JAVIS Community Theme initialized');
 
+    // Patch search if we're already on the search page
+    if (window.location.pathname.includes('/search')) {
+      setTimeout(patchSearchCategoryFilter, 500);
+    }
+
     // Initialize sidebar toggle handler
     initSidebarToggle();
 
@@ -658,6 +670,64 @@
     });
   }
 
+  /**
+   * Patch search page category filter to:
+   * 1. Remove "Watched categories" from dropdown
+   * 2. Auto-apply category filter on selection (no additional click needed)
+   */
+  function patchSearchCategoryFilter() {
+    var $categoryFilter = $('[component="search/filters"] [component="category/filter"]');
+    if (!$categoryFilter.length || $categoryFilter.attr('data-javis-patched')) {
+      return;
+    }
+    $categoryFilter.attr('data-javis-patched', 'true');
+
+    console.log('JAVIS: Patching search category filter');
+
+    // Function to remove "Watched categories" from the dropdown
+    function removeWatchedCategories() {
+      // Method 1: Remove by data-cid="watched"
+      var $watchedItem = $categoryFilter.find('[component="category/list"] li[data-cid="watched"]');
+      if ($watchedItem.length) {
+        $watchedItem.remove();
+        console.log('JAVIS: Removed "Watched categories" by data-cid');
+        return true;
+      }
+
+      // Method 2: Remove by text content (fallback)
+      $categoryFilter.find('[component="category/list"] li').each(function() {
+        var $li = $(this);
+        var text = $li.text().toLowerCase().trim();
+        if (text.includes('watched') && text.includes('categor')) {
+          $li.remove();
+          console.log('JAVIS: Removed "Watched categories" by text match');
+          return false; // break the loop
+        }
+      });
+    }
+
+    // Remove immediately
+    removeWatchedCategories();
+
+    // Also remove when dropdown opens (in case categories are loaded dynamically)
+    $categoryFilter.on('shown.bs.dropdown', function() {
+      setTimeout(removeWatchedCategories, 100);
+    });
+
+    // Add immediate search trigger on category selection
+    $categoryFilter.on('click', '[component="category/list"] [data-cid]', function(e) {
+      var $item = $(this);
+      var cid = $item.attr('data-cid');
+
+      // Let the original handler update the selection state first
+      setTimeout(function() {
+        // Trigger the search by closing the dropdown (which triggers the existing onHidden handler)
+        $categoryFilter.find('.dropdown-toggle').dropdown('hide');
+        console.log('JAVIS: Auto-triggering search for category:', cid);
+      }, 50);
+    });
+  }
+
   /**
    * Initialize immediate category filter navigation on feed page
    * When a category is selected, navigate immediately instead of waiting for dropdown close

package/templates/login.tpl

@@ -0,0 +1,131 @@
+<div data-widget-area="header">
+	{{{each widgets.header}}}
+	{{widgets.header.html}}
+	{{{end}}}
+</div>
+<div class="row login flex-fill align-items-center justify-content-center" style="min-height: calc(100vh - 200px);">
+	<div class="d-flex flex-column gap-2 {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+		<div class="row justify-content-center align-items-center">
+			<!-- LinkedIn Primary Login (hidden when ?admin=true) -->
+			{{{ if alternate_logins }}}
+			<div class="col-12 col-md-6 col-lg-4 px-md-0 linkedin-section">
+				<div class="linkedin-login-block d-flex flex-column align-items-center gap-4 py-5">
+					<h2 class="tracking-tight fw-semibold text-center mb-2">Welcome to JAVIS Community</h2>
+					<p class="text-muted text-center mb-4">Sign in with your LinkedIn account to continue</p>
+
+					<ul class="alt-logins list-unstyled w-100" style="max-width: 320px;">
+						{{{ each authentication }}}
+						<li class="{./name} mb-2">
+							<a class="btn linkedin-sso-btn d-flex align-items-center justify-content-center gap-3 w-100 py-3" rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{./url}">
+								<i class="fa-brands fa-linkedin fa-lg"></i>
+								<span class="fw-semibold">Sign in with LinkedIn</span>
+							</a>
+						</li>
+						{{{ end }}}
+					</ul>
+
+					<p class="text-muted text-center text-sm mt-4">
+						By signing in, you agree to our Terms of Service and Privacy Policy
+					</p>
+				</div>
+			</div>
+			{{{ end }}}
+
+			<!-- Admin Login Form -->
+			{{{ if allowLocalLogin }}}
+			<div class="col-12 col-md-6 col-lg-4 px-md-0 admin-login-section">
+				<div class="admin-login-block d-flex flex-column gap-3 py-5">
+					<h2 class="tracking-tight fw-semibold text-center mb-2">Admin Login</h2>
+					<p class="text-muted text-center mb-3">Sign in with your administrator credentials</p>
+					<form class="d-flex flex-column gap-3" role="form" method="post" id="login-form">
+						<div class="mb-2 d-flex flex-column gap-2">
+							<label for="username">{allowLoginWith}</label>
+							<input class="form-control" type="text" placeholder="{allowLoginWith}" name="username" id="username" autocorrect="off" autocapitalize="off" autocomplete="nickname" value="{username}" aria-required="true"/>
+						</div>
+
+						<div class="mb-2 d-flex flex-column gap-2">
+							<label for="password">[[user:password]]</label>
+							<div>
+								<input class="form-control" type="password" placeholder="[[user:password]]" name="password" id="password" autocomplete="current-password" autocapitalize="off" aria-required="true"/>
+								<p id="caps-lock-warning" class="text-danger hidden text-sm mb-0 form-text" aria-live="polite" role="alert" aria-atomic="true">
+									<i class="fa fa-exclamation-triangle"></i> [[login:caps-lock-enabled]]
+								</p>
+							</div>
+							{{{ if allowPasswordReset }}}
+							<div>
+								<a id="reset-link" class="text-sm text-reset text-decoration-underline" href="{config.relative_path}/reset">[[login:forgot-password]]</a>
+							</div>
+							{{{ end }}}
+						</div>
+
+						{{{ each loginFormEntry }}}
+						<div class="mb-2 loginFormEntry d-flex flex-column gap-2 {./styleName}">
+							<label for="{./inputId}">{./label}</label>
+							<div>{{./html}}</div>
+						</div>
+						{{{ end }}}
+
+						<input type="hidden" name="_csrf" value="{config.csrf_token}" />
+						<input type="hidden" name="noscript" id="noscript" value="true" />
+
+						<button class="btn btn-primary" id="login" type="submit">[[global:login]]</button>
+
+						<div class="form-check mb-2">
+							<input class="form-check-input" type="checkbox" name="remember" id="remember" checked />
+							<label class="form-check-label" for="remember">[[login:remember-me]]</label>
+						</div>
+
+						<div class="alert alert-danger {{{ if !error }}} hidden{{{ end }}}" id="login-error-notify" role="alert" aria-atomic="true">
+							<strong>[[login:failed-login-attempt]]</strong>
+							<p class="mb-0">{error}</p>
+						</div>
+					</form>
+				</div>
+			</div>
+			{{{ end }}}
+		</div>
+	</div>
+	<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 {{{ if !widgets.sidebar.length }}}hidden{{{ end }}}">
+		{{{each widgets.sidebar}}}
+		{{widgets.sidebar.html}}
+		{{{end}}}
+	</div>
+</div>
+<div data-widget-area="footer">
+	{{{each widgets.footer}}}
+	{{widgets.footer.html}}
+	{{{end}}}
+</div>
+
+<script>
+// Control visibility based on ?admin=true parameter
+(function() {
+	const urlParams = new URLSearchParams(window.location.search);
+	const isAdminMode = urlParams.get('admin') === 'true';
+	const adminSection = document.querySelector('.admin-login-section');
+	const linkedinSection = document.querySelector('.linkedin-section');
+
+	if (isAdminMode) {
+		// Admin mode: show admin form, hide LinkedIn
+		if (adminSection) {
+			adminSection.style.display = 'block';
+		}
+		if (linkedinSection) {
+			linkedinSection.style.display = 'none';
+		}
+	} else {
+		// Normal mode: show LinkedIn (if exists), hide admin form
+		if (linkedinSection) {
+			linkedinSection.style.display = 'block';
+			if (adminSection) {
+				adminSection.style.display = 'none';
+			}
+		} else {
+			// No LinkedIn configured - show admin form as fallback
+			if (adminSection) {
+				adminSection.style.display = 'block';
+			}
+		}
+	}
+})();
+</script>

package/templates/partials/category/filter-dropdown-content.tpl

@@ -41,4 +41,4 @@
         </li>
         {{{end}}}
     </ul>
-</div>
+</div>

package/templates/partials/sidebar/user-menu.tpl

@@ -0,0 +1,98 @@
+<a component="header/avatar" id="user_dropdown" href="#" role="button" class="nav-link d-flex gap-2 align-items-center text-truncate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[user:user-menu]]">
+	{buildAvatar(user, "20px", true)}
+	<span id="user-header-name" class="nav-text small visible-open fw-semibold">{user.username}</span>
+</a>
+<ul id="user-control-list" component="header/usercontrol" class="overscroll-behavior-contain user-dropdown dropdown-menu shadow p-1 text-sm ff-base" role="menu">
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" component="header/profilelink" href="{relative_path}/user/{user.userslug}" role="menuitem" aria-label="[[user:profile]]">
+			<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status {user.status}"><span class="visually-hidden">[[global:{user.status}]]</span></span>
+			<span class="fw-semibold" component="header/username">{user.username}</span>
+		</a>
+	</li>
+	<li role="presentation" class="dropdown-divider"></li>
+	<li><h6 class="dropdown-header text-xs">[[global:status]]</h6></li>
+	<li>
+		<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.online }}}selected{{{ end }}}" data-status="online" role="menuitem">
+			<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status online"></span>
+			<span class="flex-grow-1">[[global:online]]</span>
+			<i class="fa-solid fa-check text-secondary flex-shrink-0" aria-label="[[global:selected]]"></i>
+		</a>
+	</li>
+	<li>
+		<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.away }}}selected{{{ end }}}" data-status="away" role="menuitem">
+			<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status away"></span>
+			<span class="flex-grow-1">[[global:away]]</span>
+			<i class="fa-solid fa-check text-secondary flex-shrink-0"><span class="visually-hidden">[[global:selected]]</span></i>
+		</a>
+	</li>
+	<li>
+		<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.dnd }}}selected{{{ end }}}" data-status="dnd" role="menuitem">
+			<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status dnd"></span>
+			<span class="flex-grow-1">[[global:dnd]]</span>
+			<i class="fa-solid fa-check text-secondary flex-shrink-0"></i>
+		</a>
+	</li>
+	<li>
+		<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.offline }}}selected{{{ end }}}" data-status="offline" role="menuitem">
+			<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status offline"></span>
+			<span class="flex-grow-1">[[global:invisible]]</span>
+			<i class="fa-solid fa-check text-secondary flex-shrink-0"></i>
+		</a>
+	</li>
+	<li role="presentation" class="dropdown-divider"></li>
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/user/{user.userslug}/bookmarks" role="menuitem">
+			<i class="fa fa-fw fa-bookmark text-secondary"></i> <span>[[user:bookmarks]]</span>
+		</a>
+	</li>
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit" role="menuitem">
+			<i class="fa fa-fw fa-edit text-secondary"></i> <span>[[user:edit-profile]]</span>
+		</a>
+	</li>
+	{{{ if showModMenu }}}
+	<li role="presentation" class="dropdown-divider"></li>
+	<li><h6 class="dropdown-header text-xs">[[pages:moderator-tools]]</h6></li>
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/flags" role="menuitem">
+			<i class="fa fa-fw fa-flag text-secondary"></i> <span>[[pages:flagged-content]]</span>
+		</a>
+	</li>
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/post-queue" role="menuitem">
+			<i class="fa fa-fw fa-list-alt text-secondary"></i> <span>[[pages:post-queue]]</span>
+		</a>
+	</li>
+	{{{ if registrationQueueEnabled }}}
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/registration-queue" role="menuitem">
+			<i class="fa fa-fw fa-list-alt text-secondary"></i> <span>[[pages:registration-queue]]</span>
+		</a>
+	</li>
+	{{{ end }}}
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/ip-blacklist" role="menuitem">
+			<i class="fa fa-fw fa-ban text-secondary"></i> <span>[[pages:ip-blacklist]]</span>
+		</a>
+	</li>
+	{{{ else }}}
+	{{{ if postQueueEnabled }}}
+	<li>
+		<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="{relative_path}/post-queue" role="menuitem">
+			<i class="fa fa-fw fa-list-alt text-secondary"></i> <span>[[pages:post-queue]]</span>
+		</a>
+	</li>
+	{{{ end }}}
+	{{{ end }}}
+
+	<li role="presentation" class="dropdown-divider"></li>
+	<li component="user/logout">
+		<form method="post" action="{relative_path}/logout" role="menuitem">
+			<input type="hidden" name="_csrf" value="{config.csrf_token}">
+			<input type="hidden" name="noscript" value="true">
+			<button type="submit" class="dropdown-item rounded-1 d-flex align-items-center gap-2">
+				<i class="fa fa-fw fa-sign-out text-secondary"></i><span>[[global:logout]]</span>
+			</button>
+		</form>
+	</li>
+</ul>