Merge branch 'main' into adding-rapiscan-to-ui-ux-design

SSWConsulting · Mar 18, 2024 · e8aab14 · e8aab14
2 parents 2fb6782 + 182fd01
commit e8aab14
Show file tree

Hide file tree

Showing 127 changed files with 2,025 additions and 150 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/.tina/collections/logos.tsx b/.tina/collections/logos.tsx
@@ -1,6 +1,6 @@
 import type { Collection } from "tinacms";
-import { seoSchema } from "../../components/util/seo";
 import * as Schemas from "../../components/blocks";
+import { seoSchema } from "../../components/util/seo";
 
 export const logosSchema: Collection = {
   label: "Logos",
@@ -23,6 +23,11 @@ export const logosSchema: Collection = {
       label: "Header",
       name: "header",
     },
+    {
+      type: "rich-text",
+      label: "Sub Header",
+      name: "subHeader",
+    },
     {
       type: "object",
       list: true,

diff --git a/components/blocks/downloadBlock.tsx b/components/blocks/downloadBlock.tsx
@@ -1,5 +1,6 @@
 import classNames from "classnames";
 import Image from "next/image";
+import { useState } from "react";
 import { FaFileDownload } from "react-icons/fa";
 import type { Template } from "tinacms";
 import { tinaField } from "tinacms/dist/react";
@@ -15,8 +16,10 @@ export type Downloads = {
   header: string;
   img: string;
   imgBackground: keyof typeof bgOptions;
-  pngLink: string;
-  pdfLink: string;
+  firstLink: string;
+  firstLinkText?: string;
+  secondLink: string;
+  secondLinkText?: string;
 };
 
 const bgOptions = {
@@ -41,41 +44,57 @@ export const DownloadBlock = (data: DownloadBlockProps) => {
 };
 
 const Download = (data: Downloads) => {
-  const { header, img, imgBackground, pngLink, pdfLink } = data;
+  const [isImgBroken, setIsImgBroken] = useState(false);
+  const {
+    header,
+    img,
+    imgBackground,
+    firstLinkText,
+    firstLink,
+    secondLink,
+    secondLinkText,
+  } = data;
   return (
     <div className="col-span-1">
       <div className={classNames("py-3 text-black md:px-6")}>
         <h3 data-tina-field={tinaField(data, "header")}> {header}</h3>
-        {img && (
-          <div
-            className={classNames(
-              `${bgOptions[imgBackground] || "bg-white"}`,
-              "flex justify-center"
-            )}
-            data-tina-field={tinaField(data, "img")}
-          >
-            <Image src={img} alt={header} height={400} width={210} />
-          </div>
-        )}
+        <div
+          className={classNames(
+            `${bgOptions[imgBackground] || "bg-white"}`,
+            "flex h-32 justify-center"
+          )}
+          data-tina-field={tinaField(data, "img")}
+        >
+          {img && !isImgBroken && (
+            <Image
+              onError={() => setIsImgBroken(true)}
+              src={img}
+              alt={header}
+              height={400}
+              width={210}
+              style={{ objectFit: "none" }}
+            />
+          )}
+        </div>
         <div className={"bg-gray-300 p-2 font-bold"}>Download</div>
         <div
           className={classNames(
             "grid grid-cols-2 gap-x-0.25 border-t-2 border-white text-black"
           )}
         >
-          {pngLink && (
+          {firstLink && (
             <DownloadButton
-              link={pngLink}
-              text="PNG"
-              field="pngLink"
+              link={firstLink}
+              text={firstLinkText || "PNG"}
+              field="firstLink"
               schema={data}
             />
           )}
-          {pdfLink && (
+          {secondLink && (
             <DownloadButton
-              link={pdfLink}
-              text="PDF"
-              field="pdfLink"
+              link={secondLink}
+              text={secondLinkText || "PDF"}
+              field="secondLink"
               schema={data}
             />
           )}
@@ -143,17 +162,31 @@ export const downloadBlockSchema: Template = {
           name: "imgBackground",
           options: Object.keys(bgOptions),
         },
+        {
+          type: "string",
+          label: "First Link Text",
+          name: "firstLinkText",
+          description: "Defaults to PNG",
+        },
         {
           type: "image",
-          label: "PNG Link",
-          name: "pngLink",
+          label: "First Link",
+          name: "firstLink",
+          // @ts-expect-error - tina-cms types are incorrect
+          uploadDir: () => "company-logos/downloads/",
+        },
+        {
+          type: "string",
+          label: "Second Link Text",
+          name: "secondLinkText",
+          description: "Defaults to PDF",
           // @ts-expect-error - tina-cms types are incorrect
           uploadDir: () => "company-logos/downloads/",
         },
         {
           type: "image",
-          label: "PDF Link",
-          name: "pdfLink",
+          label: "Second Link",
+          name: "secondLink",
           // @ts-expect-error - tina-cms types are incorrect
           uploadDir: () => "company-logos/downloads/",
         },

diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx
@@ -1,9 +1,11 @@
 import dayjs from "dayjs";
 import dynamic from "next/dynamic";
 import Image from "next/image";
+import { BuiltOnAzure } from "../blocks";
 import { CustomLink } from "../customLink";
 import { SocialIcons } from "../socialIcons/socialIcons";
 import { Container } from "../util/container";
+import { Section } from "../util/section";
 
 export const Footer = () => {
   return (
@@ -102,3 +104,10 @@ const SiteInfo = () => (
     </CustomLink>
   </div>
 );
+export const PreFooter = () => {
+  return (
+    <Section className="w-full flex-none">
+      <BuiltOnAzure data={{ backgroundColor: "lightgray" }} />
+    </Section>
+  );
+};
diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx
@@ -2,7 +2,7 @@ import classNames from "classnames";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import { useLiveStreamProps } from "../../hooks/useLiveStreamProps";
-import { Footer } from "./footer";
+import { Footer, PreFooter } from "./footer";
 import { Theme } from "./theme";
 
 import dayjs from "dayjs";
@@ -57,9 +57,15 @@ interface LayoutProps {
     menuGroups: NavMenuGroup[];
   };
   children: React.ReactNode;
+  showAzureBanner?: boolean;
 }
 
-export const Layout = ({ children, menu, className = "" }: LayoutProps) => {
+export const Layout = ({
+  children,
+  menu,
+  className = "",
+  showAzureBanner,
+}: LayoutProps) => {
   const liveStreamProps = useLiveStreamProps();
   const router = useRouter();
 
@@ -147,7 +153,9 @@ export const Layout = ({ children, menu, className = "" }: LayoutProps) => {
               />
             </div>
           </header>
-          <main className="grow bg-white">{children}</main>
+          <main className={classNames("grow bg-white")}>{children}</main>
+
+          {showAzureBanner && <PreFooter />}
           <Footer />
         </div>
       </Theme>

diff --git a/content/company/case-study/event-cinemas.mdx b/content/company/case-study/event-cinemas.mdx
@@ -9,36 +9,55 @@ content: >
 
   Event Cinemas is Australia's leading Cinema company.
 
-  They were looking to revamp their website with a new look and feel with the added ability to drive the site via a new CMS.
-  [Six different CMS options](https://www.ssw.com.au/ssw/consulting/ContentManagement.aspx) were assessed and [Telerik's Sitefinity](https://www.ssw.com.au/consulting/sitefinity) was chosen.
+  They were looking to revamp their website with a new look and feel with the
+  added ability to drive the site via a new CMS. [Six different CMS
+  options](https://www.ssw.com.au/ssw/consulting/ContentManagement.aspx) were
+  assessed and [Telerik's
+  Sitefinity](https://www.ssw.com.au/consulting/sitefinity) was chosen.
 
-  ![Homepage with fullscreen image of movie](/images/case-studies/event-cinemas-1.jpg)**Figure: Homepage with fullscreen image of movie**
+
+  <CustomImage src="/images/event-cinemas-1-Cropped(1).jpg" altText="Event
+  Cinema Home page " alignment="items-start" width={800} height={400}
+  customClass="my-0" caption="Figure: Homepage with fullscreen image of movie"
+  />
 
 
   ## We make complicated things simple
 
 
-  Using the Scrum methodology, we made sure that the most important parts of the system were built and tested 1st, ensuring transparency and value creation all the way through the development lifecycle.
-  The site and all components were to be reusable, so site templates, page layouts, content types and custom contols were used extensively.
-  This allows Event Cinemas employees with sufficient permissions to manage and maintain the website without requiring any assistance from developers.
+  Using the Scrum methodology, we made sure that the most important parts of the
+  system were built and tested 1st, ensuring transparency and value creation all
+  the way through the development lifecycle. The site and all components were to
+  be reusable, so site templates, page layouts, content types and custom contols
+  were used extensively. This allows Event Cinemas employees with sufficient
+  permissions to manage and maintain the website without requiring any
+  assistance from developers.
 
 
   ## Integration
 
 
-  We have live integration with the backend ticketing systems located at the 50+ cinemas Australia wide.
-  This means that users can jump online and order a movie ticket with seating reservations in real time.
+  We have live integration with the backend ticketing systems located at the 50+
+  cinemas Australia wide. This means that users can jump online and order a
+  movie ticket with seating reservations in real time.
+
+
+  <CustomImage src="/images/event-cinemas-2.jpg" width={800} altText="Event
+  Cinemas find times and location" alignment="items-start" height={399}
+  customClass="my-0" caption="Figure: Customize your cinema preferences" />
 
-  ![Customize your cinema preferences](/images/case-studies/event-cinemas-2.png)**Figure: Customize your cinema preferences**
 
-  ![Can preview the available seats](/images/case-studies/event-cinemas-3.png)**Figure: Can preview the available seats**
+  <CustomImage src="/images/event-cinemas-3.jpg" altText="Event Cinemas preview
+  available seating " alignment="items-start" width={800} height={400}
+  customClass="my-0" caption="Figure: Can preview the available seats" />
 
 
   ## Results
 
 
-  The [www.eventcinemas.com.au](https://www.eventcinemas.com.au) website has been released and is live to the public.
-  Both the client and the development team were very satisfied with the result.
+  The [www.eventcinemas.com.au](https://www.eventcinemas.com.au) website has
+  been released and is live to the public. Both the client and the development
+  team were very satisfied with the result.
 
 
   ## Related links

diff --git a/content/consulting/security.mdx b/content/consulting/security.mdx
@@ -16,7 +16,8 @@ booking:
     Want to <span class="text-sswRed">avoid embarrassing or expensive</span>
     data breaches?
   subTitle: >-
-    Secure your applications, cloud, or network infrastructure by implementing the best identity solution
+    Secure your applications, cloud, or network infrastructure by implementing
+    the best identity solution
   videoBackground: /images/videos/MVC_background.mp4
 solution:
   project: security
@@ -25,7 +26,7 @@ benefits:
   benefitList:
     - image: /images/benefits/security.png
       title: IDENTITY SOLUTIONS
-      description: "\U0001F511 IdentityServer\n\n\U0001F511 Auth0\n\n\U0001F511 Azure AD B2C\n"
+      description: "\U0001F511 IdentityServer, Auth0, and Microsoft Entra ID provide top-tier authentication and authorization services. They offer OAuth 2.0, OpenID Connect, SSO, and customizable user experiences.\n"
     - image: /images/benefits/clear-graphics.png
       title: CODE AUDITS
       description: >
@@ -58,7 +59,7 @@ technologies:
 
 # You can't afford to think of **security** as an add-on
 
-<VideoEmbed url="https://www.youtube.com/watch?v=uk_YFezVAuw" caption="Rules to Better Security with Adam Cogan - The 10 tips CEOs must know" duration="6 mins" />
+<VideoEmbed url="https://www.youtube.com/watch?v=uk_YFezVAuw" caption="Rules to Better Security with Adam Cogan - The 10 tips CEOs must know" duration="6 min" />
 
 Data breaches are set to cost the global economy $6TN - cybercrime is big business, and you need to be prepared for it.
 
@@ -67,3 +68,7 @@ SSW's security consultants can help you with all aspects of your security postur
 We specialise in identity solutions and can help you find the best fit for your solution, from a security perspective and from a technology and integration perspective, as well as helping you provide the best experience for your users.
 
 We are Duende IdentityServer official support partners for APAC region (e.g. Australia, New Zealand, Singapore, Malaysia, etc).
+
+<VideoEmbed url="https://www.youtube.com/watch?v=C16xwIvxGfw" caption="Beyond Passwords | Matt Goldman | User Group" duration="40 sec" />
+
+We all know passwords are not fit for purpose, and we're slowly making our way to a "post-password" world. Passwords are a problem for security, convenience, and accessibility, and the future of authentication won't involve passwords at all. [Watch the long video (1h 21min)](https://www.youtube.com/watch?v=K1t73xArqs0).
diff --git a/content/logo/dory.mdx b/content/logo/dory.mdx
@@ -0,0 +1,33 @@
+---
+seo:
+  title: SSW Dory Logo
+  showBreadcrumb: true
+header: SSW Dory Logo
+subHeader: "If you have any queries please\_[contact SSW.](/company/contact-us)\n"
+_body:
+  - title: Download
+    downloads:
+      - header: Color Vertical
+        img: /images/company-logos/SSWDory-preview.png
+        firstLink: /images/company-logos/downloads/images/SSWDory.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/SSW-Dory.svg
+      - header: B&W Vertical
+        img: /images/company-logos/SSWDory-preview_BW.png
+        firstLink: /images/company-logos/downloads/images/SSWDory_BW.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/SSWDory_BW.svg
+      - header: Color Horizontal
+        img: /images/company-logos/SSWDory-horizontal_preview.png
+        firstLink: /images/company-logos/downloads/images/SSWDory-horizontal.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/SSWDory-horizontal.svg
+      - header: B&W Horizontal
+        img: /images/company-logos/SSWDory-horizontal_preview_BW.png
+        firstLink: /images/company-logos/downloads/images/SSWDory-horizontal_BW.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/SSW-Dory-horizontal_BW.svg
+    _template: DownloadBlock
+footer: ''
+---
+
diff --git a/content/logo/eagleeye.mdx b/content/logo/eagleeye.mdx
@@ -0,0 +1,33 @@
+---
+seo:
+  title: EagleEye Logo
+  showBreadcrumb: true
+header: EagleEye Logo
+subHeader: "If you have any queries please\_[contact SSW.](/company/contact-us)\n"
+_body:
+  - title: Download
+    downloads:
+      - header: Color Vertical
+        img: /images/company-logos/EagleEye_preview.png
+        firstLink: /images/company-logos/downloads/images/EagleEye.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/EagleEye-Icon.svg
+      - header: B&W Vertical
+        img: /images/company-logos/EagleEye-BW-preview.png
+        firstLink: /images/company-logos/downloads/images/EagleEye-BW.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/EagleEye-Vertical-Black.svg
+      - header: Color Horizontal
+        img: /images/company-logos/EagleEye-horizontal-preview.png
+        firstLink: /images/company-logos/downloads/images/EagleEye-horizontal.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/EagleEye-Horizontal-Color.svg
+      - header: B&W Horizontal
+        img: /images/company-logos/EagleEye-horizontal-BW-preview.png
+        firstLink: /images/company-logos/downloads/images/EagleEye-horizontal-BW.png
+        secondLinkText: SVG
+        secondLink: /images/company-logos/downloads/svgs/EagleEye-Horizontal-Black.svg
+    _template: DownloadBlock
+footer: ''
+---
+