UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 65036a13 authored by graham.smith's avatar graham.smith
Browse files

Merge branch 'adce-images' into 'master' 

ADCE images

See merge request platform-one/private/bullhorn/platform1-site!36
parents b1c1853a 4b88c99d
No related branches found
Tags v0.2.17
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 134 additions and 26 deletions
src/assets/images/ADCE_white.svg 0 → 100644
+ 1
− 0
View file @ 65036a13
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 288 240"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M127.63,114.18,113.86,85.06h-47l3.7-8.16h39.41L84.63,23.72l-43,90.46H33L81.16,13.59c.9-2,2-3.09,3.81-3.09,1.57,0,2.69,1.12,3.69,3.09l48,100.59Z"/><path class="cls-1" d="M156.41,114.18V10.5H212.9c27.34,0,47.19,20.68,47.19,50.77s-19.85,52.91-47.19,52.91Zm56.49-9.56c21.93,0,37.89-18.39,37.89-42.92s-16-41.65-37.89-41.65H165.85v84.57Z"/><path class="cls-1" d="M82.05,230.26c-28.33,0-49-22.82-49-52.91,0-30.52,20.71-50.78,49-50.78H136.7v9.56H82.05c-22.72,0-39.26,17-39.26,41.64S59.33,220.7,82.05,220.7H136.7v9.56Z"/><path class="cls-1" d="M156.41,230.26V126.57H259.93v9.56h-92.3V220.7h92.46v9.56Zm27.07-48.35v-9h72v9Z"/></svg>
\ No newline at end of file
src/assets/images/CI_CD_infographic_PNG_8_web.png deleted 100644 → 0
+ 0
− 0
View file @ b1c1853a
src/assets/images/CI_CD_infographic_PNG_8_web.png

72.3 KiB

src/assets/images/CI_CD_infographic_final_web_update.png 0 → 100644
+ 0
− 0
View file @ 65036a13
src/assets/images/CI_CD_infographic_final_web_update.png

63.4 KiB

src/assets/images/P1 - Tool Chain.jpg 0 → 100644
+ 0
− 0
View file @ 65036a13
src/assets/images/P1 - Tool Chain.jpg

315 KiB

src/assets/images/P1 - Tool Chain_revised.png deleted 100644 → 0
+ 0
− 0
View file @ b1c1853a
src/assets/images/P1 - Tool Chain_revised.png

934 KiB

