From a3b7a51f475023d88a1330229e57fc48ee622af4 Mon Sep 17 00:00:00 2001
From: Denis Davydkov <denis@davydkov.com>
Date: Sun, 29 Oct 2023 01:44:57 +0200
Subject: [PATCH] update example

---
 _spec.c4        |  2 +-
 cloud/legacy.c4 |  4 +++-
 cloud/next.c4   | 13 ++++++-------
 externals.c4    | 22 +++++++++++++++++-----
 model.c4        | 22 +++++++++++++++-------
 views.c4        | 14 ++++++++++----
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/_spec.c4 b/_spec.c4
index 95df949..7b615e8 100644
--- a/_spec.c4
+++ b/_spec.c4
@@ -6,7 +6,7 @@ specification {
     }
   }
 
-  element system
+  element softwareSys
 
   element externalSystem {
     style {
diff --git a/cloud/legacy.c4 b/cloud/legacy.c4
index 9d5a89b..c196c79 100644
--- a/cloud/legacy.c4
+++ b/cloud/legacy.c4
@@ -22,13 +22,15 @@ views {
     include
       *,
       cloud,
+      amazon,
+      cloud.legacy -> amazon.*,
       -> customer ->
 
     style * {
       color secondary
     }  
 
-    style cloud {
+    style cloud, amazon {
       color muted
     }
 
diff --git a/cloud/next.c4 b/cloud/next.c4
index 781beff..d2a3143 100644
--- a/cloud/next.c4
+++ b/cloud/next.c4
@@ -69,17 +69,16 @@ views {
 
 
   view cloud_next of cloud.next {
-    include *
-    include cloud
-    exclude
-      amazon.* -> cloud,
-      cloud.ui.supportPanel -> amazon,
-      cloud.next.backend -> amazon.*
+    include
+      *,
+      cloud,
+      amazon,
+      cloud.next.* -> amazon.*,      
 
     style * {
       color secondary
     }
-    style cloud {
+    style cloud, amazon {
       color muted
     }
     style cloud.next, cloud.next.* {
diff --git a/externals.c4 b/externals.c4
index f3526a3..c6527a7 100644
--- a/externals.c4
+++ b/externals.c4
@@ -58,7 +58,7 @@ model {
 views {
 
   view amazon of amazon {
-    title "Overview Amazon"
+    title "Amazon"
 
     include
       *,
@@ -77,15 +77,27 @@ views {
   }
 
   view amazon_sqs of sqs {
-    title: 'Overview Amazon SQS'
+    title 'Amazon: SQS'
 
     include
       *,
-      amazon
+      amazon,
+      cloud,
+      cloud.next.* -> sqs.*
+
+    style * {
+      color secondary
+    }
+    style amazon, cloud {
+      color muted
+    }
+    style sqs, sqs.* {
+      color green
+    }        
   }
 
   view amazon_lambdas of lambdas {
-    title: 'Overview Amazon Lambdas'
+    title 'Amazon: Lambdas'
     
     include
       *,
@@ -105,7 +117,7 @@ views {
   }
 
   view amazon_rds of amazon.rds {
-    title 'Overview Amazon RDS'
+    title 'Amazon: RDS'
 
     include
       *,
diff --git a/model.c4 b/model.c4
index 03c7bda..170f795 100644
--- a/model.c4
+++ b/model.c4
@@ -6,7 +6,7 @@ model {
     '
   }
 
-  cloud = system 'Cloud System' {
+  cloud = softwareSys 'Cloud System' {
     description '
       Our SaaS platfrom that allows
       customers to interact with
@@ -29,7 +29,7 @@ model {
       description 'Cloud Next is the next version of our cloud systems'
     }
 
-    supportUser = actor 'Support User' {
+    supportUser = actor 'Suppot User' {
       description '
         A emploere from the support team
         Has limited access to the system
@@ -55,12 +55,20 @@ views {
   view customer of customer {
     include
       *,
+      cloud,
+      cloud.ui,
       customer -> cloud.ui.*,
-      supportUser
-
-    style supportUser {
-      color indigo
-    }  
+      supportUser,
+      
+    style * {
+      color secondary
+    }
+    style cloud, cloud.ui {
+      color muted
+    }
+    style customer {
+      color green
+    }      
   }  
 
 }
\ No newline at end of file
diff --git a/views.c4 b/views.c4
index 89ac20b..f4f27bc 100644
--- a/views.c4
+++ b/views.c4
@@ -1,19 +1,25 @@
 views {
 
   view cloud of cloud {
-    title "The Cloud System"
+    title "Context: Cloud System"
 
-    include *
+    include
+      *,
+      amazon,
+      -> amazon.*,
 
     style * {
       color secondary
     }
-    style cloud {
+    style cloud, amazon {
       color muted
     }
     style cloud.* {
       color green
-    }      
+    }   
+    style supportUser {
+      color secondary
+    }   
   }
 
 }