merge: resolve docker-compose conflict — keep rswag.online, drop rproviders

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

docker-compose.standalone.yml

@@ -82,17 +82,6 @@ services:
       traefik.http.routers.rcart-sa.entrypoints: web
       traefik.http.services.rcart-sa.loadbalancer.server.port: "3000"
 
-  # ── rProviders ──
-  rproviders-standalone:
-    <<: *standalone-base
-    container_name: rproviders-standalone
-    command: ["bun", "run", "modules/providers/standalone.ts"]
-    labels:
-      <<: *traefik-enabled
-      traefik.http.routers.rproviders-sa.rule: Host(`providers.mycofi.earth`)
-      traefik.http.routers.rproviders-sa.entrypoints: web
-      traefik.http.services.rproviders-sa.loadbalancer.server.port: "3000"
-
   # ── rSwag ──
   rswag-standalone:
     <<: *standalone-base
@@ -105,7 +94,7 @@ services:
       SWAG_ARTIFACTS_DIR: /data/swag-artifacts
     labels:
       <<: *traefik-enabled
-      traefik.http.routers.rswag-sa.rule: Host(`swag.mycofi.earth`)
+      traefik.http.routers.rswag-sa.rule: Host(`rswag.online`)
       traefik.http.routers.rswag-sa.entrypoints: web
       traefik.http.services.rswag-sa.loadbalancer.server.port: "3000"
 

docker-compose.yml

@@ -132,14 +132,10 @@ services:
       - "traefik.http.routers.rspace-rsplat.entrypoints=web"
       - "traefik.http.routers.rspace-rsplat.priority=120"
       - "traefik.http.routers.rspace-rsplat.service=rspace-online"
-      - "traefik.http.routers.rspace-rswag.rule=Host(`swag.mycofi.earth`)"
+      - "traefik.http.routers.rspace-rswag.rule=Host(`rswag.online`)"
       - "traefik.http.routers.rspace-rswag.entrypoints=web"
       - "traefik.http.routers.rspace-rswag.priority=120"
       - "traefik.http.routers.rspace-rswag.service=rspace-online"
-      - "traefik.http.routers.rspace-rproviders.rule=Host(`providers.mycofi.earth`)"
-      - "traefik.http.routers.rspace-rproviders.entrypoints=web"
-      - "traefik.http.routers.rspace-rproviders.priority=120"
-      - "traefik.http.routers.rspace-rproviders.service=rspace-online"
       # Service configuration
       - "traefik.http.services.rspace-online.loadbalancer.server.port=3000"
       - "traefik.docker.network=traefik-public"

lib/folk-rapp.ts

