git : Merge branch 'main' into feat/connect-front-to-backend

docker-compose.yml

@@ -19,15 +19,10 @@ services:
     restart: unless-stopped
     ports:
       - "3000:3000"
+    env_file:
+      - ./nest-backend/.env
     environment:
       DATABASE_URL: postgresql://nest_user:nest_password@db:5432/nest_db
-      JWT_SECRET: ${JWT_SECRET:-change_me_in_production}
-      PORT: 3000
-      ADMIN_USERNAME: ${ADMIN_USERNAME:-admin}
-      ADMIN_EMAIL: ${ADMIN_EMAIL:-admin@crowmate.fr}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD:-change_me}
-      FRONT_ORIGIN: ${FRONT_ORIGIN:-http://localhost:5173}
-      INTRA_ORIGIN: ${INTRA_ORIGIN:-http://localhost:5174}
     depends_on:
       db:
         condition: service_healthy
@@ -38,7 +33,9 @@ services:
     build: ./nest-front
     restart: unless-stopped
     ports:
-      - "80:80"
+      - "5173:5173"
+    environment:
+      API_URL: http://api:3000
     depends_on:
       - api
 

nest-front/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine AS build
+FROM node:25-alpine AS build
 
 WORKDIR /app
 

nest-intra/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine AS build
+FROM node:25-alpine AS build
 
 WORKDIR /app
 

nest-intra/nginx.conf

@@ -3,14 +3,15 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
-    # Use Docker's embedded DNS resolver; defer resolution to request time
+    # Docker DNS; resolve API service name at request time.
-    resolver 127.0.0.11 valid=30s;
+    resolver 127.0.0.11 ipv6=off valid=10s;
+    set $api_upstream http://api:3000;
 
     location /api/ {
-        set $api_upstream http://api:3000;
+        proxy_pass $api_upstream/api/;
-        proxy_pass $api_upstream;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
     location / {

nest-intra/src/pages/intranet/IntranetBugs.tsx

@@ -26,6 +26,7 @@ export default function IntranetBugs() {
   const [severityFilter, setSeverityFilter] = useState<BugSeverity | 'all'>('all');
   const [assignedFilter, setAssignedFilter] = useState<string | 'all'>('all');
   const [noteText, setNoteText] = useState('');
+  const [isEnabled, setIsEnabled] = useState(true);
 
   const openCount = bugs.filter((b) => b.status === 'open').length;
   const criticalCount = bugs.filter((b) => b.severity === 'critical').length;
@@ -72,14 +73,61 @@ export default function IntranetBugs() {
     setNoteText('');
   }, [noteText, user]);
 
+  if (!isEnabled) {
+    return (
+      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', minHeight: '400px', textAlign: 'center' }}>
+        <div style={{ fontFamily: 'var(--font-mono)', color: 'var(--color-text-muted)', fontSize: '0.7rem', letterSpacing: '0.15em', marginBottom: '1rem' }}>
+          INTRANET / BUG REPORTS
+        </div>
+        <h1 style={{ fontFamily: 'var(--font-heading)', color: 'var(--color-red)', fontSize: '2rem', marginBottom: '0.5rem' }}>FUNCTIONALITY DISABLED</h1>
+        <p style={{ color: 'var(--color-text-muted)', marginBottom: '1.5rem' }}>Bug Reports feature is currently disabled</p>
+        <button
+          onClick={() => setIsEnabled(true)}
+          style={{
+            background: 'var(--color-green)',
+            color: 'var(--color-bg)',
+            border: 'none',
+            padding: '0.6rem 1.2rem',
+            fontFamily: 'var(--font-mono)',
+            fontSize: '0.85rem',
+            cursor: 'pointer',
+            textTransform: 'uppercase',
+            letterSpacing: '0.08em',
+          }}
+        >
+          Re-enable
+        </button>
+      </div>
+    );
+  }
+
   return (
     <div style={{ display: 'grid', gridTemplateColumns: selected ? '1fr 400px' : '1fr', gap: '1.5rem', alignItems: 'start' }}>
       {/* Left panel */}
       <div>
         <div style={{ marginBottom: '1.5rem' }}>
-          <div style={{ fontFamily: 'var(--font-mono)', color: 'var(--color-text-muted)', fontSize: '0.7rem', letterSpacing: '0.15em', marginBottom: '0.5rem' }}>
+          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '0.5rem' }}>
+            <div style={{ fontFamily: 'var(--font-mono)', color: 'var(--color-text-muted)', fontSize: '0.7rem', letterSpacing: '0.15em' }}>
               INTRANET / BUG REPORTS
             </div>
+            <button
+              onClick={() => setIsEnabled(false)}
+              style={{
+                background: 'transparent',
+                border: '1px solid var(--color-red)',
+                color: 'var(--color-red)',
+                padding: '0.3rem 0.7rem',
+                fontFamily: 'var(--font-mono)',
+                fontSize: '0.65rem',
+                cursor: 'pointer',
+                textTransform: 'uppercase',
+                letterSpacing: '0.08em',
+              }}
+              title="Disable this feature"
+            >
+              [DISABLE]
+            </button>
+          </div>
           <h1 style={{ fontFamily: 'var(--font-heading)', color: 'var(--color-text)', fontSize: '1.8rem', marginBottom: '1rem' }}>BUG DASHBOARD</h1>
 
           {/* Stats */}

nest-intra/src/pages/intranet/IntranetDashboard.tsx

@@ -125,6 +125,8 @@ export default function IntranetDashboard() {
           <NavTile to="/intranet/feed" label="Team Feed" description="Internal staff activity feed. Post updates visible only to the team." icon="[~]" />
           <NavTile to="/intranet/users" label="User Management" description="View all registered users. Promote or ban accounts." icon="[U]" />
           <NavTile to="/intranet/moderation" label="Forum Moderation" description="Pin, lock, and delete threads and replies from the public forum." icon="[M]" />
+          <NavTile to="/intranet/events" label="Event Calendar" description="Manage upcoming events, deadlines, and team meetings." icon="[E]" />
+          <NavTile to="/intranet/services" label="Service Status" description="Redirection to all the services." icon="[S]" />
         </div>
       </div>
 

nest-intra/src/pages/intranet/IntranetModeration.tsx

@@ -8,6 +8,7 @@ export default function IntranetModeration() {
   const [selectedThreadId, setSelectedThreadId] = useState<string | null>(null);
   const [search, setSearch] = useState('');
   const [activeTab, setActiveTab] = useState<'threads' | 'replies'>('threads');
+  const [isEnabled, setIsEnabled] = useState(true);
 
   const filteredThreads = useMemo(() => {
     if (!search.trim()) return threads;
@@ -43,8 +44,36 @@ export default function IntranetModeration() {
   }, [replies]);
 
   return (
+    <div>
+      {!isEnabled ? (
+        <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', minHeight: '400px', textAlign: 'center' }}>
+          <div style={{ fontFamily: 'var(--font-mono)', color: 'var(--color-text-muted)', fontSize: '0.7rem', letterSpacing: '0.15em', marginBottom: '1rem' }}>
+            INTRANET / MODERATION
+          </div>
+          <h1 style={{ fontFamily: 'var(--font-heading)', color: 'var(--color-red)', fontSize: '2rem', marginBottom: '0.5rem' }}>FUNCTIONALITY DISABLED</h1>
+          <p style={{ color: 'var(--color-text-muted)', marginBottom: '1.5rem' }}>Forum Moderation feature is currently disabled</p>
+          <button
+            onClick={() => setIsEnabled(true)}
+            style={{
+              background: 'var(--color-green)',
+              color: 'var(--color-bg)',
+              border: 'none',
+              padding: '0.6rem 1.2rem',
+              fontFamily: 'var(--font-mono)',
+              fontSize: '0.85rem',
+              cursor: 'pointer',
+              textTransform: 'uppercase',
+              letterSpacing: '0.08em',
+            }}
+          >
+            Re-enable
+          </button>
+        </div>
+      ) : (
         <div>
       <div style={{ marginBottom: '1.75rem' }}>
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+          <div>
             <div style={{ fontFamily: 'var(--font-mono)', color: 'var(--color-text-muted)', fontSize: '0.7rem', letterSpacing: '0.15em', marginBottom: '0.5rem' }}>
               INTRANET / MODERATION
             </div>
@@ -53,6 +82,26 @@ export default function IntranetModeration() {
               {threads.length} threads &mdash; {replies.length} replies
             </p>
           </div>
+          <button
+            onClick={() => setIsEnabled(false)}
+            style={{
+              background: 'transparent',
+              border: '1px solid var(--color-red)',
+              color: 'var(--color-red)',
+              padding: '0.3rem 0.7rem',
+              fontFamily: 'var(--font-mono)',
+              fontSize: '0.65rem',
+              cursor: 'pointer',
+              textTransform: 'uppercase',
+              letterSpacing: '0.08em',
+              height: 'fit-content',
+            }}
+            title="Disable this feature"
+          >
+            [DISABLE]
+          </button>
+        </div>
+      </div>
 
       {/* Tabs */}
       <div style={{ display: 'flex', borderBottom: '1px solid var(--color-border)', marginBottom: '1.5rem', gap: 0 }}>
@@ -226,5 +275,7 @@ export default function IntranetModeration() {
         </div>
       )}
     </div>
+      )}
+    </div>
   );
 }