Merge branch 'main' into 2336-appinsights-metric-tracking

SSWConsulting · Mar 19, 2024 · 8cba68d · 8cba68d
2 parents d5c4f6e + 193d532
commit 8cba68d
Show file tree

Hide file tree

Showing 26 changed files with 1,384 additions and 324 deletions.
diff --git a/.tina/__generated__/_graphql.json b/.tina/__generated__/_graphql.json
diff --git a/.tina/__generated__/_schema.json b/.tina/__generated__/_schema.json
diff --git a/components/blocks-renderer.tsx b/components/blocks-renderer.tsx
@@ -8,6 +8,7 @@ import { ClientLogos } from "./blocks/clientLogos";
 import { Content } from "./blocks/content";
 import { ContentCard } from "./blocks/contentCard";
 import { CustomImage } from "./blocks/customImage";
+import { FixedColumns } from "./blocks/fixedColumns";
 import { JotFormEmbed } from "./blocks/jotFormEmbed";
 import { ServiceCards } from "./blocks/serviceCards";
 import { TableLayout } from "./blocks/tableLayout";
@@ -94,6 +95,7 @@ const componentMap = {
   ColorBlock,
   DownloadBlock,
   GridLayout,
+  FixedColumns,
 };
 
 export const Blocks = ({ prefix, blocks }) => {

diff --git a/components/blocks/customImage.tsx b/components/blocks/customImage.tsx
@@ -2,6 +2,7 @@ import classNames from "classnames";
 import Image from "next/image";
 import type { Template } from "tinacms";
 import { CustomLink } from "../customLink";
+import { customClasses } from "../util/constants";
 
 type textColor = "text-white" | "text-sswBlack";
 type alignment = "items-start" | "items-center" | "items-end";
@@ -13,7 +14,7 @@ export type CustomImageProps = {
   height?: number;
   width?: number;
   link?: string;
-  customClass?: string;
+  customClass?: string | keyof typeof customClasses;
   caption?: string;
   captionColor?: textColor;
   sizes?: string;
@@ -35,7 +36,10 @@ export const CustomImage = ({ data }: { data: CustomImageProps }) => {
             alt={data.altText}
             height={data.height || 400}
             width={data.width || 400}
-            className={classNames("inline-block", data.customClass ?? "")}
+            className={classNames(
+              "inline-block",
+              (customClasses[data.customClass] || data.customClass) ?? ""
+            )}
             sizes={data.sizes}
           />
           {data.caption && (
@@ -112,6 +116,7 @@ export const customImageBlockSchema: Template = {
       type: "string",
       label: "Custom Class (optional)",
       name: "customClass",
+      options: Object.keys(customClasses),
       required: false,
     },
     {

diff --git a/components/blocks/downloadBlock.tsx b/components/blocks/downloadBlock.tsx
@@ -26,6 +26,8 @@ const bgOptions = {
   black: "bg-sswBlack",
   grey: "bg-gray-100",
   white: "bg-white",
+  darkgrey: "bg-gray-650",
+  darkgreen: "bg-[#3a4b49]",
 };
 
 export const DownloadBlock = (data: DownloadBlockProps) => {

diff --git a/components/blocks/fixedColumns.tsx b/components/blocks/fixedColumns.tsx
@@ -7,34 +7,47 @@ import { componentRenderer } from "./mdxComponentRenderer";
 
 interface FixedColumnsProps {
   data: {
+    headerSection?: TinaMarkdownContent;
     firstColBody: TinaMarkdownContent;
     secondColBody: TinaMarkdownContent;
   };
 }
 
 export const FixedColumns = ({ data }: FixedColumnsProps) => {
   return (
-    <div className="grid md:grid-cols-2 md:gap-6">
-      <div>
-        <TinaMarkdown
-          content={data.firstColBody}
-          components={componentRenderer}
-        />
+    <>
+      {data.headerSection && (
+        <h3 className="py-4">
+          <TinaMarkdown content={data.headerSection} />
+        </h3>
+      )}
+      <div className="grid md:grid-cols-2 md:gap-6">
+        <div>
+          <TinaMarkdown
+            content={data.firstColBody}
+            components={componentRenderer}
+          />
+        </div>
+        <div>
+          <TinaMarkdown
+            content={data.secondColBody}
+            components={componentRenderer}
+          />
+        </div>
       </div>
-      <div>
-        <TinaMarkdown
-          content={data.secondColBody}
-          components={componentRenderer}
-        />
-      </div>
-    </div>
+    </>
   );
 };
 
 export const fixedColumnsSchema: Template = {
   name: "FixedColumns",
   label: "Fixed Column Layout (2 columns)",
   fields: [
+    {
+      type: "rich-text",
+      label: "Header Section (Optional)",
+      name: "headerSection",
+    },
     {
       type: "rich-text",
       label: "First column text",

diff --git a/components/util/constants.tsx b/components/util/constants.tsx
@@ -169,3 +169,9 @@ export const sswColors = {
   "#AAAAAA": "bg-ssw-gray-light",
   "#797979": "bg-ssw-gray",
 };
+
+export const customClasses = {
+  none: "",
+  "Only mobile top margin (mt-6)": "mt-6 md:mt-0",
+  "Top margin (mt-6)": "mt-6",
+};
diff --git a/content/consulting/chinafy-app.mdx b/content/consulting/chinafy-app.mdx
@@ -1,12 +1,27 @@
 ---
 type: consulting
 description: null
+seo:
+  title: Enterprise Development and Consulting for China Markets
+  description: >-
+    China is a booming market and now is the time to take advantage of this
+    growing user base.
+  images:
+    - url: /images/consulting/open-graph/chinafy.jpg
+      width: 1200
+      height: 629
+      alt: SSW Chinafy Consulting - Enterprise Software Development
 booking:
   title: >-
     Want to bring your applications<br>into the <span
     class="text-sswRed">Chinese market</span>?
   subTitle: A quick and easy solution for entry into a large and juicy market
   videoBackground: /images/videos/MVC_background.mp4
+solution:
+  project: Chinafy plan
+callToAction: 'Talk to us about your {{TITLE}} today'
+testimonialCategories:
+  - testimonialCategory: content/testimonialCategories/Chinafy.mdx
 benefits:
   benefitList:
     - image: /images/benefits/localization.png
@@ -60,35 +75,17 @@ technologies:
     - technologyCard: content/technologies/Alibaba-Cloud.mdx
     - technologyCard: content/technologies/wechat.mdx
     - technologyCard: content/technologies/ms-cdn.mdx
-solution:
-  project: Chinafy plan
-callToAction: 'Talk to us about your {{TITLE}} today'
-seo:
-  title: Enterprise Development and Consulting for China Markets
-  description: >-
-    China is a booming market and now is the time to take advantage of this
-    growing user base.
-  images:
-    - url: /images/consulting/open-graph/chinafy.jpg
-      width: 1200
-      height: 629
-      alt: SSW Chinafy Consulting - Enterprise Software Development
-testimonialCategories:
-  - testimonialCategory: content/testimonialCategories/Chinafy.mdx
 ---
 
 # The best way to **bring your business to China**
 
 <VideoEmbed url="https://youtu.be/K_fpd-YCGOc" caption="SSW China: Your Path to Global Software Excellence with Our Cross-Cultural Team" duration="4 mins" />
 
-The video is not working? [Watch it on BiliBili ](https://www.bilibili.com/video/BV1v8411R7yf/ "Watch it on BiliBili")
+Is the video not working? [Watch it on BiliBili ](https://www.bilibili.com/video/BV1v8411R7yf/ "Watch it on BiliBili")
+
+China is a booming market and now is the time to take advantage of this growing user base. If you have a successful application that you would like to bring to the Chinese market, then working with SSW can help streamline your entry into this market.
 
-China's booming
-market presents a prime opportunity to expand your business reach. SSW
-streamlines your market entry by addressing crucial aspects beyond just UI
-translation. From navigating blocked Content Delivery Networks (CDNs) to
-overcoming restrictions on popular Western social media platforms, we ensure a
-seamless experience during your Chinese market expansion.
+We do this by addressing crucial aspects beyond just UI translation. From navigating blocked Content Delivery Networks (CDNs) to overcoming restrictions on popular Western social media platforms, we ensure a seamless experience during your Chinese market expansion.
 
 Bring your web,
 desktop, and mobile applications to the Chinese market with SSW's expertise and

diff --git a/content/logo/firebootcamp.mdx b/content/logo/firebootcamp.mdx
@@ -0,0 +1,44 @@
+---
+seo:
+  title: FireBootCamp Logo
+  showBreadcrumb: true
+header: FireBootCamp Logo
+subHeader: "If you have any queries please\_[contact SSW.](/company/contact-us)\n"
+_body:
+  - title: Download
+    downloads:
+      - header: Dev SuperPowers Tour
+        img: /images/company-logos/FireBootCamp_DSP_preview.png
+        imgBackground: darkgrey
+        firstLink: /images/company-logos/downloads/images/FireBootCamp_DSP_BW.png
+      - header: Hands On Workshop
+        img: /images/company-logos/FireBootCamp_HW_preview.png
+        imgBackground: darkgreen
+        firstLink: /images/company-logos/downloads/images/FireBootCamp_HW_BW.png
+    _template: DownloadBlock
+  - headerSection: FireBootCamp Banners
+    firstColBody: >
+      <CustomImage src="/images/SuperPower-Banner-Master-Angular.jpg"
+      altText="Angular Superpowers " height={400} width={700}
+      alignment="items-end" />
+
+
+      <CustomImage
+      src="/images/company-logos/SuperPower-Banner-Master-Azure.jpg" width={700}
+      alignment="items-end" height={400} altText="Azure Superpowers "
+      customClass="Top margin (mt-6)" />
+    secondColBody: >
+      <CustomImage
+      src="/images/company-logos/SuperPower-Banner-Master-NetCore.jpg"
+      altText="Dotnet SuperPowers" alignment="items-start" height={400}
+      width={700} customClass="Only mobile top margin (mt-6)" />
+
+
+      <CustomImage
+      src="/images/company-logos/SuperPower-Banner-Master-Ionic.jpg"
+      altText="Icon Lunch " alignment="items-start" height={400} width={700}
+      customClass="Top margin (mt-6)" />
+    _template: FixedColumns
+footer: ''
+---
+
diff --git a/content/logo/index.mdx b/content/logo/index.mdx
@@ -112,19 +112,19 @@ _body:
             linkContent: >
               <UtilityButton buttonText="LOGO OPTIONS" size="small"
               btnIcon="BsArrowRightCircle" removeTopMargin={true}
-              link="https://www.ssw.com.au/ssw/logo/FireBootCamp" />
+              link="/logo/firebootcamp" />
           - title: Angular Hackday
             image: /images/company-logos/AngularHackDay_preview.png
             linkContent: >
               <UtilityButton buttonText="LOGO OPTIONS" size="small"
               btnIcon="BsArrowRightCircle" removeTopMargin={true}
-              link="https://www.ssw.com.au/ssw/logo/AngularHackDay" />
+              link="/logo/angular-hackday" />
           - title: AI Hackday
             image: /images/company-logos/AIHackDay_preview.png
             linkContent: >
               <UtilityButton buttonText="LOGO OPTIONS" size="small"
               btnIcon="BsArrowRightCircle" removeTopMargin={true}
-              link="https://www.ssw.com.au/ssw/logo/AIHackDay" />
+              link="/logo/ai-hackday" />
           - title: MAUI Hackday
             image: /images/company-logos/MAUIHackDay_preview.png
             linkContent: >

diff --git a/content/newsletters/_2023.json b/content/newsletters/_2023.json
@@ -1,11 +1,6 @@
 {
   "newsletters_year": "2023",
   "newsletters": [
-    {
-      "month": 11,
-      "file": "/images/newsletter-uploads/2023/_2023_11__Effective Feedback When and How to Offer It__.html",
-      "description": "Effective Feedback and How to Offer It"
-    },
     {
       "month": 1,
       "file": "/images/newsletter-uploads/2023/_2023_01__Adams 2022 - A Year in Review__.html",
@@ -50,6 +45,21 @@
       "month": 9,
       "file": "/images/newsletter-uploads/2023/_2023_09__Combine AI Models and Custom Software with Microsoft’s Semantic Kernel__.html",
       "description": "Combine AI Models & Custom Software with Microsoft’s Semantic Kernel"
+    },
+    {
+      "month": 10,
+      "file": "/images/newsletter-uploads/2023/_2023_10__Unleashing GPT-Powered Website ChatBots__.html",
+      "description": "Unleashing GPT-Powered Website Chatbots"
+    },
+    {
+      "month": 11,
+      "file": "/images/newsletter-uploads/2023/_2023_11__Effective Feedback When and How to Offer It__.html",
+      "description": "Effective Feedback and How to Offer It"
+    },
+    {
+      "month": 12,
+      "file": "/images/newsletter-uploads/2023/_2023_12__.NET Aspire – The Future of Microservices made simple for .NET 8__.html",
+      "description": ".NET Aspire – The Future of Microservices made simple for .NET 8"
     }
   ]
 }
diff --git a/content/newsletters/_2024.json b/content/newsletters/_2024.json
@@ -0,0 +1,20 @@
+{
+  "newsletters_year": "2024",
+  "newsletters": [
+    {
+      "month": 1,
+      "file": "/images/newsletter-uploads/2024/_2024_01__Adams 2023 - Year in Review__.html",
+      "description": "Adam’s 2023 Year in Review"
+    },
+    {
+      "month": 2,
+      "file": "/images/newsletter-uploads/2024/_2024_02__NDC Sydney 2024 - so many Microsoft Heavyweights__.html",
+      "description": "NDC Sydney 2024 – so many Microsoft Heavyweights!"
+    },
+    {
+      "month": 3,
+      "file": "/images/newsletter-uploads/2024/_2024_03__.NET Migrations Made Easy__.html",
+      "description": ".NET 8 Migrations Made Easy"
+    }
+  ]
+}
diff --git a/content/pages/home.mdx b/content/pages/home.mdx
@@ -106,9 +106,9 @@ afterBody:
       <ClientLogos />
 
 
-      Our software developers & consultants have delivered the best in the
-      business to more than 1,000 clients in 15 countries. [More about
-      SSW](https://www.ssw.com.au/company/about-us).
+      SSW's Consulting Services have delivered best-in-class Microsoft solutions
+      for thousands of clients in 15 countries over more than 30 years. [More
+      about SSW](https://www.ssw.com.au/company/about-us).
     size: base
     align: center
     backgroundColor: default

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@tanstack/react-query-devtools": "^5.26.3",
     "animate-css-grid": "^1.5.1",
     "aos": "^2.3.4",
-    "applicationinsights": "^2.9.1",
+    "applicationinsights": "^2.9.5",
     "axios": "^1.6.8",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.10",