diff --git a/src/assets/images/tool-logos/Atlassian-icon-blue-onecolor@2x.png b/src/assets/images/tool-logos/Atlassian-icon-blue-onecolor@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f61cd18195c4187f3d3b665cbff661b2cdebd810
Binary files /dev/null and b/src/assets/images/tool-logos/Atlassian-icon-blue-onecolor@2x.png differ
diff --git a/src/assets/images/tool-logos/F_logo_modern_2018_02-blue.png b/src/assets/images/tool-logos/F_logo_modern_2018_02-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c4793d27456193cf85614c3e7ffbb91ba768ec8
Binary files /dev/null and b/src/assets/images/tool-logos/F_logo_modern_2018_02-blue.png differ
diff --git a/src/assets/images/tool-logos/anchore-mark.png b/src/assets/images/tool-logos/anchore-mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..460fa29ab16ce447bca8180f2fa1d433718e695b
Binary files /dev/null and b/src/assets/images/tool-logos/anchore-mark.png differ
diff --git a/src/assets/images/tool-logos/cypress.png b/src/assets/images/tool-logos/cypress.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a08c0e7f8a738ca29595c34f3af83696e852516
Binary files /dev/null and b/src/assets/images/tool-logos/cypress.png differ
diff --git a/src/assets/images/tool-logos/gitlab-icon-rgb.png b/src/assets/images/tool-logos/gitlab-icon-rgb.png
new file mode 100644
index 0000000000000000000000000000000000000000..35cb5e9dab01596bc9363aac8b2a4110e3599eef
Binary files /dev/null and b/src/assets/images/tool-logos/gitlab-icon-rgb.png differ
diff --git a/src/assets/images/tool-logos/icon_twistlock@2x.png b/src/assets/images/tool-logos/icon_twistlock@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd5df81418ec273a7fd4160e9297b9d9f7cfe89
Binary files /dev/null and b/src/assets/images/tool-logos/icon_twistlock@2x.png differ
diff --git a/src/assets/images/tool-logos/mattermost-logomark-blue.png b/src/assets/images/tool-logos/mattermost-logomark-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..a424539618e5b28bbe50939ed3e9a788efb0254b
Binary files /dev/null and b/src/assets/images/tool-logos/mattermost-logomark-blue.png differ
diff --git a/src/assets/images/tool-logos/sonarqube.jpg b/src/assets/images/tool-logos/sonarqube.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..495686d4681ed764ba92ed0d2e6001f8b16cb6af
Binary files /dev/null and b/src/assets/images/tool-logos/sonarqube.jpg differ
diff --git a/src/views/ADCE.vue b/src/views/ADCE.vue
index 4eb76c99ffe875c6d7341d3b5f32452d835a3352..dfa2b587e499acf34475a6f966166541f4ad3d46 100644
--- a/src/views/ADCE.vue
+++ b/src/views/ADCE.vue
@@ -43,7 +43,7 @@
</p>
</div>
- <div class="row architecture-container">
+ <!-- <div class="row architecture-container">
<div
class="col-xl-6 my-4 mx-auto image-wrapper d-flex flex-column"
v-for="(src, index) in lightbox.imgs"
@@ -62,7 +62,7 @@
:index="lightbox.index"
@hide="handleHide"
></vue-easy-lightbox>
- </div>
+ </div> -->
<div class="row">
<div
@@ -92,14 +92,20 @@
<div class="milestones-wrapper text-left">
<div
v-for="milestone in milestones"
- :key="milestone.date"
+ :key="milestone.text"
class="milestone pl-4 mb-5 position-relative"
>
<div class="bullet" :class="{ done: milestone.done }"></div>
- <div class="date font-weight-bold text-uppercase mb-2">
- {{ milestone.date }}
+ <div class="text d-flex align-items-center">
+ <div class="img-container mr-2 d-flex justify-content-center">
+ <img
+ v-if="milestone.logo"
+ :src="getImageUrl(milestone.logo)"
+ class="tool-logo"
+ />
+ </div>
+ {{ milestone.text }}
</div>
- <div class="text">{{ milestone.text }}</div>
<div v-if="milestone.details">
<div
v-for="detail in milestone.details"
@@ -129,11 +135,11 @@
<script>
import PageHeader from "@/components/PageHeader";
import BottomWave from "@/components/BottomWave";
-import VueEasyLightbox from "vue-easy-lightbox";
+// import VueEasyLightbox from "vue-easy-lightbox";
export default {
name: "ADCE",
- components: { PageHeader, BottomWave, VueEasyLightbox },
+ components: { PageHeader, BottomWave /*VueEasyLightbox*/ },
methods: {
showImg(index) {
this.lightbox.index = index;
@@ -141,6 +147,9 @@ export default {
},
handleHide() {
this.lightbox.visible = false;
+ },
+ getImageUrl(filename) {
+ return require(`@/assets/images/tool-logos/${filename}`);
}
},
data: function() {
@@ -162,25 +171,35 @@ export default {
}
],
milestones: [
- { done: true, text: "Mattermost" },
- { done: false, text: "Gitlab deployed" },
- { done: false, text: "Atlassian Jira deployed" },
+ {
+ done: true,
+ text: "Mattermost",
+ logo: "mattermost-logomark-blue.png"
+ },
+ {
+ done: false,
+ text: "Gitlab",
+ logo: "gitlab-icon-rgb.png"
+ },
{
done: false,
- text: "Alpha ChatBot deployed",
- details: ["Self Service registration"]
+ text: "Atlassian (Jira & Confluence)",
+ logo: "Atlassian-icon-blue-onecolor@2x.png"
},
{
done: false,
- text: "Minimal Integration Environment available"
+ text: "SonarQube",
+ logo: "sonarqube.jpg"
},
- { done: false, text: "Atlassian Confluence deployed" },
{
done: false,
- text: "Technologies supported",
- details: ["React", "Node.js", "Python", "Golang", "+6 more"]
+ text: "Fortify",
+ logo: "F_logo_modern_2018_02-blue.png"
},
- { done: false, text: "All Domain Common Environment ready!" }
+ { done: false, text: "Anchore", logo: "anchore-mark.png" },
+ { done: false, text: "Twistlock", logo: "icon_twistlock@2x.png" },
+ { done: false, text: "Cypress", logo: "cypress.png" },
+ { done: false, text: "Mission App Production Clusters" }
]
};
}
@@ -222,6 +241,15 @@ export default {
}
}
+ .img-container {
+ width: 24px;
+
+ .tool-logo {
+ max-width: 24px;
+ max-height: 24px;
+ }
+ }
+
.text {
font-weight: 600;
}