diff --git a/.gitignore b/.gitignore index db9882a..9f18ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ /data/* !/data/about.md !/data/config.json -!/data/messages.json # misc .DS_Store diff --git a/data/config.json b/data/config.json index f042e05..f0bd7e0 100644 --- a/data/config.json +++ b/data/config.json @@ -113,5 +113,21 @@ "href": "https://github.com/aoepeople", "icon": "github" } - ] + ], + "imprint": "https://www.aoe.com/en/imprint.html", + "labels": { + "title": "AOE Technology Radar", + "imprint": "Legal Information", + "quadrant": "Quadrant", + "quadrantOverview": "Quadrant Overview", + "zoomIn": "Zoom in", + "filterByTag": "Filter by Tag", + "footer": "AOE is a leading global provider of services for digital transformation and digital business models. AOE relies exclusively on established Enterprise Open Source technologies. This leads to innovative solutions, digital products and portals in agile software projects, and helps build long-lasting, strategic partnerships with our customers.", + "notUpdated": "This item was not updated in last three versions of the Radar. Should it have appeared in one of the more recent editions, there is a good chance it remains pertinent. However, if the item dates back further, its relevance may have diminished and our current evaluation could vary. Regrettably, our capacity to consistently revisit items from past Radar editions is limited.", + "notFound": "404 - Page not found", + "pageAbout": "How to use AOE Technology Radar?", + "pageOverview": "Technologies Overview", + "pageSearch": "Search", + "searchPlaceholder": "What are you looking for?" + } } diff --git a/data/messages.json b/data/messages.json deleted file mode 100644 index b42371c..0000000 --- a/data/messages.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "radarName": "AOE Technology Radar", - "footerFootnote": "AOE is a leading global provider of services for digital transformation and digital business models. AOE relies exclusively on established Enterprise Open Source technologies. This leads to innovative solutions, digital products and portals in agile software projects, and helps build long-lasting, strategic partnerships with our customers.", - "legalInformationLabel": "Legal Information", - "legalInformationLink": "https://www.aoe.com/en/imprint.html", - "pageHelp": { - "headlinePrefix": "How to use the", - "paragraphs": [ - { - "headline": "Introduction", - "values": [ - "Technology is moving fast and new technologies and innovations appear continuously.", - "It's essential for a development and technology company such as AOE to constantly improve and keep track with the latest useful innovations. It is important to openly look for innovations and new technologies and to question established technologies and methods every now and then.", - "But, it is also important to wisely choose which technologies to use in our daily work and in the different projects we are carrying out. As we all know: There is no silver bullet." - ] - }, - { - "headline": "What is the AOE Technology Radar", - "values": [ - "The Tech Radar is an overview of different technologies - from languages, frameworks, tools and patterns to platforms - that we consider \"new or mentionable\". The radar therefore doesn't provide an overview of all established technologies - but it focuses on items that have recently gained in importance or changed." - ] - }, - { - "headline": "How it is created", - "values": [ - "The items in the technology radar are raised by the different teams and therefore a lot of the items are related to the work and challenges the teams face in the different projects. In fact, we don't include anything on the radar, which we haven't already tried ourselves at least once.", - "There have been a lot of valuable discussions in different expert groups about the classification and details of each of technologies and innovations. And the result of all this can be found in the latest technology radar." - ] - }, - { - "headline": "How should it be used", - "values": [ - "The radar acts as an overview of technologies that we think everyone in the teams should currently know about.", - "Its goal is to act as a guide and inspiration for the daily work in the teams. Its purpose is also to provide helpful information and a bird's-eye perspective - so that decisions can be taken with a much deeper understanding of the subject matter. This results in more-informed and better-aligned decisions.", - "We also hope that developers outside of AOE find the information in our technology overview inspirational.", - "We group or categorize the items in 4 quadrants - (sometimes, when it's not 100% clear where a item belongs, we choose the best fit)." - ] - } - ], - "quadrants": [ - { - "description": "We've placed development languages (such as Scala or Golang) here, as well as more low-level development frameworks (such as Play or Symfony), which are useful for implementing custom software of all kinds.", - "name": "Languages and Frameworks" - }, - { - "description": "Here we put different software tools - from small helpers to bigger software projects.", - "name": "Tools" - }, - { - "description": "Patterns are so important, and a lot of them are valid for a long time (compared to some tools or frameworks). So, this is the category where we put information on methods and patterns concerning development, continuous x, testing, organization, architecture, etc.", - "name": "Methods and Patterns" - }, - { - "description": "(including AOE internal Services): Here we include infrastructure platforms and services. We also use this category to communicate news about AOE services that we want all AOE teams to be aware of.", - "name": "Platforms and Operations" - } - ], - "quadrantsPreDescription": "The quadrants are:", - "rings": [ - { - "description": "We can clearly recommend this technology. We have used it for longer period of time in many teams and it has proven to be stable and useful.", - "name": "Adopt" - }, - { - "description": "We have used it with success and recommend to have a closer look at the technology in this ring. The goal of items here is to look at them more closely, with the goal to bring them to the adopt level.", - "name": "Trial" - }, - { - "description": "We have tried it out and we find it promising. We recommend having a look at these items when you face a specific need for the technology in your project.", - "name": "Assess" - }, - { - "description": "This category is a bit special. Unlike the others, we recommend to stop doing or using something. That does not mean that they are bad and it often might be ok to use them in existing projects. But we move things here if we think we shouldn't do them anymore - because we see better options or alternatives now.", - "name": "Hold" - } - ], - "ringsPreDescription": "Each of the items is classified in one of these rings:", - "sourcecodeLink": { - "description": "Contributions and source code of the AOE Tech Radar are on github:", - "href": "https://github.com/AOEpeople/aoe_technology_radar", - "name": "AOE Tech Radar on Github" - } - }, - "pageIndex": { - "publishedLabel": "Quadrant Overview" - }, - "pageItem": { - "quadrantOverview": "Quadrant Overview" - }, - "pageOverview": { - "title": "Technologies Overview" - }, - "revisionsText": "Revisions:", - "searchLabel": "Search", - "searchPlaceholder": "What are you looking for?", - "socialLinks": [ - { - "href": "https://www.facebook.com/aoepeople", - "iconName": "facebook" - }, - { - "href": "https://twitter.com/aoepeople", - "iconName": "twitter" - }, - { - "href": "https://www.linkedin.com/company/aoe", - "iconName": "linkedIn" - }, - { - "href": "https://www.xing.com/company/aoe", - "iconName": "xing" - }, - { - "href": "https://www.instagram.com/aoepeople", - "iconName": "instagram" - }, - { - "href": "https://www.youtube.com/user/aoepeople", - "iconName": "youtube" - }, - { - "href": "https://github.com/aoepeople", - "iconName": "github" - } - ], - "socialLinksLabel": "Follow us:" -} diff --git a/src/components/Filter/QueryFilter.tsx b/src/components/Filter/QueryFilter.tsx index ad3db29..d493dbe 100644 --- a/src/components/Filter/QueryFilter.tsx +++ b/src/components/Filter/QueryFilter.tsx @@ -3,10 +3,13 @@ import { ChangeEvent, useEffect, useState } from "react"; import Search from "../Icons/Search"; import styles from "./QueryFilter.module.css"; +import { getLabel } from "@/lib/data"; + interface QueryFilterProps { value?: string; onChange: (value: string) => void; } + export function QueryFilter({ value, onChange }: QueryFilterProps) { const [val, setVal] = useState(value); const _onChange = (e: ChangeEvent) => { @@ -24,6 +27,7 @@ export function QueryFilter({ value, onChange }: QueryFilterProps) { className={styles.input} id="search" type="search" + placeholder={getLabel("searchPlaceholder")} value={val} onChange={_onChange} /> diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 9cbfff2..efb6b17 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -2,17 +2,14 @@ import logo from "../../../public/logo.svg"; import styles from "./Footer.module.css"; import { SocialLinks } from "@/components/SocialLinks/SocialLinks"; -import { getAppName, getMessages } from "@/lib/data"; +import { getAppName, getLabel } from "@/lib/data"; export function Footer() { - const appName = getAppName(); - const { footerFootnote } = getMessages(); - return (
- {appName} -

{footerFootnote}

+ {getAppName()} +

{getLabel("footer")}

diff --git a/src/components/ItemDetail/ItemDetail.tsx b/src/components/ItemDetail/ItemDetail.tsx index 07dfff2..90e7d4d 100644 --- a/src/components/ItemDetail/ItemDetail.tsx +++ b/src/components/ItemDetail/ItemDetail.tsx @@ -3,7 +3,7 @@ import styles from "./ItemDetail.module.css"; import { RingBadge } from "@/components/Badge/Badge"; import Attention from "@/components/Icons/Attention"; import { Tag } from "@/components/Tags/Tags"; -import { getReleases } from "@/lib/data"; +import { getLabel, getReleases } from "@/lib/data"; import { Item } from "@/lib/types"; import { cn } from "@/lib/utils"; @@ -18,6 +18,7 @@ interface ItemProps { } export function ItemDetail({ item }: ItemProps) { + const notMaintainedText = getLabel("notUpdated"); return ( <>
@@ -27,19 +28,12 @@ export function ItemDetail({ item }: ItemProps) { ))}
- {isNotMaintained(item.release) && ( + {notMaintainedText && isNotMaintained(item.release) && (
-
- This item was not updated in last three versions of the Radar. - Should it have appeared in one of the more recent editions, there - is a good chance it remains pertinent. However, if the item dates - back further, its relevance may have diminished and our current - evaluation could vary. Regrettably, our capacity to consistently - revisit items from past Radar editions is limited. -
+
{notMaintainedText}
)} diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx index 2253cd6..11cd14b 100644 --- a/src/components/Navigation/Navigation.tsx +++ b/src/components/Navigation/Navigation.tsx @@ -5,7 +5,7 @@ import styles from "./Navigation.module.css"; import IconOverview from "@/components/Icons/Overview"; import IconQuestion from "@/components/Icons/Question"; import IconSearch from "@/components/Icons/Search"; -import { getAppName } from "@/lib/data"; +import { getAppName, getLabel } from "@/lib/data"; export function Navigation() { return ( @@ -14,36 +14,19 @@ export function Navigation() {
  • - How to use {getAppName()}? + {getLabel("pageAbout")}
  • - {/* -
  • - - - - - Filter - - - - - Filter by Tags - - - -
  • - */}
  • - Technologies Overview + {getLabel("pageOverview")}
  • - Search + {getLabel("pageSearch")}
  • diff --git a/src/components/QuadrantLink/QuadrantLink.tsx b/src/components/QuadrantLink/QuadrantLink.tsx index f0bc842..078d611 100644 --- a/src/components/QuadrantLink/QuadrantLink.tsx +++ b/src/components/QuadrantLink/QuadrantLink.tsx @@ -3,6 +3,7 @@ import Link from "next/link"; import styles from "./QuadrantLink.module.css"; import Pie from "@/components/Icons/Pie"; +import { getLabel } from "@/lib/data"; import { Quadrant } from "@/lib/types"; import { cn } from "@/lib/utils"; @@ -13,7 +14,7 @@ interface QuadrantLinkProps { } export function QuadrantLink({ quadrant, - label = "Zoom in", + label = getLabel("zoomIn"), className, }: QuadrantLinkProps) { return ( diff --git a/src/components/Radar/Label.tsx b/src/components/Radar/Label.tsx index 3db8737..29b0b87 100644 --- a/src/components/Radar/Label.tsx +++ b/src/components/Radar/Label.tsx @@ -4,6 +4,7 @@ import { CSSProperties, useMemo } from "react"; import styles from "./Label.module.css"; import { QuadrantLink } from "@/components/QuadrantLink/QuadrantLink"; +import { getLabel } from "@/lib/data"; import { Quadrant } from "@/lib/types"; import { cn } from "@/lib/utils"; @@ -23,7 +24,9 @@ export function Label({ quadrant }: LabelProps) { style={style} >
    - Quadrant {quadrant.position} + + {getLabel("quadrant")} {quadrant.position} +

    {quadrant.title}

    diff --git a/src/components/Tags/Tags.tsx b/src/components/Tags/Tags.tsx index d2aab08..69e8cf1 100644 --- a/src/components/Tags/Tags.tsx +++ b/src/components/Tags/Tags.tsx @@ -5,6 +5,7 @@ import styles from "./Tags.module.css"; import IconRemove from "@/components/Icons/Close"; import IconTag from "@/components/Icons/Tag"; +import { getLabel } from "@/lib/data"; import { cn } from "@/lib/utils"; type TagProps = { @@ -36,7 +37,7 @@ interface TagsProps { export function Tags({ tags, activeTag, className }: TagsProps) { return (
    -

    Filter by Tag

    +

    {getLabel("filterByTag")}

    {tags.map((tag) => ( ))} diff --git a/src/lib/data.ts b/src/lib/data.ts index afefc93..2ed0add 100644 --- a/src/lib/data.ts +++ b/src/lib/data.ts @@ -1,15 +1,14 @@ import config from "../../data/config.json"; import data from "../../data/data.json"; -import messages from "../../data/messages.json"; import { Flag, Item, Quadrant, Ring } from "@/lib/types"; -export function getMessages() { - return messages; +export function getLabel(key: keyof typeof config.labels) { + return config.labels[key] || ""; } export function getAppName() { - return messages.radarName; + return getLabel("title"); } export function getChartConfig() { diff --git a/src/pages/[quadrant]/[id].tsx b/src/pages/[quadrant]/[id].tsx index d806b8d..3882919 100644 --- a/src/pages/[quadrant]/[id].tsx +++ b/src/pages/[quadrant]/[id].tsx @@ -11,6 +11,7 @@ import { QuadrantLink } from "@/components/QuadrantLink/QuadrantLink"; import { getItem, getItems, + getLabel, getQuadrant, sortByFeaturedAndTitle, } from "@/lib/data"; @@ -45,7 +46,10 @@ const ItemPage: CustomPage = () => {

    {quadrant.title}

    - +
    diff --git a/src/pages/overview.tsx b/src/pages/overview.tsx index a74870c..ee9921c 100644 --- a/src/pages/overview.tsx +++ b/src/pages/overview.tsx @@ -5,11 +5,12 @@ import { useCallback, useMemo } from "react"; import { Filter } from "@/components/Filter/Filter"; import { ItemList } from "@/components/ItemList/ItemList"; -import { getItems } from "@/lib/data"; +import { getItems, getLabel } from "@/lib/data"; import { formatTitle } from "@/lib/format"; import { CustomPage } from "@/pages/_app"; const Overview: CustomPage = () => { + const title = getLabel("pageOverview"); const router = useRouter(); const ring = router.query.ring as string | undefined; const query = (router.query.query as string) || ""; @@ -65,10 +66,10 @@ const Overview: CustomPage = () => { return ( <> - {formatTitle("Technologies Overview")} + {formatTitle(title)} -

    Technologies Overview

    +

    {title}