@@ -33,7 +33,6 @@ const MODULE_META: Record<string, { badge: string; color: string; name: string;
 	rdata:       { badge: "rD",  color: "#d8b4fe", name: "rData",       icon: "📊" },
 	rnetwork:    { badge: "rNe", color: "#93c5fd", name: "rNetwork",    icon: "🌍" },
 	rsplat:      { badge: "r3",  color: "#d8b4fe", name: "rSplat",      icon: "🔮" },
-	rproviders:  { badge: "rPr", color: "#fdba74", name: "rProviders",  icon: "🏭" },
 	rswag:       { badge: "rSw", color: "#fda4af", name: "rSwag",       icon: "🎨" },
 	rchoices:    { badge: "rCo", color: "#f0abfc", name: "rChoices",    icon: "🤔" },
 	rcal:        { badge: "rC",  color: "#7dd3fc", name: "rCal",        icon: "📅" },

modules/swag/mod.ts

@@ -110,7 +110,7 @@ routes.post("/api/artifact", async (c) => {
 
 		// Build artifact envelope
 		const proto = c.req.header("x-forwarded-proto") || "https";
-		const host = c.req.header("host") || "swag.mycofi.earth";
+		const host = c.req.header("host") || "rswag.online";
 		const baseUrl = `${proto}://${host}`;
 		const renderTargetKey = `${product.id}-${result.format}`;
 
@@ -123,7 +123,7 @@ routes.post("/api/artifact", async (c) => {
 			id: artifactId,
 			schema_version: "1.0",
 			type: "print-ready",
-			origin: "swag.mycofi.earth",
+			origin: "rswag.online",
 			source_space: sourceSpace || null,
 			creator: {
 				id: creatorId || "anonymous",
@@ -168,7 +168,7 @@ routes.post("/api/artifact", async (c) => {
 			},
 			next_actions: [
 				{ tool: "rcart.online", action: "list-for-sale", label: "Sell in community shop", endpoint: "/api/catalog/ingest", method: "POST" },
-				{ tool: "swag.mycofi.earth", action: "edit-design", label: "Edit design", endpoint: "/editor", method: "GET" },
+				{ tool: "rswag.online", action: "edit-design", label: "Edit design", endpoint: "/editor", method: "GET" },
 				{ tool: "rfiles.online", action: "archive", label: "Save to files", endpoint: "/api/v1/files/import", method: "POST" },
 			],
 		};
@@ -246,5 +246,5 @@ export const swagModule: RSpaceModule = {
 	icon: "\u{1F3A8}",
 	description: "Design print-ready swag: stickers, posters, tees",
 	routes,
-	standaloneDomain: "swag.mycofi.earth",
+	standaloneDomain: "rswag.online",
 };

server/index.ts

@@ -44,7 +44,6 @@ import { canvasModule } from "../modules/canvas/mod";
 import { booksModule } from "../modules/books/mod";
 import { pubsModule } from "../modules/pubs/mod";
 import { cartModule } from "../modules/cart/mod";
-import { providersModule } from "../modules/providers/mod";
 import { swagModule } from "../modules/swag/mod";
 import { choicesModule } from "../modules/choices/mod";
 import { fundsModule } from "../modules/funds/mod";
@@ -74,7 +73,6 @@ registerModule(canvasModule);
 registerModule(booksModule);
 registerModule(pubsModule);
 registerModule(cartModule);
-registerModule(providersModule);
 registerModule(swagModule);
 registerModule(choicesModule);
 registerModule(fundsModule);

shared/components/rstack-app-switcher.ts

@@ -41,7 +41,6 @@ const MODULE_BADGES: Record<string, { badge: string; color: string }> = {
 	rwallet:     { badge: "rW",  color: "#fde047" }, // yellow-300
 	rcart:       { badge: "rCt", color: "#fdba74" }, // orange-300
 	rauctions:   { badge: "rA",  color: "#fca5a5" }, // red-300
-	rproviders:  { badge: "rPr", color: "#fdba74" }, // orange-300
 	rtube:       { badge: "rTu", color: "#f9a8d4" }, // pink-300
 	// Sharing
 	rphotos:     { badge: "rPh", color: "#f9a8d4" }, // pink-200
@@ -79,7 +78,6 @@ const MODULE_CATEGORIES: Record<string, string> = {
 	rwallet: "Funding & Commerce",
 	rcart: "Funding & Commerce",
 	rauctions: "Funding & Commerce",
-	rproviders: "Funding & Commerce",
 	rphotos: "Sharing",
 	rnetwork: "Sharing",
 	rsocials: "Sharing",

shared/components/rstack-tab-bar.ts

@@ -43,7 +43,6 @@ const MODULE_BADGES: Record<string, { badge: string; color: string }> = {
 	rwallet:     { badge: "rW",  color: "#fde047" },
 	rcart:       { badge: "rCt", color: "#fdba74" },
 	rauctions:   { badge: "rA",  color: "#fca5a5" },
-	rproviders:  { badge: "rPr", color: "#fdba74" },
 	rtube:       { badge: "rTu", color: "#f9a8d4" },
 	rphotos:     { badge: "rPh", color: "#f9a8d4" },
 	rnetwork:    { badge: "rNe", color: "#93c5fd" },

website/canvas.html

@@ -677,7 +677,6 @@
 					<button id="embed-data" title="Embed rData">📊 rData</button>
 					<button id="embed-network" title="Embed rNetwork">🌍 rNetwork</button>
 					<button id="embed-splat" title="Embed rSplat">🔮 rSplat</button>
-					<button id="embed-providers" title="Embed rProviders">🏭 rProviders</button>
 					<button id="embed-swag" title="Embed rSwag">🎨 rSwag</button>
 				</div>
 			</div>
@@ -1666,7 +1665,6 @@
 				{ btnId: "embed-data",      moduleId: "rdata" },
 				{ btnId: "embed-network",   moduleId: "rnetwork" },
 				{ btnId: "embed-splat",     moduleId: "rsplat" },
-				{ btnId: "embed-providers", moduleId: "rproviders" },
 				{ btnId: "embed-swag",      moduleId: "rswag" },
 			];