Skip to content

Commit

Permalink
Merge pull request #5 from Rexblane/main
Browse files Browse the repository at this point in the history
Updating
  • Loading branch information
PedroRok authored Nov 9, 2023
2 parents c2f1760 + 7178570 commit 76e1d2c
Show file tree
Hide file tree
Showing 12 changed files with 131 additions and 57 deletions.
File renamed without changes.
14 changes: 14 additions & 0 deletions src/assets/social/facebookIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default function facebookIcon() {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
<path
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M7 10v4h3v7h4v-7h3l1-4h-4V8a1 1 0 0 1 1-1h3V3h-3a5 5 0 0 0-5 5v2H7"
/>
</svg>
);
}
File renamed without changes.
14 changes: 14 additions & 0 deletions src/assets/social/tiktokIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default function tiktokIcon() {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
<path
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M21 7.917v4.034A9.948 9.948 0 0 1 16 10v4.5a6.5 6.5 0 1 1-8-6.326V12.5a2.5 2.5 0 1 0 4 2V3h4.083A6.005 6.005 0 0 0 21 7.917z"
/>
</svg>
);
}
14 changes: 14 additions & 0 deletions src/assets/social/twitchIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default function twitchIcon() {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
<path
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M4 5v11a1 1 0 0 0 1 1h2v4l4-4h5.584c.266 0 .52-.105.707-.293l2.415-2.414c.187-.188.293-.442.293-.708V5a1 1 0 0 0-1-1h-14a1 1 0 0 0-1 1zm12 3v4m-4-4v4"
/>
</svg>
);
}
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client";
import DiscordIcon from "@/assets/discordIcon";
import DiscordIcon from "@/assets/social/discordIcon";
import { FooterButton, NavButtonIcon } from "./Buttons";
import GithubIcon from "@/assets/githubIcon";
import EmailIcon from "@/assets/emailIcon";
Expand Down
48 changes: 28 additions & 20 deletions src/components/SocialMedia.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
import GithubIcon from "@/assets/githubIcon";
import InstagramIcon from "@/assets/instagramIcon";
import InstagramIcon from "@/assets/social/instagramIcon";
import SiteIcon from "@/assets/siteIcon";
import TwitterIcon from "@/assets/twitterIcon";
import YoutubeIcon from "@/assets/youtubeIcon";
import DiscordIcon from "@/assets/discordIcon";
import TwitterIcon from "@/assets/social/twitterIcon";
import YoutubeIcon from "@/assets/social/youtubeIcon";
import DiscordIcon from "@/assets/social/discordIcon";
import TwitchIcon from "@/assets/social/twitchIcon";
import FacebookIcon from "@/assets/social/facebookIcon";
import TiktokIcon from "@/assets/social/tiktokIcon";