src/assets/images/icons/Icon_process.svg 0 → 100644
+ 16
− 0
View file @ 65036a13
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 378" style="enable-background:new 0 0 512 378;" xml:space="preserve">
<path d="M488,133h-88c-4.4,0-8,3.6-8,8v24h-53.6l-70-46.7c-2.7-1.8-6.2-1.8-8.9,0l-70,46.7h-51.3l5.5-22.1c1.1-4.3-1.5-8.6-5.8-9.7
c-0.6-0.2-1.3-0.2-1.9-0.2H88V69c0-4.4,3.6-8,8-8h104.8c3.8,18.6,20.2,32,39.2,32h48c22.1,0,40-17.9,40-40s-17.9-40-40-40h-48
c-19,0-35.4,13.4-39.2,32H96c-13.2,0-24,10.8-24,24v64H40c-3.7,0-6.9,2.5-7.8,6.1l-16,64c-1.1,4.3,1.5,8.6,5.8,9.7
c0.6,0.2,1.3,0.2,1.9,0.2h48v32c0,13.2,10.8,24,24,24h152c13.2,0,24-10.8,24-24v-19.7l66.4-44.3H392v24c0,4.4,3.6,8,8,8h40v71.6
c-12.5-4.3-26.2-3.4-38,2.5l-13.6,6.8c-2.7,1.4-4.4,4.1-4.4,7.2v16h-64.8c-3.8-18.6-20.2-32-39.2-32h-48c-22.1,0-40,17.9-40,40
s17.9,40,40,40h48c19,0,35.4-13.4,39.2-32H384v24c0,4.4,3.6,8,8,8h96c4.4,0,8-3.6,8-8v-64c0-4.4-3.6-8-8-8c-0.7,0-1.3,0.1-1.9,0.2
l-17.2,4.3c-4.2,1-8.5,1.3-12.8,0.6V213h32c4.4,0,8-3.6,8-8v-64C496,136.6,492.4,133,488,133z M240,29h48c13.3,0,24,10.7,24,24
s-10.7,24-24,24h-48c-13.3,0-24-10.7-24-24S226.7,29,240,29z M46.2,149h79.5l-12,48H34.2L46.2,149z M248,253H96c-4.4,0-8-3.6-8-8
v-32h32c3.7,0,6.9-2.5,7.8-6.1l6.5-25.9h55.3l66.4,44.3V245C256,249.4,252.4,253,248,253z M264,211.4L206.4,173l57.6-38.4l57.6,38.4
L264,211.4z M280,349h-48c-13.3,0-24-10.7-24-24s10.7-24,24-24h48c13.3,0,24,10.7,24,24S293.3,349,280,349z M472.7,305.1l7.3-1.8
V349h-80v-43.1l9.2-4.6c9.3-4.6,20.3-4.6,29.6,0C449.3,306.6,461.3,307.9,472.7,305.1z M480,197h-72v-48h72V197z"/>
</svg>
src/assets/images/icons/Icon_software-development-tools.svg 0 → 100644
+ 22
− 0
View file @ 65036a13
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 582.3 510" style="enable-background:new 0 0 582.3 510;" xml:space="preserve">
<path d="M546.2,16H36.8C21.3,16,8.5,26.8,8.5,40v352c0,13.2,12.7,24,28.3,24h194.8L209,480h-30.7v16h226.4v-16h-30.7l-22.6-64h194.8
c15.6,0,28.3-10.8,28.3-24V40C574.5,26.8,561.8,16,546.2,16z M354.2,480H228.8l22.6-64h80.2L354.2,480z M555.6,392
c0,4.4-4.2,8-9.4,8H36.8c-5.2,0-9.4-3.6-9.4-8v-24h528.2V392z M555.6,352H27.4V40c0-4.4,4.2-8,9.4-8h509.4c5.2,0,9.4,3.6,9.4,8V352z
"/>
<path d="M477.9,144.4H368.1c-2.2,0-4.4-0.8-5.9-2.4l-23.5-23.6c-4.7-4.7-11-7.3-17.7-7.3h-93c-13.7,0-25,11.2-25,25V311
c0,13.7,11.2,25,25,25h249.9c13.7,0,25-11.2,25-25V169.4C502.9,155.6,491.6,144.4,477.9,144.4z M486.2,311c0,4.6-3.7,8.3-8.3,8.3
H228c-4.6,0-8.3-3.7-8.3-8.3V136.1c0-4.6,3.7-8.3,8.3-8.3h93.1c2.2,0,4.4,0.8,5.9,2.4l23.5,23.5c4.7,4.7,11,7.3,17.7,7.3h109.6
c4.6,0,8.3,3.7,8.3,8.3V311z"/>
<polygon points="297,188.4 249.5,236 297,283.6 308.9,271.8 273.1,236 308.9,200.3 "/>
<rect x="314.2" y="231.9" transform="matrix(0.4856 -0.8742 0.8742 0.4856 -26.2776 435.734)" width="85.8" height="16.7"/>
<polygon points="397,200.3 432.8,236 397,271.8 408.8,283.6 456.3,236 408.8,188.4 "/>
<polygon points="218.4,61 230.4,89 256.9,100 285.2,88.6 299.9,103.4 310.3,92.8 288.8,71.3 257,84 241.7,77.6 228.2,46.2
188.7,46.2 175.2,77.6 159.9,84 128,71.3 100.1,99.2 112.8,131.1 106.4,146.4 75,159.9 75,199.3 106.4,212.9 112.8,228.1 100.1,260
128,287.9 159.9,275.2 175.9,281.9 181.7,268.2 160,259.2 131.6,270.6 117.5,256.4 128.9,228.1 117.8,201.6 89.9,189.6 89.9,169.6
117.8,157.7 128.9,131.2 117.5,102.8 131.6,88.6 160,100 186.5,89 198.4,61 "/>
<path d="M182.1,126.4l-6.6-13.2c-36.7,18.2-51.6,62.7-33.4,99.4c7.2,14.5,18.9,26.2,33.4,33.4l6.6-13.2
c-29.4-14.5-41.3-50.1-26.8-79.5C161.1,141.6,170.5,132.3,182.1,126.4z"/>
</svg>
src/views/ADCE.vue
+ 95
− 26
View file @ 65036a13
......@@ -25,12 +25,13 @@
</p>
</div>
<div
class="col-lg-5 offset-lg-2 d-flex flex-column justify-content-center"
class="col-lg-5 offset-lg-2 d-flex flex-column justify-content-center position-relative"
>
<img
class="img-fluid shadow"
src="@/assets/images/ADCE-bg-large.jpg"
/>
<ADCELogo id="adce-logo" />
</div>
</div>
<div class="my-5">
......@@ -43,27 +44,6 @@
</p>
</div>
<!-- <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"
:key="index"
@click="() => showImg(index)"
>
<img class="img-fluid my-auto" :src="src" alt="" />
<div class="align-self-end mx-auto mt-auto">(click to enlarge)</div>
</div>
<vue-easy-lightbox
escDisabled
moveDisabled
:visible="lightbox.visible"
:imgs="lightbox.imgs"
:index="lightbox.index"
@hide="handleHide"
></vue-easy-lightbox>
</div> -->
<div class="row">
<div
class="d-flex flex-column justify-content-around col-lg-6 text-lg-left text-center"
......@@ -131,16 +111,93 @@
{{ note.date }} - {{ note.text }}
</div>
</BottomWave>
<div class="container">
<div class="row mt-5 mb-xl-3 justify-content-center">
<h2 class="col-12">WHERE WE ARE GOING</h2>
<p class="col-xl-6 col-lg-8 text-center">
Our goal is to provide a CATO pipeline that allows you to seamlessly
integrate Continuous Integration / Continuous Delivery (CI/CD).
<br />
Deploy your code to the mission faster, more securely, more reliably.
</p>
</div>
<div class="architecture-container">
<div class="row mb-xl-5">
<div
class="col-xl-4 d-flex flex-column align-items-center justify-content-center order-xl-2 px-4"
>
<ProcessLogo class="logo" />
<h4 class="my-4 mx-0">ABMS-ADCE PIPELINE</h4>
<p class="text-center">
This is how we enable your teams to do DevSecOps.
</p>
</div>
<div class="col-xl-8 image-wrapper" @click="() => showImg(0)">
<img
class="img-fluid"
src="@/assets/images/CI_CD_infographic_final_web_update.png"
alt="ABMS-ADCE Pipeline"
/>
<div class="align-self-end mx-auto mt-auto font-italic">
click to enlarge
</div>
</div>
</div>
<div class="row my-5">
<div
class="col-xl-4 d-flex flex-column align-items-center justify-content-center px-4"
>
<SoftwareLogo class="logo" />
<h4 class="my-4 mx-0">ABMS-ADCE TOOL CHAIN</h4>
<p class="text-center">
These are the tools we have available to get the job done.
</p>
</div>
<div class="col-xl-8 image-wrapper" @click="() => showImg(1)">
<img
class="img-fluid"
src="@/assets/images/P1 - Tool Chain.jpg"
alt="ABMS-ADCE Tool Chain"
/>
<div class="align-self-end mx-auto mt-auto font-italic">
click to enlarge
</div>
</div>
</div>
<vue-easy-lightbox
escDisabled
moveDisabled
:visible="lightbox.visible"
:imgs="lightbox.imgs"
:index="lightbox.index"
@hide="handleHide"
></vue-easy-lightbox>
</div>
</div>
</div>
</template>
<script>
import PageHeader from "@/components/PageHeader";
import BottomWave from "@/components/BottomWave";
// import VueEasyLightbox from "vue-easy-lightbox";
import ProcessLogo from "@/assets/images/icons/Icon_process.svg";
import SoftwareLogo from "@/assets/images/icons/Icon_software-development-tools.svg";
import ADCELogo from "@/assets/images/ADCE_white.svg";
import VueEasyLightbox from "vue-easy-lightbox";
export default {
name: "ADCE",
components: { PageHeader, BottomWave /*VueEasyLightbox*/ },
components: {
PageHeader,
BottomWave,
VueEasyLightbox,
ProcessLogo,
SoftwareLogo,
ADCELogo
},
methods: {
showImg(index) {
this.lightbox.index = index;
......@@ -160,8 +217,8 @@ export default {
visible: false,
index: 0, // default: 0
imgs: [
require("@/assets/images/CI_CD_infographic_PNG_8_web.png"),
require("@/assets/images/P1 - Tool Chain_revised.png")
require("@/assets/images/CI_CD_infographic_final_web_update.png"),
require("@/assets/images/P1 - Tool Chain.jpg")
]
},
......@@ -220,6 +277,15 @@ export default {
}
.adce {
#adce-logo {
fill: white;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 50%;
}
.mm-logo {
width: 250px;
}
......@@ -276,6 +342,9 @@ export default {
.image-wrapper {
cursor: pointer;
}
.logo {
height: 40px;
}
}
// lightbox stuff
.vel-modal {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI