Fix font color for internal queues

smbecker · Jan 21, 2022 · e7c4218 · e7c4218
1 parent 7cf6956
commit e7c4218
Show file tree

Hide file tree

Showing 17 changed files with 255 additions and 260 deletions.
diff --git a/build/make-release.sh b/build/make-release.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
+USER=$(git config --get remote.origin.url | grep -Po "(?<=git@github\.com:)(.*?)(?=/.+.git)")
+BRANCH=$(git branch --show-current)
 function convert_to_importurl {
     input_fname=$1
     output_fname="$(pwd)/output/${1//\.\.\/src\//}"
 
     echo $input_fname
-    cat $input_fname | sed 's/!include \.*/!includeurl https:\/\/raw.githubusercontent.com\/skleanthous\/C4-PlantumlSkin\/master\/build\/output/' > "$output_fname"
+    cat $input_fname | sed "s/!include \.*/!includeurl https:\/\/raw.githubusercontent.com\/$USER\/C4-PlantumlSkin\/$BRANCH\/build\/output/" > "$output_fname"
 }
 
 for file in $(find ../src -type f); do

diff --git a/build/output/c4.puml b/build/output/c4.puml
@@ -1,13 +1,13 @@
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/general.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/legend.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/notes.puml
-
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/actors.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/components.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/containers.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/dbs.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/expanded.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/misc.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/queues.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/systems.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/items/sequence.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/general.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/legend.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/notes.puml
+
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/actors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/components.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/containers.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/dbs.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/expanded.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/misc.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/queues.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/systems.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/items/sequence.puml
diff --git a/build/output/general/general.puml b/build/output/general/general.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' General params

diff --git a/build/output/general/legend.puml b/build/output/general/legend.puml
@@ -1,6 +1,6 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/general.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/general.puml
 !endif
 
 ' Legend

diff --git a/build/output/general/notes.puml b/build/output/general/notes.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Notes

diff --git a/build/output/items/actors.puml b/build/output/items/actors.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Actors

diff --git a/build/output/items/components.puml b/build/output/items/components.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Components

diff --git a/build/output/items/containers.puml b/build/output/items/containers.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Containers

diff --git a/build/output/items/dbs.puml b/build/output/items/dbs.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Db's

diff --git a/build/output/items/expanded.puml b/build/output/items/expanded.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Expanded

diff --git a/build/output/items/misc.puml b/build/output/items/misc.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Miscellaneous

diff --git a/build/output/items/queues.puml b/build/output/items/queues.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Queues

