Skip to content

Commit

Permalink
🐛 Fix dev images (#929)
Browse files Browse the repository at this point in the history
* Fix carousel images on dev

* Fix other home page images

* Fix product images images

* ignore uploaddir

* Ignore uploadDir

* Regen tina
  • Loading branch information
bradystroud authored Jul 4, 2023
1 parent 5c577f5 commit 4494a43
Show file tree
Hide file tree
Showing 19 changed files with 64 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .tina/__generated__/_schema.json

Large diffs are not rendered by default.

88 changes: 45 additions & 43 deletions .tina/collections/products.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,49 @@ import type { Collection } from "tinacms";
import { seoSchema } from "../../components/util/seo";

export const productsIndexSchema: Collection = {
label: "Products - Index",
name: "productsIndex",
path: "content/products/index",
format: "json",
fields: [
// @ts-ignore
seoSchema,
{
type: "object",
label: "Products List",
name: "productsList",
list: true,
ui: {
itemProps: (item) => {
return { label: item?.name };
},
},
fields: [
{
type: "string",
label: "Name",
name: "name",
isTitle: true,
required: true,
},
{
type: "string",
label: "URL",
name: "url",
},
{
type: "string",
label: "Description",
name: "description",
},
{
type: "image",
label: "Logo",
name: "logo",
}
],
},
],
label: "Products - Index",
name: "productsIndex",
path: "content/products/index",
format: "json",
fields: [
// @ts-ignore
seoSchema,
{
type: "object",
label: "Products List",
name: "productsList",
list: true,
ui: {
itemProps: (item) => {
return { label: item?.name };
},
},
fields: [
{
type: "string",
label: "Name",
name: "name",
isTitle: true,
required: true,
},
{
type: "string",
label: "URL",
name: "url",
},
{
type: "string",
label: "Description",
name: "description",
},
{
type: "image",
label: "Logo",
name: "logo",
// @ts-ignore
uploadDir: () => "/products",
},
],
},
],
};
1 change: 1 addition & 0 deletions components/blocks/breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const Breadcrumbs: FC<BreadcrumbsProps> = (props) => {
{ from: "products", to: "Products" },
{ from: "offices", to: "Offices" },
{ from: "training", to: "Training" },
{ from: "employment", to: "Employment" },
{ from: props.path, to: `${props.title}` },
]}
activeItemClassName={listItemStyling}
Expand Down
3 changes: 3 additions & 0 deletions components/blocks/carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ export const carouselBlockSchema: Template = {
type: "image",
label: "Image",
name: carouselBlock.items.imgSrc,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
uploadDir: () => "/carousel",
},
],
},
Expand Down
3 changes: 3 additions & 0 deletions components/blocks/serviceCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ export const serviceCardsBlockSchema: Template = {
type: "image",
label: "Image",
name: serviceCards.bigCards.imgSrc,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
uploadDir: () => "/service-cards/",
},
],
},
Expand Down
6 changes: 4 additions & 2 deletions components/blocks/verticalImageLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import type { Template } from "tinacms";
import Image from "next/image";
import type { Template } from "tinacms";
import { TinaMarkdown } from "tinacms/dist/rich-text";

export const VerticalImageLayout = ({ data }) => {
Expand Down Expand Up @@ -39,6 +38,9 @@ export const verticalImageLayoutBlockSchema: Template = {
type: "image",
label: "Image",
name: "imageSrc",
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
uploadDir: () => "/verticalImageLayout/",
},
{
type: "string",
Expand Down
10 changes: 5 additions & 5 deletions content/pages/home.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ beforeBody:
- label: Why should you choose to build your SSW web application?
link: 'https://www.ssw.com.au/ssw/Company/AboutUs.aspx'
openIn: sameWindow
imgSrc: /images/Hero_SSW.jpg
imgSrc: /images/carousel/Hero_SSW.jpg
- label: Case Study - Improving Radiologists' Ability to Detect Breast Cancer
link: 'https://www.ssw.com.au/SSW/Consulting/Case-Study/SydneyUni.aspx'
openIn: sameWindow
imgSrc: /images/Hero_BREAST.jpg
imgSrc: /images/carousel/Hero_BREAST.jpg
- label: SSW TV
link: 'https://tv.ssw.com/'
openIn: newWindow
imgSrc: /images/Hero_SSWTV.jpg
imgSrc: /images/carousel/Hero_SSWTV.jpg
- label: >-
Are your staff being driven nuts by outdated software or manual
processes?
link: 'https://www.ssw.com.au/ssw/Consulting/Are-You-Stuck.aspx'
openIn: sameWindow
imgSrc: /images/Hero_LegacyProjects.jpg
imgSrc: /images/carousel/Hero_LegacyProjects.jpg
backgroundColor: lightgray
delay: 5
showOnMobileDevices: false
Expand Down Expand Up @@ -126,7 +126,7 @@ SSW Consulting has over 30 years of experience developing awesome Microsoft solu
width={300}
message={<>
### We ❤️ Microsoft

In 1999, we were first recognized as a Microsoft Gold Partner – now renamed Microsoft Cloud Partner. Today [SSW has competencies in a variety of areas](https://www.ssw.com.au/ssw/company/awards/), including Data and AI and Digital & App Innovation.
</>}
/>
Expand Down
4 changes: 2 additions & 2 deletions content/products/index/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"name": "SophieBot",
"url": "https://sswsophie.com/sophiebot",
"description": "AI-driven solution that delivers a competitive edge through its ability to find data using advanced business-grade artificial intelligence.",
"logo": "/images/thumb-SophieBot.jpg"
"logo": "/images/products/thumb-SophieBot.jpg"
},
{
"name": "SophieHub",
"url": "https://sswsophie.com/",
"description": "A Smart Environment System which shows user specific information based on the user it detects to help clients and employees.",
"logo": "/images/thumb-SophieHub.jpg"
"logo": "/images/products/thumb-SophieHub.jpg"
},
{
"name": "CodeAuditor",
Expand Down
Binary file added public/images/Expert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Rules.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Sharepoint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Training.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/carousel/Hero_BREAST.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/carousel/Hero_LegacyProjects.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/carousel/Hero_SSW.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/carousel/Hero_SSWTV.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/products/thumb-SophieBot.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/products/thumb-SophieHub.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/verticalImageLayout/MAPA.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4494a43

Please sign in to comment.