From b85b4248c0af639a7128778b4969d4e5b178aeda Mon Sep 17 00:00:00 2001 From: adilallo <39313955+adilallo@users.noreply.github.com> Date: Fri, 5 Sep 2025 09:46:48 -0600 Subject: [PATCH] Update blog page asset and md loading --- app/blog/[slug]/page.js | 13 ++- app/components/ContentContainer.js | 7 +- app/components/ContentThumbnailTemplate.js | 26 +++-- app/components/Footer.js | 5 +- app/components/Header.js | 7 +- app/components/Logo.js | 44 +++---- app/layout.js | 3 +- app/page.js | 2 + content/blog/resolving-active-conflicts.md | 129 +-------------------- lib/assetUtils.js | 54 +++++++++ lib/cache.js | 6 +- 11 files changed, 126 insertions(+), 170 deletions(-) create mode 100644 lib/assetUtils.js diff --git a/app/blog/[slug]/page.js b/app/blog/[slug]/page.js index 83e890d..4bb5b9d 100644 --- a/app/blog/[slug]/page.js +++ b/app/blog/[slug]/page.js @@ -24,7 +24,8 @@ export async function generateStaticParams() { */ export async function generateMetadata({ params }) { try { - const post = getBlogPostBySlug(params.slug); + const { slug } = await params; + const post = getBlogPostBySlug(slug); if (!post) { return { @@ -57,9 +58,10 @@ export async function generateMetadata({ params }) { /** * Dynamic blog post page */ -export default function BlogPostPage({ params }) { +export default async function BlogPostPage({ params }) { // Get the blog post data - const post = getBlogPostBySlug(params.slug); + const { slug } = await params; + const post = getBlogPostBySlug(slug); // If post doesn't exist, show 404 if (!post) { @@ -71,7 +73,10 @@ export default function BlogPostPage({ params }) { const relatedPosts = allPosts.filter((p) => p.slug !== post.slug).slice(0, 3); // Show up to 3 related posts return ( -
+
{/* Main Content */}
{/* Article Header */} diff --git a/app/components/ContentContainer.js b/app/components/ContentContainer.js index 7553646..56f90bd 100644 --- a/app/components/ContentContainer.js +++ b/app/components/ContentContainer.js @@ -1,14 +1,15 @@ "use client"; import React from "react"; +import { getAssetPath, ASSETS } from "../../lib/assetUtils"; const ContentContainer = ({ post, width = "200px", size = "responsive" }) => { // Get the corresponding icon based on the same logic as background images const getIconImage = (slug) => { const icons = [ - "/assets/Content_Thumbnail/Icon_1.svg", - "/assets/Content_Thumbnail/Icon_2.svg", - "/assets/Content_Thumbnail/Icon_3.svg", + getAssetPath(ASSETS.ICON_1), + getAssetPath(ASSETS.ICON_2), + getAssetPath(ASSETS.ICON_3), ]; if (!slug) return icons[0]; diff --git a/app/components/ContentThumbnailTemplate.js b/app/components/ContentThumbnailTemplate.js index 1305f6d..3ed84ba 100644 --- a/app/components/ContentThumbnailTemplate.js +++ b/app/components/ContentThumbnailTemplate.js @@ -3,6 +3,7 @@ import React from "react"; import Link from "next/link"; import ContentContainer from "./ContentContainer"; +import { getAssetPath, ASSETS } from "../../lib/assetUtils"; /** * ContentThumbnailTemplate component for displaying blog post previews @@ -16,15 +17,15 @@ const ContentThumbnailTemplate = ({ // Post-specific background selection - different SVG for each post const getBackgroundImage = (slug, variant) => { const verticalImages = [ - "/assets/Content_Thumbnail/Vertical_1.svg", - "/assets/Content_Thumbnail/Vertical_2.svg", - "/assets/Content_Thumbnail/Vertical_3.svg", + getAssetPath(ASSETS.VERTICAL_1), + getAssetPath(ASSETS.VERTICAL_2), + getAssetPath(ASSETS.VERTICAL_3), ]; const horizontalImages = [ - "/assets/Content_Thumbnail/Horizontal_1.svg", - "/assets/Content_Thumbnail/Horizontal_2.svg", - "/assets/Content_Thumbnail/Horizontal_3.svg", + getAssetPath(ASSETS.HORIZONTAL_1), + getAssetPath(ASSETS.HORIZONTAL_2), + getAssetPath(ASSETS.HORIZONTAL_3), ]; const images = variant === "vertical" ? verticalImages : horizontalImages; @@ -32,12 +33,15 @@ const ContentThumbnailTemplate = ({ if (!slug) return images[0]; // Use the slug to deterministically select an image - const hash = slug.split("").reduce((a, b) => { - a = (a << 5) - a + b.charCodeAt(0); - return a & a; - }, 0); + // More robust hash function using djb2 algorithm + let hash = 5381; + for (let i = 0; i < slug.length; i++) { + hash = (hash << 5) + hash + slug.charCodeAt(i); + } - return images[Math.abs(hash) % images.length]; + // Ensure positive number and get index + const index = Math.abs(hash) % images.length; + return images[index]; }; const backgroundImage = getBackgroundImage(post.slug, variant); diff --git a/app/components/Footer.js b/app/components/Footer.js index e98da53..80f489f 100644 --- a/app/components/Footer.js +++ b/app/components/Footer.js @@ -1,5 +1,6 @@ import Logo from "./Logo"; import Separator from "./Separator"; +import { getAssetPath, ASSETS } from "../../lib/assetUtils"; export default function Footer() { // Schema markup for organization information @@ -70,7 +71,7 @@ export default function Footer() { aria-label="Follow us on Bluesky" > Bluesky GitLab
- +
{children}
diff --git a/app/page.js b/app/page.js index 41d2fd0..f8b2f05 100644 --- a/app/page.js +++ b/app/page.js @@ -5,6 +5,7 @@ import RuleStack from "./components/RuleStack"; import QuoteBlock from "./components/QuoteBlock"; import FeatureGrid from "./components/FeatureGrid"; import AskOrganizer from "./components/AskOrganizer"; +import HomeHeader from "./components/HomeHeader"; export default function Page() { const heroBannerData = { @@ -53,6 +54,7 @@ export default function Page() { return (
+ diff --git a/content/blog/resolving-active-conflicts.md b/content/blog/resolving-active-conflicts.md index fcf59c8..ef301e6 100644 --- a/content/blog/resolving-active-conflicts.md +++ b/content/blog/resolving-active-conflicts.md @@ -7,131 +7,12 @@ related: ["operational-security-mutual-aid", "making-decisions-without-hierarchy"] --- -# Resolving Active Conflicts +Many groups strive to work without bosses, managers, or traditional leadership structures. But when no one's in charge, how do decisions get made? Non-hierarchical groups often rely on collective processes that prioritize trust, transparency, and shared responsibility. These approaches can take more time upfront, but they help build stronger, more equitable communities in the long run. -Conflict is a natural part of any community or organization. When people work together with different perspectives, experiences, and goals, disagreements are inevitable. However, how we handle these conflicts can make the difference between a thriving community and one that falls apart. +One common method is consensus-based decision-making. In this approach, the goal is not just to get majority agreement but to ensure that everyone can live with the outcome. Consensus doesn't mean everyone gets exactly what they want—it means no one is actively opposed. This usually requires open discussion, active listening, and a willingness to compromise. It also works best when the group has shared values and clear communication norms. -## Understanding Conflict +Another option is to use roles or working groups that have specific scopes of responsibility, even if the group itself is flat. For example, one team might handle finances while another focuses on outreach. These roles can rotate or be chosen by the group, and decisions within those areas can be made autonomously—provided there's transparency and accountability back to the wider group. -Before we can resolve conflicts effectively, we need to understand what they are and why they occur. Conflicts arise when: +Tools also matter. Structured facilitation, shared agendas, and decision logs can keep the process from getting stuck or dominated by a few voices. Some groups use hand signals or colored cards during meetings to check for consensus or surface concerns. Others rely on asynchronous tools like polls, shared documents, or messaging platforms to give everyone a chance to weigh in. -- **Interests clash**: Different people want different outcomes -- **Values differ**: People have different beliefs about what's important -- **Communication breaks down**: Misunderstandings lead to tension -- **Resources are limited**: Competition for scarce resources creates friction - -## The Conflict Resolution Process - -### 1. Create a Safe Space - -The first step in resolving any conflict is to create an environment where all parties feel safe to express their concerns honestly. - -- Choose a neutral location -- Set ground rules for respectful communication -- Ensure confidentiality when appropriate -- Allow everyone to speak without interruption - -### 2. Listen Actively - -Active listening is crucial for understanding the root causes of conflict. - -- Focus entirely on what the other person is saying -- Ask clarifying questions -- Reflect back what you've heard -- Avoid formulating your response while they're speaking - -### 3. Identify Common Ground - -Even in the most heated conflicts, there's usually some shared interest or value. - -- Look for shared goals -- Acknowledge valid concerns on all sides -- Focus on what you agree on -- Build from areas of consensus - -### 4. Generate Solutions Together - -The best solutions come from collaborative problem-solving. - -- Brainstorm multiple options -- Consider creative alternatives -- Evaluate solutions based on shared criteria -- Be willing to compromise - -## Maintaining Trust Through Conflict - -Trust is often the first casualty of conflict, but it's also essential for resolution. - -### Be Transparent - -- Share relevant information openly -- Explain your reasoning and concerns -- Admit when you don't know something -- Be honest about your limitations - -### Follow Through - -- Keep your commitments -- Do what you say you'll do -- Check in regularly on progress -- Address setbacks promptly - -### Show Respect - -- Value different perspectives -- Acknowledge others' expertise -- Give credit where it's due -- Treat everyone with dignity - -## When Conflicts Persist - -Sometimes conflicts don't resolve easily, even with the best intentions. - -### Seek Mediation - -When direct resolution isn't working, consider bringing in a neutral third party who can: - -- Facilitate communication -- Help identify underlying issues -- Suggest alternative approaches -- Guide the process impartially - -### Know When to Step Back - -Not every conflict needs to be resolved immediately. Sometimes: - -- Taking a break can provide perspective -- Time can reveal new information -- External factors may change -- The conflict may resolve itself - -## Building Conflict-Resilient Communities - -The best approach to conflict is prevention through building strong community foundations. - -### Establish Clear Processes - -- Define how decisions are made -- Create channels for raising concerns -- Set up regular check-ins -- Document agreements and changes - -### Invest in Relationships - -- Build personal connections -- Learn about each other's backgrounds -- Celebrate successes together -- Support each other through challenges - -### Practice Regular Communication - -- Hold regular team meetings -- Create opportunities for informal interaction -- Share updates and information -- Encourage feedback and suggestions - -## Conclusion - -Conflict resolution is not about eliminating disagreements—it's about handling them in ways that strengthen rather than weaken your community. By approaching conflicts with patience, respect, and a genuine desire to find solutions that work for everyone, you can turn challenging situations into opportunities for growth and deeper connection. - -Remember: the goal isn't to win the argument, but to find a path forward that everyone can support. +Non-hierarchical decision-making isn't about having no structure—it's about choosing structures that reflect the group's values and support participation. It takes intention and care, but done well, it creates space for more voices, deeper buy-in, and decisions that reflect collective wisdom, not just individual authority. diff --git a/lib/assetUtils.js b/lib/assetUtils.js new file mode 100644 index 0000000..e729b1e --- /dev/null +++ b/lib/assetUtils.js @@ -0,0 +1,54 @@ +/** + * Asset path utilities for handling different environments + * - Web app: uses absolute paths starting with / + * - Storybook: uses relative paths for proper asset resolution + */ + +/** + * Get the correct asset path based on environment + * @param {string} assetPath - The asset path (e.g., "assets/Logo.svg") + * @returns {string} - The correct path for the current environment + */ +export function getAssetPath(assetPath) { + // Check if we're in Storybook environment + const isStorybook = + typeof window !== "undefined" && + (window.location?.pathname?.includes("iframe.html") || + window.navigator?.userAgent?.includes("Storybook")); + + // In Storybook, use relative paths + if (isStorybook) { + return assetPath; + } + + // In web app, use absolute paths + return assetPath.startsWith("/") ? assetPath : `/${assetPath}`; +} + +/** + * Asset paths for common components + */ +export const ASSETS = { + // Logo + LOGO: "assets/Logo.svg", + + // Avatars + AVATAR_1: "assets/Avatar_1.png", + AVATAR_2: "assets/Avatar_2.png", + AVATAR_3: "assets/Avatar_3.png", + + // Social media + BLUESKY_LOGO: "assets/Bluesky_Logo.svg", + GITLAB_ICON: "assets/GitLab_Icon.png", + + // Content thumbnails + VERTICAL_1: "assets/Content_Thumbnail/Vertical_1.svg", + VERTICAL_2: "assets/Content_Thumbnail/Vertical_2.svg", + VERTICAL_3: "assets/Content_Thumbnail/Vertical_3.svg", + HORIZONTAL_1: "assets/Content_Thumbnail/Horizontal_1.svg", + HORIZONTAL_2: "assets/Content_Thumbnail/Horizontal_2.svg", + HORIZONTAL_3: "assets/Content_Thumbnail/Horizontal_3.svg", + ICON_1: "assets/Content_Thumbnail/Icon_1.svg", + ICON_2: "assets/Content_Thumbnail/Icon_2.svg", + ICON_3: "assets/Content_Thumbnail/Icon_3.svg", +}; diff --git a/lib/cache.js b/lib/cache.js index fff6558..0446d5a 100644 --- a/lib/cache.js +++ b/lib/cache.js @@ -9,7 +9,9 @@ const tagCache = new Map(); const authorCache = new Map(); // Cache configuration -const CACHE_TTL = 5 * 60 * 1000; // 5 minutes in milliseconds +const isDevelopment = + process.env.NODE_ENV === "development" || !process.env.NODE_ENV; +const CACHE_TTL = isDevelopment ? 0 : 5 * 60 * 1000; // 0 in dev, 5 minutes in production const MAX_CACHE_SIZE = 100; // Maximum number of cached items /** @@ -22,6 +24,8 @@ class CacheEntry { } isExpired() { + // In development, always consider cache expired (no caching) + if (isDevelopment) return true; return Date.now() - this.timestamp > CACHE_TTL; } }