Merge branch 'main' into 2266-add-request-property

.github/workflows/pr-close-delete-env.yml

@@ -114,6 +114,21 @@ jobs:
             Write-Host '❌ Key Vault not found'
           }
 
+      - name: Delete all untagged images
+        run: |
+          az acr manifest list-metadata `
+          -r ${{ env.ACR_NAME }} `
+          -n ${{ env.IMAGE_NAME }} `
+          --query "[?tags==null].digest" `
+          -o tsv | `
+          %{ `
+            az acr repository delete `
+            -n ${{ env.ACR_NAME }} `
+            -t ${{ env.IMAGE_NAME }}@$_ `
+            --yes `
+          }
+          Write-Host "✅ All untagged images have been deleted"
+
       - name: ACR - Delete image
         run: |
           $imageTagWithPrefix = '${{ env.SLOT_PREFIX }}${{ matrix.SLOT_NAME}}'

components/blocks/downloadBlock.tsx

@@ -10,6 +10,7 @@ import { Container } from "../util/container";
 export type DownloadBlockProps = {
   title?: string;
   downloads: Downloads[] | [];
+  bottomBorder?: boolean;
 };
 
 export type Downloads = {
@@ -31,7 +32,7 @@ const bgOptions = {
 };
 
 export const DownloadBlock = (data: DownloadBlockProps) => {
-  const { title, downloads } = data;
+  const { title, downloads, bottomBorder } = data;
   return (
     <Container className="prose !px-0 py-4 prose-img:my-0">
       <h2 data-tina-field={tinaField(data, "title")}>{title}</h2>
@@ -41,6 +42,7 @@ export const DownloadBlock = (data: DownloadBlockProps) => {
           <Download key={index} {...download} />
         ))}
       </div>
+      {bottomBorder && <hr />}
     </Container>
   );
 };
@@ -194,5 +196,10 @@ export const downloadBlockSchema: Template = {
         },
       ],
     },
+    {
+      type: "boolean",
+      label: "Bottom border",
+      name: "bottomBorder",
+    },
   ],
 };

content/logo/index.mdx

@@ -106,7 +106,7 @@ _body:
             linkContent: >
               <UtilityButton buttonText="LOGO OPTIONS" size="small"
               btnIcon="BsArrowRightCircle" removeTopMargin={true}
-              link="https://www.ssw.com.au/ssw/logo/NETUG" />
+              link="/logo/netug" />
           - title: SSWTraining
             image: /images/company-logos/SSW Training_preview.png
             linkContent: >
@@ -130,7 +130,7 @@ _body:
             linkContent: >
               <UtilityButton buttonText="LOGO OPTIONS" size="small"
               btnIcon="BsArrowRightCircle" removeTopMargin={true}
-              link="https://www.ssw.com.au/ssw/logo/MAUIHackDay" />
+              link="/logo/maui-hackday" />
     _template: GridLayout
 footer: |
   ***

content/logo/maui-hackday.mdx

@@ -0,0 +1,19 @@
+---
+seo:
+  title: MAUI Hackday Logo
+  showBreadcrumb: true
+header: MAUI Hackday Logo
+subHeader: "If you have any queries please\_[contact SSW.](/company/contact-us)\n"
+_body:
+  - title: Download
+    downloads:
+      - header: Color
+        img: /images/company-logos/MAUIHackDay_preview.png
+        firstLink: /images/company-logos/downloads/images/MAUIHackday.png
+      - header: B&W
+        img: /images/company-logos/MAUIHackday_BW_preview.png
+        firstLink: /images/company-logos/downloads/images/MAUIHackday_BW.png
+    _template: DownloadBlock
+footer: ''
+---
+

content/logo/netug.mdx