diff --git a/build/output/items/sequence.puml b/build/output/items/sequence.puml
@@ -1,105 +1,107 @@
-!ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
-!endif
-
-!ifdef SKIN_SEQUENCE_DIAGRAM
-' Shared
-' ##################################
-
-skinparam backgroundColor EXPENDED_SYSTEM_BACKGROUND_COLOR
-
-skinparam sequence {
-    ArrowColor SEQUENCE_ITEMS_BORDER_COLOR
-    LifeLineBorderColor SEQUENCE_ITEMS_BORDER_COLOR
-	LifeLineBackgroundColor SYSTEM_BG_COLOR
-
-    ActorBorderColor SEQUENCE_ITEMS_BORDER_COLOR
-    ActorBackgroundColor SYSTEM_BG_COLOR
-    ActorFontColor Black
-}
-
-skinparam boundary {
-      FontColor Black
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-skinparam control {
-      FontColor Black
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-skinparam entity {
-      FontColor Black
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-skinparam collections {
-      FontColor SYSTEM_FONT_COLOR
-      StereotypeFontColor SYSTEM_FONT_COLOR
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-skinparam participant {
-      FontColor SYSTEM_FONT_COLOR
-      StereotypeFontColor SYSTEM_FONT_COLOR
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-skinparam database {
-      FontColor Black
-      BackgroundColor SYSTEM_BG_COLOR
-      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
-}
-
-  ' PlantUML Sequence diagram skinning
-    ' Internal
-    skinparam boundary<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    skinparam control<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    skinparam entity<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    skinparam collections<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    skinparam participant<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    skinparam database<<Internal>> {
-      BackgroundColor SYSTEM_BG_COLOR
-    }
-
-    ' External
-    skinparam boundary<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-    skinparam control<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-    skinparam entity<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-    skinparam collections<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-    skinparam participant<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-    skinparam database<<External>> {
-      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
-    }
-
-!endif
+!ifndef COLORS_IMPORTED
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
+!endif
+
+!ifdef SKIN_SEQUENCE_DIAGRAM
+' Shared
+' ##################################
+
+skinparam backgroundColor EXPENDED_SYSTEM_BACKGROUND_COLOR
+
+skinparam sequence {
+    ArrowColor SEQUENCE_ITEMS_BORDER_COLOR
+    LifeLineBorderColor SEQUENCE_ITEMS_BORDER_COLOR
+	LifeLineBackgroundColor SYSTEM_BG_COLOR
+
+    ActorBorderColor SEQUENCE_ITEMS_BORDER_COLOR
+    ActorBackgroundColor SYSTEM_BG_COLOR
+    ActorFontColor Black
+}
+
+skinparam boundary {
+      FontColor Black
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam control {
+      FontColor Black
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam entity {
+      FontColor Black
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam collections {
+      FontColor SYSTEM_FONT_COLOR
+      StereotypeFontColor SYSTEM_FONT_COLOR
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam participant {
+      FontColor SYSTEM_FONT_COLOR
+      StereotypeFontColor SYSTEM_FONT_COLOR
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam database {
+      FontColor Black
+      BackgroundColor SYSTEM_BG_COLOR
+      BorderColor SEQUENCE_ITEMS_BORDER_COLOR
+}
+skinparam queue {
+    FontColor SYSTEM_FONT_COLOR
+}
+  ' PlantUML Sequence diagram skinning
+    ' Internal
+    skinparam boundary<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    skinparam control<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    skinparam entity<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    skinparam collections<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    skinparam participant<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    skinparam database<<Internal>> {
+      BackgroundColor SYSTEM_BG_COLOR
+    }
+
+    ' External
+    skinparam boundary<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+    skinparam control<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+    skinparam entity<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+    skinparam collections<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+    skinparam participant<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+    skinparam database<<External>> {
+      BackgroundColor EXTERNAL_SYSTEM_BG_COLOR
+    }
+
+!endif
diff --git a/build/output/items/systems.puml b/build/output/items/systems.puml
@@ -1,5 +1,5 @@
 !ifndef COLORS_IMPORTED
-!includeurl https://raw.githubusercontent.com/skleanthous/C4-PlantumlSkin/master/build/output/general/colors.puml
+!includeurl https://raw.githubusercontent.com/smbecker/C4-PlantumlSkin/sb-queue-font/build/output/general/colors.puml
 !endif
 
 ' Systems

diff --git a/build/output_fname b/build/output_fname
diff --git a/src/c4.puml b/src/c4.puml
@@ -1,13 +1,13 @@
-!include general/general.puml
-!include general/legend.puml
-!include general/notes.puml
-
-!include items/actors.puml
-!include items/components.puml
-!include items/containers.puml
-!include items/dbs.puml
-!include items/expanded.puml
-!include items/misc.puml
-!include items/queues.puml
-!include items/systems.puml
-!include items/sequence.puml
+!include ./general/general.puml
+!include ./general/legend.puml
+!include ./general/notes.puml
+
+!include ./items/actors.puml
+!include ./items/components.puml
+!include ./items/containers.puml
+!include ./items/dbs.puml
+!include ./items/expanded.puml
+!include ./items/misc.puml
+!include ./items/queues.puml
+!include ./items/systems.puml
+!include ./items/sequence.puml