Merge branch projet-2023:main into main

antora-playbook.yml

@@ -6,14 +6,14 @@ asciidoc:
   attributes:
     author: Gerson Sunyé
     email: gerson.sunye@univ-nantes.fr
-    plantuml-server-url: http://www.plantuml.com/plantuml
-    plantuml-config: ../../diagram/plantuml/plantuml.config
+    #plantuml-server-url: http://www.plantuml.com/plantuml
+    plantuml-config: https://gitlab.univ-nantes.fr/naomod/defaults/-/blob/main/plantuml/puml-theme-sober.puml
     listing-caption: Listing@
     kroki-fetch-diagram: true
     kroki-server-url: http://kroki:8000
     sectnums: true
   extensions:
-    - asciidoctor-plantuml
+    - asciidoctor-kroki
 content:
   sources:
   - url: https://gitlab.univ-nantes.fr/naomod/sd/trivial-pursuit.git

local-playbook.yml

@@ -7,7 +7,7 @@ asciidoc:
     author: Gerson Sunyé
     email: gerson.sunye@univ-nantes.fr
     plantuml-server-url: http://www.plantuml.com/plantuml
-    plantuml-config: ../../diagram/plantuml/plantuml.config
+    plantuml-config: sober.config
     listing-caption: Listing@
     kroki-fetch-diagram: true
     kroki-server-url: http://kroki:8000

trivial-doc/antora.yml

@@ -17,6 +17,7 @@ asciidoc:
     url-asciidoc: https://docs.asciidoctor.org/asciidoc/latest
     kroki-fetch-diagram: true
     kroki-server-url: https://kroki.io
+    plantuml-config: https://gitlab.univ-nantes.fr/naomod/defaults/-/blob/main/plantuml/puml-theme-sober.puml
     icons: font
   extensions:
     - asciidoctor-kroki
@@ -24,4 +25,4 @@ asciidoc:
 
 nav:
 - modules/ROOT/nav.adoc
-- modules/developement/nav.adoc
+- modules/development/nav.adoc

trivial-doc/modules/ROOT/pages/index.adoc

@@ -17,11 +17,18 @@ Elles ont été écrites en https://asciidoc.org/[Asciidoc] et les diagrammes on
 
 Tous d'abord, vous devrez lire et analyser les documents suivants{nbsp}:
 
-. xref:developement:analyse-domaine.adoc[]
-. xref:developement:exigences.adoc[]
-. xref:developement:architecture.adoc[]
+. xref:development:analyse-domaine.adoc[]
+. xref:development:exigences.adoc[]
+. xref:development:architecture.adoc[]
 
 Ensuite, vous devrez lire et compléter les documents suivants{nbsp}:
 
-. xref:developement:composants.adoc[]
-. xref:developement:conception.adoc[]
\ No newline at end of file
+. xref:development:composants.adoc[]
+. xref:development:conception.adoc[]
+
+[WARNING]
+====
+Utilisez l'équipe Mattermost pour poser des questions sur le projet{nbsp}:
+
+- https://mattermost.univ-nantes.fr/design/
+====
\ No newline at end of file

trivial-doc/modules/developement/examples/cd-domain-model.plantuml → trivial-doc/modules/development/examples/cd-domain-model.plantuml

 @startuml
