- { Object.entries(socials).map(([network, i]) =>
+ { Object.entries(socials).map(([label, i]) =>
@@ -27,4 +27,5 @@ export default SocialLinks;
export type SocialLinksProps = React.HTMLAttributes
& {
size?: number;
+ socials: Socials;
};
diff --git a/app/_data/contacts.ts b/app/_data/contacts.ts
index 023d983..c994ee8 100644
--- a/app/_data/contacts.ts
+++ b/app/_data/contacts.ts
@@ -1,5 +1,5 @@
-import socials, { Socials } from "./socials";
import Package from "@/../package.json";
+import socials, { Socials } from "./socials";
const contacts: ContactLinks =
{
@@ -8,21 +8,20 @@ const contacts: ContactLinks =
text: Package.author.email,
href: "mailto:" + Package.author.email
},
- telephone:
- {
- text: "+7 996 929-19-69",
- href: "tel:79969291969",
- country: "Russia"
- },
socials:
{
"LinkedIn": socials["LinkedIn"],
- "Telegram":
+ "Facebook":
{
username: "@xfox111",
- href: "https://t.me/xfox111"
+ href: "https://facebook.com/xfox111"
},
- "Twitter": socials["Twitter"]
+ "WhatsApp":
+ {
+ username: "@xfox111",
+ href: "https://wa.me/79969291969",
+ network: "whatsapp"
+ }
}
};
diff --git a/app/_data/socials.ts b/app/_data/socials.ts
index a2f1b25..e9e5b64 100644
--- a/app/_data/socials.ts
+++ b/app/_data/socials.ts
@@ -1,23 +1,23 @@
import Package from "@/../package.json";
const socials: Socials =
+{
+ "GitHub":
{
- "GitHub":
- {
- href: Package.author.url,
- username: "@xfox111"
- },
- "LinkedIn":
- {
- href: "https://www.linkedin.com/in/xfox/",
- username: "@xfox"
- },
- "Twitter":
- {
- href: "https://twitter.com/xfox111",
- username: "@xfox111"
- },
- };
+ href: Package.author.url,
+ username: "@xfox111"
+ },
+ "LinkedIn":
+ {
+ href: "https://www.linkedin.com/in/xfox/",
+ username: "@xfox"
+ },
+ "Twitter":
+ {
+ href: "https://twitter.com/xfox111",
+ username: "@xfox111"
+ },
+};
export default socials;
@@ -27,4 +27,5 @@ export type SocialLink =
{
href: string;
username: string;
+ network?: string;
};
diff --git a/app/_page_sections/ContactSection.module.scss b/app/_page_sections/ContactSection.module.scss
index 9aaab7c..6e71237 100644
--- a/app/_page_sections/ContactSection.module.scss
+++ b/app/_page_sections/ContactSection.module.scss
@@ -26,6 +26,12 @@
{
align-items: flex-end;
text-align: right;
+
+ .links
+ {
+ justify-content: flex-end;
+ flex-wrap: wrap;
+ }
}
.textarea
diff --git a/app/_page_sections/ContactSection.tsx b/app/_page_sections/ContactSection.tsx
index 65f6f27..d315635 100644
--- a/app/_page_sections/ContactSection.tsx
+++ b/app/_page_sections/ContactSection.tsx
@@ -1,6 +1,7 @@
"use client";
import Button from "@/_components/Button";
+import SocialLinks from "@/_components/SocialLinks";
import contacts from "@/_data/contacts";
import FormStatusTracker from "@/_utils/FormStatusTracker";
import React, { InputHTMLAttributes, useMemo, useState } from "react";
@@ -83,27 +84,17 @@ const ContactSection: React.FC = () =>
Direct contacts
-
- { Object.entries(socials).map(([name, i]) =>
-
- { name + ": " }
-
- { i.username }
-
-
-
- ) }
+
- { phone &&
-
- Telephone:
-
- { phone.text }
-
- ({ phone.country })
-
- }
-
+ { phone &&
+
+ Telephone:
+
+ { phone.text }
+
+ ({ phone.country })
+
+ }