From b9cf3597492e723b2ae71401093fdac0c5cd09ec Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:58:18 +0900
Subject: [PATCH 1/4] Change X to Feather Icon
---
src/components/GlobalFooter.tsx | 5 +++--
src/pages/contact.tsx | 3 ++-
src/pages/index.tsx | 3 ++-
src/templates/member.tsx | 5 +++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/components/GlobalFooter.tsx b/src/components/GlobalFooter.tsx
index a98b87ba..59e05c3e 100644
--- a/src/components/GlobalFooter.tsx
+++ b/src/components/GlobalFooter.tsx
@@ -1,6 +1,7 @@
import clsx from "clsx";
import React from "react";
import { Link } from "gatsby";
+import { FaXTwitter } from "react-icons/fa6";
import ActionButton from "./ActionButton";
import Logo from "./Logo";
@@ -9,7 +10,7 @@ function FooterSection({
links,
}: {
title: string;
- links: { title: string; to: string }[];
+ links: { title: string | JSX.Element; to: string }[];
}) {
return (
@@ -74,7 +75,7 @@ export default function GlobalFooter({ className }: { className?: string }) {
to: "https://first-programming.utcode.net/",
},
{ title: "GitHub", to: "https://github.com/ut-code" },
- { title: "đ", to: "https://twitter.com/utokyo_code" },
+ { title: , to: "https://twitter.com/utokyo_code" },
]}
/>
diff --git a/src/pages/contact.tsx b/src/pages/contact.tsx
index 3743e454..808d4a5c 100644
--- a/src/pages/contact.tsx
+++ b/src/pages/contact.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useState } from "react";
import { StaticImage } from "gatsby-plugin-image";
+import { FaXTwitter } from "react-icons/fa6";
import GlobalFooter from "../components/GlobalFooter";
import GlobalHeader from "../components/GlobalHeader";
import CommonHead from "../components/CommonHead";
@@ -34,7 +35,7 @@ export default function ContactPage() {
ut.code(); ã¸ãŽãåãåããã¯ãåį¨Ž SNS ããåŠį¨ãã ããã
- đ (æ§ Twitter)
+ (æ§ Twitter)
LINE
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 17744a14..ba48c18b 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -6,6 +6,7 @@ import {
FiBox,
FiMessageSquare,
} from "react-icons/fi";
+import { FaXTwitter } from "react-icons/fa6";
import { StaticImage } from "gatsby-plugin-image";
import GlobalHeader from "../components/GlobalHeader";
import ActionButton from "../components/ActionButton";
@@ -188,7 +189,7 @@ export default function IndexPage({ data }: PageProps) {
{ title: "æ§æäēēæ°", content: "20 åį¨åēĻ (ãĸã¯ããŖã)" },
{ title: "é¨åޤ", content: "é§å ´ããŖãŗããšåĻįäŧ館 313B æåޤ" },
{
- title: "đ",
+ title: ,
content: "@utokyo_code",
link: "https://x.com/utokyo_code",
},
diff --git a/src/templates/member.tsx b/src/templates/member.tsx
index 0799b5ec..01aab87a 100644
--- a/src/templates/member.tsx
+++ b/src/templates/member.tsx
@@ -5,6 +5,7 @@ import nullthrows from "nullthrows";
import Color from "color";
import clsx from "clsx";
import { FiGithub, FiGlobe } from "react-icons/fi";
+import { FaXTwitter } from "react-icons/fa6";
import GlobalHeader from "../components/GlobalHeader";
import GlobalFooter from "../components/GlobalFooter";
import CommonHead from "../components/CommonHead";
@@ -66,9 +67,9 @@ export default function MemberPage({
target="_blank"
className={socialButtonClassName}
rel="noreferrer"
- aria-label="đ (æ§ Twitter) ãčĻã"
+ aria-label="X (æ§ Twitter) ãčĻã"
>
- đ
+
)}
{data.mdx?.frontmatter?.website && (
From e75f65f533aa000b436c13b720d2d0f8c173fc87 Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Thu, 30 Jan 2025 14:19:45 +0900
Subject: [PATCH 2/4] use the X character instead of X icon
---
src/components/GlobalFooter.tsx | 2 +-
src/pages/contact.tsx | 3 +--
src/pages/index.tsx | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/components/GlobalFooter.tsx b/src/components/GlobalFooter.tsx
index 59e05c3e..6ea36b3f 100644
--- a/src/components/GlobalFooter.tsx
+++ b/src/components/GlobalFooter.tsx
@@ -75,7 +75,7 @@ export default function GlobalFooter({ className }: { className?: string }) {
to: "https://first-programming.utcode.net/",
},
{ title: "GitHub", to: "https://github.com/ut-code" },
- { title: , to: "https://twitter.com/utokyo_code" },
+ { title: "X", to: "https://twitter.com/utokyo_code" },
]}
/>
diff --git a/src/pages/contact.tsx b/src/pages/contact.tsx
index 808d4a5c..91b28742 100644
--- a/src/pages/contact.tsx
+++ b/src/pages/contact.tsx
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from "react";
import { StaticImage } from "gatsby-plugin-image";
-import { FaXTwitter } from "react-icons/fa6";
import GlobalFooter from "../components/GlobalFooter";
import GlobalHeader from "../components/GlobalHeader";
import CommonHead from "../components/CommonHead";
@@ -35,7 +34,7 @@ export default function ContactPage() {
ut.code(); ã¸ãŽãåãåããã¯ãåį¨Ž SNS ããåŠį¨ãã ããã
- (æ§ Twitter)
+ X (æ§ Twitter)
LINE
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index ba48c18b..7e75a99b 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -6,7 +6,6 @@ import {
FiBox,
FiMessageSquare,
} from "react-icons/fi";
-import { FaXTwitter } from "react-icons/fa6";
import { StaticImage } from "gatsby-plugin-image";
import GlobalHeader from "../components/GlobalHeader";
import ActionButton from "../components/ActionButton";
@@ -189,7 +188,7 @@ export default function IndexPage({ data }: PageProps) {
{ title: "æ§æäēēæ°", content: "20 åį¨åēĻ (ãĸã¯ããŖã)" },
{ title: "é¨åޤ", content: "é§å ´ããŖãŗããšåĻįäŧ館 313B æåޤ" },
{
- title: ,
+ title: "X",
content: "@utokyo_code",
link: "https://x.com/utokyo_code",
},
From a629d5fe17d23c3a1a7c8f5aa4891055a7cf5077 Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Thu, 30 Jan 2025 14:29:17 +0900
Subject: [PATCH 3/4] fix lint
---
.envrc | 2 +-
shell.nix | 8 ++++++++
src/components/GlobalFooter.tsx | 1 -
3 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 shell.nix
diff --git a/.envrc b/.envrc
index 3550a30f..1d953f4b 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use flake
+use nix
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 00000000..76b73ffd
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,8 @@
+{pkgs ? import {}}:
+pkgs.mkShell {
+ packages = with pkgs; [
+ bun
+ nodejs
+ deno
+ ];
+}
diff --git a/src/components/GlobalFooter.tsx b/src/components/GlobalFooter.tsx
index 6ea36b3f..d4eb70f1 100644
--- a/src/components/GlobalFooter.tsx
+++ b/src/components/GlobalFooter.tsx
@@ -1,7 +1,6 @@
import clsx from "clsx";
import React from "react";
import { Link } from "gatsby";
-import { FaXTwitter } from "react-icons/fa6";
import ActionButton from "./ActionButton";
import Logo from "./Logo";
From 05318a7de91ba6013e4c100b4bffa7c2216e4665 Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Thu, 30 Jan 2025 14:31:11 +0900
Subject: [PATCH 4/4] revert globalfooter type
---
src/components/GlobalFooter.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/GlobalFooter.tsx b/src/components/GlobalFooter.tsx
index d4eb70f1..de7d7d57 100644
--- a/src/components/GlobalFooter.tsx
+++ b/src/components/GlobalFooter.tsx
@@ -9,7 +9,7 @@ function FooterSection({
links,
}: {
title: string;
- links: { title: string | JSX.Element; to: string }[];
+ links: { title: string; to: string }[];
}) {
return (