+!include https://gitlab.univ-nantes.fr/naomod/defaults/-/raw/main/plantuml/puml-theme-sober.puml
+
 class Carte
 class Question {
     intitulé : String [1]

trivial-doc/modules/developement/examples/dc-global.puml → trivial-doc/modules/development/examples/dc-global.puml

 @startuml
-
 package "My System" {
 interface "Interface A" as Web1
 interface "Interface B" as Cli1

trivial-doc/modules/developement/examples/deployment-diagram.puml → trivial-doc/modules/development/examples/deployment-diagram.puml

 @startuml
+!include https://gitlab.univ-nantes.fr/naomod/defaults/-/raw/main/plantuml/puml-theme-sober.puml
 
 node Navigateur {
     artifact WebClient as "Client Web"

trivial-doc/modules/development/examples/sober.config

+
+''
+'' Sober theme - mostly gray and blue
+''
+'' Author: Gerson Sunyé
+'' Copyright (c) 2023 by Gerson Sunyé
+
+skinparam {
+
+	' use the strictuml style - no circles, no footboxes, no drop shadows, and proper arrows
+	' Style strictuml
+
+
+	BackgroundColor transparent
+
+	TitleFontName Helvetica
+	TitleFontStyle Bold
+	TitleFontSize 12
+	sequenceParticipant underline
+	Guillemet true
+
+
+	Default {
+		TextAlignment center
+		FontName Helvetica
+	}
+
+	Sequence {
+		LifeLine {
+			BackgroundColor LightGrey
+			BorderColor DarkBlue
+		}
+
+		Arrow {
+			Color DarkBlue
+			Thickness 0.5
+		}
+
+		' FontColor #FF0000
+		' FontName Helvetica Neue
+		' FontStyle Light
+
+
+		Actor {
+			BorderThickness 0.5
+			FontSize 5
+			BackgroundColor #F2F2F2
+			BorderColor DarkBlue
+		}
+
+		Participant {
+			BorderThickness 0.5
+			BackgroundColor White
+			BorderColor DarkBlue
+			Font {
+				Style Light
+				Size 10
+				Name Helvetica Neue
+			}
+		}
+
+		Box {
+			BackgroundColor #F2F2F2
+			BorderColor Black
+			FontSize 10
+		}
+
+		Message {
+			Align center
+		}
+
+		Stereotype {
+			Font {
+				Size 8
+				Style Plain
+				Color #515151
+			}
+		}
+	}
+
+	Boundary {
+		BackgroundColor #F2F2F2
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Class {
+		FontSize 10
+		FontName Helvetica Neue
+		FontStyle Plain
+		BackgroundColor White
+		BorderColor Black
+		BorderThickness 0.2
+		FontColor Black
+
+		Attribute {
+			IconSize 0
+			FontSize 8
+			FontName Helvetica Neue
+			FontColor Black
+			FontStyle Light
+		}
+
+		Stereotype {
+			Font {
+				Size 8
+				Style plain
+				Color #515151
+			}
+		}
+	}
+
+	Object {
+		FontSize 10
+		FontName Helvetica Neue
+		FontStyle Underline
+		BorderColor DarkBlue
+		BorderThickness 0.2
+		FontColor DarkBlue
+		BackgroundColor White
+	}
+
+	Note {
+		FontSize 8
+		FontColor White
+		BorderThickness 0.1
+		BorderColor DarkBlue
+		BackgroundColor #99CCFF
+		Shadowing true
+	}
+
+	Component {
+		FontSize 10
+		FontName Helvetica Neue
+		FontStyle Bold
+		BackgroundColor White
+		BorderColor Black
+		BorderThickness 0.2
+		FontColor Black
+	}
+
+	Interface {
+		IconSize 8
+		BackgroundColor White
+		BorderColor Black
+		BorderThickness 0.2
+		Font {
+			Color Black
+			Name Helvetica Neue
+			Size 10
+			Style Plain
+		}
+	}
+
+	Stereotype {
+		IBackgroundColor White
+		IBorderColor DarkBlue
+	}
+
+	CircledCharacter {
+		FontSize 10
+		FontStyle Plain
+	}
+
+	Arrow  {
+		Font {
+			Size 8
+			Name Helvetica Neue
+			Style Light
+		}
+		Thickness 0.2
+	}
+
+	Activity {
+		ArrowThickness 0.2
+		BackgroundColor transparent
+		Border {
+			Color DarkBlue
+			Thickness 0.2
+		}
+
+		Diamond {
+			BackgroundColor #99CCFF
+			BorderColor DarkBlue
+			BorderThickness 0.2
+			FontColor White
+		}
+
+		BarColor DarkBlue
+	}
+
+	Usecase {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Entity {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Database {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Control {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Collections {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+
+	Queue {
+		BackgroundColor White
+		BorderColor DarkBlue
+		FontSize 10
+	}
+}
+    hide circle
+    hide footbox
+    show interface circle
\ No newline at end of file

trivial-doc/modules/developement/nav.adoc → trivial-doc/modules/development/nav.adoc

@@ -3,5 +3,4 @@
 * xref:exigences.adoc[]
 * xref:architecture.adoc[]
 * xref:composants.adoc[]
-* xref:conception.adoc[]
-* xref:termes.adoc[]
\ No newline at end of file
+* xref:conception.adoc[]
\ No newline at end of file