chore: Remove twitter, add Mastodon

config/social.mjs

@@ -5,5 +5,5 @@ export const social = {
   Facebook: 'https://www.facebook.com/groups/627769821272714/',
   GitHub: 'https://github.com/freesewing',
   Reddit: 'https://www.reddit.com/r/freesewing/',
-  Twitter: 'https://twitter.com/freesewing_org',
+  Mastodon: 'https://freesewing.social/@freesewing',
 }

sites/shared/components/icons.mjs

@@ -195,6 +195,12 @@ export const CsetIcon = (props) => (
 )
 export const CuratedMeasurementsSetIcon = CsetIcon
 
+export const CloudIcon = (props) => (
+  <IconWrapper {...props}>
+    <path d="M2.25 15a4.5 4.5 0 004.5 4.5H18a3.75 3.75 0 001.332-7.257 3 3 0 00-3.758-3.848 5.25 5.25 0 00-10.233 2.33A4.502 4.502 0 002.25 15z" />
+  </IconWrapper>
+)
+
 export const CutIcon = (props) => (
   <IconWrapper {...props}>
     <path d="M7.848 8.25l1.536.887M7.848 8.25a3 3 0 11-5.196-3 3 3 0 015.196 3zm1.536.887a2.165 2.165 0 011.083 1.839c.005.351.054.695.14 1.024M9.384 9.137l2.077 1.199M7.848 15.75l1.536-.887m-1.536.887a3 3 0 11-5.196 3 3 3 0 015.196-3zm1.536-.887a2.165 2.165 0 001.083-1.838c.005-.352.054-.695.14-1.025m-1.223 2.863l2.077-1.199m0-3.328a4.323 4.323 0 012.068-1.379l5.325-1.628a4.5 4.5 0 012.48-.044l.803.215-7.794 4.5m-2.882-1.664A4.331 4.331 0 0010.607 12m3.736 0l7.794 4.5-.802.215a4.5 4.5 0 01-2.48-.043l-5.326-1.629a4.324 4.324 0 01-2.068-1.379M14.343 12l-2.882 1.664" />

sites/shared/components/social/icons.mjs

@@ -3,14 +3,14 @@ import Link from 'next/link'
 import { useTheme } from 'shared/hooks/use-theme.mjs'
 import {
   MsfIcon,
-  HelpIcon,
+  HeartIcon,
   DiscordIcon,
   FacebookIcon,
   GitHubIcon,
   InstagramIcon,
   RedditIcon,
-  TwitterIcon,
+  MastodonIcon,
-  OpenSourceIcon,
+  CloudIcon,
   YouTubeIcon,
 } from 'shared/components/icons.mjs'
 import { social } from 'config/social.mjs'
@@ -19,7 +19,7 @@ import { siteConfig } from 'site/site.config.mjs'
 const iconClasses = (color) => ({
   className: `w-8 lg:w-12 h-8 lg:h-12 text-${color} hover:text-neutral-content`,
 })
-
+console.log(social)
 export const socialList = (spectrum) => ({
   MSF: {
     icon: <MsfIcon {...iconClasses(spectrum[0])} fill />,
@@ -30,49 +30,49 @@ export const socialList = (spectrum) => ({
     name: 'Doctors Without Borders / Médecins Sans Frontières',
     community: false,
   },
-  Discord: {
-    icon: <DiscordIcon {...iconClasses(spectrum[1])} />,
-    href: social.Discord,
-    community: true,
-  },
-  Instagram: {
-    icon: <InstagramIcon {...iconClasses(spectrum[2])} />,
-    href: social.Instagram,
-    community: true,
-  },
-  Facebook: {
-    icon: <FacebookIcon {...iconClasses(spectrum[3])} />,
-    href: social.Facebook,
-    community: true,
-  },
   GitHub: {
-    icon: <GitHubIcon {...iconClasses(spectrum[4])} />,
+    icon: <GitHubIcon {...iconClasses(spectrum[1])} />,
     href: social.GitHub,
     community: true,
   },
-  Reddit: {
+  Mastodon: {
-    icon: <RedditIcon {...iconClasses(spectrum[5])} />,
+    icon: <MastodonIcon {...iconClasses(spectrum[2])} />,
-    href: social.Reddit,
+    href: social.Mastodon,
     community: true,
   },
-  Twitter: {
+  Instagram: {
-    icon: <TwitterIcon {...iconClasses(spectrum[6])} />,
+    icon: <InstagramIcon {...iconClasses(spectrum[3])} />,
-    href: social.Twitter,
+    href: social.Instagram,
     community: true,
   },
-  YouTube: {
+  Bluesky: {
-    icon: <YouTubeIcon {...iconClasses(spectrum[7])} fill stroke={0} />,
+    icon: <CloudIcon {...iconClasses(spectrum[4])} stroke={2} />,
     href: social.YouTube,
     community: true,
   },
-  'Open Souce License: MIT': {
+  Discord: {
-    icon: <OpenSourceIcon {...iconClasses(spectrum[8])} />,
+    icon: <DiscordIcon {...iconClasses(spectrum[5])} />,
-    href: 'https://github.com/freesewing/freesewing/blob/develop/LICENSE',
+    href: social.Discord,
-    community: false,
+    community: true,
   },
-  'Contact Information': {
+  Facebook: {
-    icon: <HelpIcon {...iconClasses(spectrum[9])} />,
+    icon: <FacebookIcon {...iconClasses(spectrum[6])} />,
-    href: '/contact',
+    href: social.Facebook,
+    community: true,
+  },
+  Reddit: {
+    icon: <RedditIcon {...iconClasses(spectrum[7])} />,
+    href: social.Reddit,
+    community: true,
+  },
+  YouTube: {
+    icon: <YouTubeIcon {...iconClasses(spectrum[8])} fill stroke={0} />,
+    href: social.YouTube,
+    community: true,
+  },
+  Support: {
+    icon: <HeartIcon {...iconClasses(spectrum[9])} fill stroke={0} />,
+    href: '/support',
     community: false,
   },
 })

sites/shared/config/social.mjs

@@ -6,5 +6,5 @@ export const social = {
   Facebook: 'https://www.facebook.com/groups/627769821272714/',
   GitHub: 'https://github.com/freesewing',
   Reddit: 'https://www.reddit.com/r/freesewing/',
-  Twitter: 'https://twitter.com/freesewing_org',
+  Mastodon: 'https://freesewing.social/@freesewing',
 }