export function getSocialMedia(key: string, animated?:boolean) {
switch (key) {
case "twitter":
return <TwitterIcon/>
case "instagram":
return <InstagramIcon/>
case "youtube":
return <YoutubeIcon/>
case "site":
return <SiteIcon/>
case "github":
return <GithubIcon strokeWidth={2.2} animated={animated}/>
case "discord":
return <DiscordIcon animated={animated}/>

}
export function getSocialMedia(key: string, animated?: boolean) {
switch (key) {
case "twitter":
return <TwitterIcon />;
case "instagram":
return <InstagramIcon />;
case "youtube":
return <YoutubeIcon />;
case "site":
return <SiteIcon />;
case "github":
return <GithubIcon strokeWidth={2.2} animated={animated} />;
case "discord":
return <DiscordIcon animated={animated} />;
case "twitch":
return <TwitchIcon />;
case "facebook":
return <FacebookIcon />;
case "tiktok":
return <TiktokIcon />;
}
}
18 changes: 9 additions & 9 deletions src/i18n/br.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@
}
},
"reviews": {
"placeholder1": {
"about": "Sobre",
"review": "Lorem ipsum sit dolor amet"
"spok": {
"about": "Influencer \"Spok\"",
"review": "Trabalhar com o Rok foi algo que me deixou muito confortável e confiei no trabalho, soube resolver meu problema facilmente, e o melhor de tudo foi o rápido suporte que eu tive, em poucos minutos ja tinha uma resposta."
},
"placeholder2": {
"about": "Sobre",
"review": "Lorem ipsum dolor sit, amet consectetur adipisicing elit. Et iusto vel ipsum doloribus. Atque, corrupti!"
"arteque": {
"about": "Influencer e Streamer",
"review": "Trabalho excelente e dentro do prazo, entregou até mais do que foi pedido, ótimo profissional!"
},
"placeholder3": {
"about": "Sobre",
"review": "Lorem ipsum dolor sit, amet consectetur adipisicing elit. Atque, corrupti!"
"marco": {
"about": "Influencer e Empresário \"AuthenticGames\"",
"review": "..."
}
}
}
18 changes: 9 additions & 9 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@
}
},
"reviews": {
"placeholder1": {
"about": "About",
"review": "Lorem ipsum sit dolor amet"
"spok": {
"about": "Influencer \"Spok\"",
"review": "Working with Rok was something that made me feel very comfortable and I trusted the work, he was able to solve my problem easily, and best of all was the quick support I had, in a few minutes I already had an answer."
},
"placeholder2": {
"about": "About",
"review": "Lorem ipsum dolor sit, amet consectetur adipisicing elit. Et iusto vel ipsum doloribus. Atque, corrupti!"
"arteque": {
"about": "Influencer and Streamer",
"review": "Excellent work and on time, delivered even more than requested, great professional!"
},
"placeholder3": {
"about": "About",
"review": "Lorem ipsum dolor sit, amet consectetur adipisicing elit. Atque, corrupti!"
"marco": {
"about": "Influencer and Businessman \"AuthenticGames\"",
"review": "..."
}
}
}
60 changes: 42 additions & 18 deletions src/lib/Reviews.ts
Original file line number Diff line number Diff line change
@@ -1,50 +1,74 @@
export const data = [
{
id: "placeholder1",
name: "Review 1",
image: "https://avatars.githubusercontent.com/u/70350599?v=4",
id: "spok",
name: "Andrei Soares",
image: "https://media.discordapp.net/attachments/1071515485214089266/1172229397344952490/spok.jpg",
social: [
{
type: "youtube",
url: ""
url: "https://www.youtube.com/@spok"
},
{
type: "instagram",
url: "",
url: "https://www.instagram.com/spoktc/",
},
{
type: "twitter",
url: "https://twitter.com/thecreepersbr",
},
{
type: "facebook",
url: "https://www.facebook.com/gaming/thecreepersbr",
}
]
},
{
id: "placeholder2",
name: "Review 2",
image: "https://avatars.githubusercontent.com/u/70350599?v=1",
id: "arteque",
name: "Paulo Arteque",
image: "https://media.discordapp.net/attachments/1071515485214089266/1172231261801152532/file.png",
social: [
{
type: "youtube",
url: ""
url: "https://www.youtube.com/channel/UCNl7ym44XSi5jCbb_OOey1w"
},
{
type: "instagram",
url: "",
url: "https://www.instagram.com/pauloarteque/",
},
{
type: "twitter",
url: "",
url: "https://x.com/pauloarteque?s=20",
},
{
type: "twitch",
url: "https://www.twitch.tv/arteque",
},
{
type: "site",
url: "",
type: "tiktok",
url: "https://www.tiktok.com/@arteque"
}
]
},
{
id: "placeholder3",
name: "Review 3",
image: "https://avatars.githubusercontent.com/u/70350599?v=2",
id: "marco",
name: "Marco Túlio",
image: "https://media.discordapp.net/attachments/1071515485214089266/1172234764879671348/marco.png",
social: [
{
type: "site",
url: "",
type: "youtube",
url: "https://www.youtube.com/@AuthenticGames"
},
{
type: "instagram",
url: "https://www.instagram.com/mar.covieira/",
},
{
type: "twitter",
url: "https://twitter.com/AuthenticGames",
},
{
type: "tiktok",
url: "https://www.tiktok.com/@authenticgames"
}
]
}
Expand Down

0 comments on commit 76e1d2c

Please sign in to comment.