@@ -0,0 +1,99 @@
+---
+seo:
+  title: .NET User Group Logo
+  showBreadcrumb: true
+header: .NET User Group Logo
+subHeader: "If you have any queries please\_[contact SSW.](/company/contact-us)\n"
+_body:
+  - title: Sydney .NET User Group
+    downloads:
+      - header: Color
+        img: /images/company-logos/Sydney-NETUG-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/Sydney-NETUG-logo.png
+      - header: Black
+        img: /images/company-logos/Sydney-NETUG-logo-black_preview.png
+        firstLink: /images/company-logos/downloads/images/Sydney-NETUG-logo-black.png
+      - header: White
+        img: /images/company-logos/Sydney-NETUG-logo-white_preview.png
+        imgBackground: black
+        firstLink: /images/company-logos/downloads/images/Sydney-NETUG-logo-white.png
+    bottomBorder: true
+    _template: DownloadBlock
+  - title: Canberra .NET User Group
+    downloads:
+      - header: Color
+        img: /images/company-logos/Canberra-NETUG-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/Canberra-NETUG-logo.png
+      - header: Black
+        img: /images/company-logos/Canberra-NETUG-logo-black_preview.png
+        firstLink: /images/company-logos/downloads/images/Canberra-NETUG-logo-black.png
+      - header: White
+        img: /images/company-logos/Canberra-NETUG-logo-white_preview.png
+        imgBackground: black
+        firstLink: /images/company-logos/downloads/images/Canberra-NETUG-logo-white.png
+    bottomBorder: true
+    _template: DownloadBlock
+  - title: Melbourne .NET User Group
+    downloads:
+      - header: Color
+        img: /images/company-logos/Melbourne-NETUG-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/Melbourne-NETUG-logo.png
+      - header: Black
+        img: /images/company-logos/Melbourne-NETUG-logo-black_preview.png
+        firstLink: /images/company-logos/downloads/images/Melbourne-NETUG-logo-black.png
+      - header: White
+        img: /images/company-logos/Melbourne-NETUG-logo-white_preview.png
+        imgBackground: black
+        firstLink: /images/company-logos/downloads/images/Melbourne-NETUG-logo-white.png
+    bottomBorder: true
+    _template: DownloadBlock
+  - title: Gold Coast Azure .NET User Group
+    downloads:
+      - header: Color
+        img: /images/company-logos/GoldCoast-Azure-NETUG-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/GoldCoast-Azure-NETUG-logo.png
+      - header: Black
+        img: /images/company-logos/GoldCoast-Azure-NETUG-logo-black_preview.png
+        firstLink: >-
+          /images/company-logos/downloads/images/GoldCoast-Azure-NETUG-logo-black.png
+      - header: White
+        img: /images/company-logos/GoldCoast-Azure-NETUG-logo-white_preview.png
+        imgBackground: black
+        firstLink: >-
+          /images/company-logos/downloads/images/GoldCoast-Azure-NETUG-logo-white.png
+    bottomBorder: true
+    _template: DownloadBlock
+  - title: Brisbane Full Stack User Group
+    downloads:
+      - header: Color
+        img: /images/company-logos/Brisbane-FullStack-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/Brisbane-FullStack-logo.png
+      - header: Black
+        img: /images/company-logos/Brisbane-FullStack-logo-black_preview.png
+        firstLink: >-
+          /images/company-logos/downloads/images/Brisbane-FullStack-logo-black.png
+      - header: White
+        img: /images/company-logos/Brisbane-FullStack-logo-white_preview.png
+        imgBackground: black
+        firstLink: >-
+          /images/company-logos/downloads/images/Brisbane-FullStack-logo-white.png
+    bottomBorder: true
+    _template: DownloadBlock
+  - title: Sydney .NET User Group LIVE
+    downloads:
+      - header: Color
+        img: /images/company-logos/Sydney-live-NETUG-logo_preview.png
+        firstLink: /images/company-logos/downloads/images/Sydney-live-NETUG-logo.png
+      - header: Black
+        img: /images/company-logos/Sydney-live-NETUG-logo-black_preview.png
+        firstLink: >-
+          /images/company-logos/downloads/images/Sydney-live-NETUG-logo-black.png
+      - header: White
+        img: /images/company-logos/Sydney-live-NETUG-logo-white_preview.png
+        imgBackground: black
+        firstLink: >-
+          /images/company-logos/downloads/images/Sydney-live-NETUG-logo-white.png
+    _template: DownloadBlock
+footer: ''
+---
+

content/pages/home.mdx

@@ -13,18 +13,14 @@ seo:
 breadcrumbs: false
 beforeBody:
   - items:
-      - label: User-Group-March
-        link: /netug/melbourne
+      - label: Boost Business with AI
+        link: /consulting/artificial-intelligence
         openIn: sameWindow
-        imgSrc: /images/carousel/ChatGPT-and-OpenAI-API-solutions-website.jpg
+        imgSrc: /images/carousel/Boost-Business-with-AI.jpg
       - label: Ready to migrate to .NET 8?
         link: 'https://www.ssw.com.au/consulting/net-8'
         openIn: sameWindow
         imgSrc: /images/carousel/DOTNET8-WilliamL.jpg
-      - label: Boost Business with AI
-        link: /consulting/artificial-intelligence
-        openIn: sameWindow
-        imgSrc: /images/carousel/Boost-Business-with-AI.jpg
       - label: Why should you choose to build your SSW web application?
         link: /company/about-us
         openIn: sameWindow
@@ -137,7 +133,7 @@ SSW Consulting has over 30 years of experience developing awesome Microsoft solu
 />
 
 <VerticalImageLayout
-  imageSrc="/images/verticalImageLayout/MAPA.jpg"
+  imageSrc="/images/verticalImageLayout/MAPA_Logo.jpg"
   altText="Microsoft Australia Partner Award"
   imageLink="https://www.firebootcamp.com"
   width={255}