Merge branch 'main' into deploy

BuddiesOfBudgie · Aug 21, 2023 · d621384 · d621384
2 parents eede8a0 + 6c40785
commit d621384
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 32 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll": true,
+    "source.organizeImports": true
+  }
+}
diff --git a/src/components/Person.tsx b/src/components/Person.tsx
@@ -1,13 +1,13 @@
 import React from "react";
 
-import { Person as PersonType, WebsiteType } from "../types";
+import Link from "@docusaurus/Link";
 import useBaseUrl from "@docusaurus/useBaseUrl";
 import { Avatar, Box, Stack, SxProps, useMediaQuery } from "@mui/material";
-import Link from "@docusaurus/Link";
-import { Teams } from "../data/teams";
+import Grid2 from "@mui/material/Unstable_Grid2";
 import { People } from "../data/people";
+import { Teams } from "../data/teams";
 import { SiteTheme } from "../theme";
-import Grid2 from "@mui/material/Unstable_Grid2";
+import { Person as PersonType, WebsiteType } from "../types";
 
 type PersonProps = {
   embeddedIn: string;

diff --git a/src/components/Team.tsx b/src/components/Team.tsx
@@ -1,12 +1,12 @@
 import React, { useState } from "react";
 
 import { Backdrop, Box, Stack } from "@mui/material";
-import { Teams } from "../data/teams";
 import { People } from "../data/people";
+import { Teams } from "../data/teams";
+import { SiteTheme } from "../theme";
 import { Person as PersonType, Team as TeamType } from "../types";
-import { Person } from "./Person";
 import { AutoColumnOnSmall } from "../utils/auto";
-import { SiteTheme } from "../theme";
+import { Person } from "./Person";
 
 type TeamMemberProps = {
   haveSupplementalInfo: boolean;

diff --git a/src/components/getting-budgie/OSCard.tsx b/src/components/getting-budgie/OSCard.tsx
@@ -1,18 +1,18 @@
 import { SupportLiveMediaInfo } from "@site/src/types";
 import React, { useMemo } from "react";
 
-import { LATEST_BUDGIE_RELEASE } from "@site/src/constants";
-import { kebabCase, toLower } from "lodash";
-import useBaseUrl from "@docusaurus/useBaseUrl";
+import Link from "@docusaurus/Link";
 import Translate, { translate } from "@docusaurus/Translate";
-import Grid2 from "@mui/material/Unstable_Grid2";
+import useBaseUrl from "@docusaurus/useBaseUrl";
 import { Box, Chip, Stack, useMediaQuery } from "@mui/material";
-import Link from "@docusaurus/Link";
+import Grid2 from "@mui/material/Unstable_Grid2";
+import { LATEST_BUDGIE_RELEASE } from "@site/src/constants";
+import { kebabCase, toLower } from "lodash";
 
 import CheckCircleIcon from "@mui/icons-material/CheckCircle";
 import WarningIcon from "@mui/icons-material/Warning";
-import { AutoColumnOnSmall } from "@site/src/utils/auto";
 import { SiteTheme } from "@site/src/theme";
+import { AutoColumnOnSmall } from "@site/src/utils/auto";
 import { DateTime } from "luxon";
 
 type OSCardProps = {
@@ -25,10 +25,10 @@ export const OSCard = ({ info }: OSCardProps) => {
   const logo = useBaseUrl(`/img/distribution/logos/${kebabName}.svg`);
   const screenshot = useBaseUrl(`/img/distribution/screenshots/${kebabName}.webp`);
 
-  const hasLatestOOTB = info.budgieVersion === LATEST_BUDGIE_RELEASE;
+  const hasLatestOOTB = info.budgieVersion === LATEST_BUDGIE_RELEASE.version;
 
   const hasLatestBudgie = info.budgieAvailablePostInstall
-    ? info.budgieAvailablePostInstall === LATEST_BUDGIE_RELEASE
+    ? info.budgieAvailablePostInstall === LATEST_BUDGIE_RELEASE.version
     : hasLatestOOTB;
 
   const isOutdated = !hasLatestOOTB && !hasLatestBudgie;

diff --git a/src/components/getting-budgie/SupportList.tsx b/src/components/getting-budgie/SupportList.tsx
@@ -1,21 +1,24 @@
-import React from "react";
 import Admonition from "@theme/Admonition";
+import React from "react";
 
 import type { SupportLiveMediaInfo, SupportManualInstallationInfo } from "../../types";
 
-import useBaseUrl from "@docusaurus/useBaseUrl";
 import Translate from "@docusaurus/Translate";
+import useBaseUrl from "@docusaurus/useBaseUrl";
 
 import { kebabCase, toLower } from "lodash";
 
-import Grid2 from "@mui/material/Unstable_Grid2/Grid2";
+import { OpenInNew } from "@mui/icons-material";
 import { Box, IconButton, Stack } from "@mui/material";
-import { OSCard } from "./OSCard";
+import Grid2 from "@mui/material/Unstable_Grid2/Grid2";
 import { SupportListData } from "@site/src/data/supportList";
-import { OpenInNew } from "@mui/icons-material";
+import { OSCard } from "./OSCard";
 
+import Link from "@docusaurus/Link";
 import { translate } from "@docusaurus/Translate";
+import { LATEST_BUDGIE_RELEASE } from "@site/src/constants";
 import { SiteTheme } from "@site/src/theme";
+import { DateTime } from "luxon";
 
 const SupportList = () => {
   const [liveMediaItems, manualItems] = [
@@ -25,8 +28,45 @@ const SupportList = () => {
     ),
   ];
 
+  const shouldShowNewReleaseBanner = DateTime.fromISO(LATEST_BUDGIE_RELEASE.date).diffNow("days").days <= 14;
+
   return (
     <Stack gap={2} key="SupportList">
+      {shouldShowNewReleaseBanner && (
+        <Admonition
+          icon="🎉"
+          title={translate({
+            id: "newBudgieRelease",
+            message: "New Budgie Release",
+          })}
+          type="tip"
+        >
+          <Stack gap={2}>
+            <Translate
+              id="get.budgie.newrelease"
+              description="Flavor text used to inform the user there is a new release of Budgie"
+              values={{ version: LATEST_BUDGIE_RELEASE.version }}
+            >
+              {
+                "The Buddies of Budgie team just released Budgie Desktop {version}. Please keep in mind that it may take some time for the release to be available on the operating systems shown below, as this is a manual process performed by our amazing community of package maintainers."
+              }
+            </Translate>
+            <Link
+              className="button button--primary"
+              style={{
+                maxWidth: "max-content",
+                textDecoration: "none",
+              }}
+              target="_blank"
+              to={LATEST_BUDGIE_RELEASE.post}
+            >
+              <Translate id="readMore" description="Read More on the blog post for this release">
+                Read Mode
+              </Translate>
+            </Link>
+          </Stack>
+        </Admonition>
+      )}
       <h2 style={{ fontWeight: "bold", margin: 0 }} key="SupportList-EffortlesslyHeader">
         <Translate
           id="get.budgie.header.effortlessly"

diff --git a/src/components/home/Header.tsx b/src/components/home/Header.tsx
@@ -2,10 +2,10 @@ import Translate from "@docusaurus/Translate";
 import { Stack, useMediaQuery } from "@mui/material";
 import React from "react";
 
+import Link from "@docusaurus/Link";
+import useBaseUrl from "@docusaurus/useBaseUrl";
 import { SiteTheme } from "@site/src/theme";
 import { AutoColumnOnSmall } from "@site/src/utils/auto";
-import useBaseUrl from "@docusaurus/useBaseUrl";
-import Link from "@docusaurus/Link";
 
 export const Header = () => {
   const aboveXl = useMediaQuery(SiteTheme.breakpoints.up("xl"));

diff --git a/src/constants.ts b/src/constants.ts
@@ -1 +1,5 @@
-export const LATEST_BUDGIE_RELEASE = "10.8";
+export const LATEST_BUDGIE_RELEASE = {
+  date: "2023-08-20",
+  post: "https://buddiesofbudgie.org/blog/budgie-10.8-released",
+  version: "10.8",
+};
diff --git a/src/data/people.tsx b/src/data/people.tsx
@@ -1,6 +1,6 @@
+import { Box } from "@mui/material";
 import React from "react";
 import { Person, WebsiteType } from "../types";
-import { Box } from "@mui/material";
 
 import GitHubIcon from "@mui/icons-material/GitHub";
 import LanguageIcon from "@mui/icons-material/Language";

diff --git a/src/data/supportList.tsx b/src/data/supportList.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 import { SupportInfo } from "../types";
 
-import Admonition from "@theme/Admonition";
 import Translate from "@docusaurus/Translate";
+import Admonition from "@theme/Admonition";
 
 import CodeBlock from "@theme/CodeBlock";
-import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
+import Tabs from "@theme/Tabs";
 
 export const SupportListData: SupportInfo[] = [
   {
     budgieAvailablePostInstall: null,
-    budgieVersion: "10.7.2",
+    budgieVersion: "10.8",
     installationInfo: () => (
       <>
         Arch Linux offers a Budgie Desktop profile within its 'archinstall' installer, though more intrepid users also
@@ -51,7 +51,7 @@ export const SupportListData: SupportInfo[] = [
     website: "https://debian.org",
   },
   {
-    budgieAvailablePostInstall: "10.7.2",
+    budgieAvailablePostInstall: "10.8",
     budgieVersion: "10.7.1",
     name: "EndeavourOS",
     showInGrid: true,

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,16 +1,16 @@
-import React from "react";
 import Layout from "@theme/Layout";
+import React from "react";
 
 import { Container, ThemeProvider } from "@mui/material";
+import { Category } from "../components/home/Category";
 import { Header } from "../components/home/Header";
 import { SiteTheme } from "../theme";
-import { Category } from "../components/home/Category";
 
-import DeveloperBoardIcon from "@mui/icons-material/DeveloperBoard";
+import Translate from "@docusaurus/Translate";
 import AccountCircleIcon from "@mui/icons-material/AccountCircle";
+import DeveloperBoardIcon from "@mui/icons-material/DeveloperBoard";
 import Diversity1Icon from "@mui/icons-material/Diversity1";
 import Grid2 from "@mui/material/Unstable_Grid2/Grid2";
-import Translate from "@docusaurus/Translate";
 
 const Home = (): JSX.Element => {
   return (