Last tweaks for release of the first version

dc7devs · dc7devs · commit 10b63634bb94 · 2022-12-20T09:23:01.000-03:00
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "@types/react-dom": "18.0.9",
     "axios": "^1.2.1",
     "clsx": "^1.2.1",
+    "date-fns": "^2.29.3",
     "dotenv-load": "^2.0.1",
     "eslint": "8.29.0",
     "eslint-config-next": "13.0.6",
diff --git a/src/@Types/api.github.d.ts b/src/@Types/api.github.d.ts
@@ -5,6 +5,6 @@ export type PropsCardBox = {
     repoDescription: string
     amountStars: number
     language: string
-    lastEdition: string
-    githubUrl: string
+    lastEdition: string | date | number
+    githubURL: string
 }
diff --git a/src/components/card-project.tsx b/src/components/card-project.tsx
@@ -2,48 +2,55 @@ import Link from "next/link";
 import { Star } from "phosphor-react";
 import { PropsCardBox } from "../@Types/api.github";
 
+import { intlFormatDistance, parseISO } from 'date-fns';
 import cx from "clsx";
 
+import { useEffect, useState } from "react";
+
 export default function CardBox({
     repoTitle,
     vercelURL,
     repoDescription,
     amountStars,
     language,
     lastEdition,
-    githubUrl,
+    githubURL,
 }: PropsCardBox) {
-
+     
     return (
         <div className="w-full sm:w-96 md:w-96 lg:w-[350px] h-48 dark:bg-black/45 bg-white/45 flex flex-col px-4 py-2.5 rounded backdrop-blur-sm ring-1 dark:ring-white/25 ring-black/25">
             <div className="flex justify-between items-center px-1">
                 <div className="text-2xl text-black dark:text-white">{repoTitle}</div>
-                <Link
-                    href={cx(vercelURL)}
-                    className="text-4xl text-zinc-500 hover:text-black dark:hover:text-zinc-100 hover:transition-colors ease-in select-none"
-                    target="__blank"
-                >▲</Link>
+                {
+                    vercelURL && <Link
+                        href={cx(vercelURL)}
+                        className="text-4xl text-zinc-500 hover:text-black dark:hover:text-zinc-100 hover:transition-colors ease-in select-none"
+                        target="__blank"
+                    >▲</Link>
+                }
             </div>
 
             <div className="flex-1 overflow-hidden text-ellipsis py-3 pl-2">{repoDescription}</div>
 
             <div className="flex justify-between items-center text-zinc-500">
                 <div className="flex justify-items-stretch items-center">
-                    <span className="w-3 h-3 bg-blue-600 rounded-full mr-1"></span>
+                    <span className={cx("w-3 h-3", "bg-zinc-500", "rounded-full mr-1")}></span>
                     
                     <div className="text-xs">{language}</div>
 
                     <span className="w-1 h-1 rounded-full dark:bg-white bg-black rounded-full mx-2"></span>
                     <div className="text-xs flex">
                         <Star size={15} />
-                        <div className="ml-px">{cx(amountStars ?? "0")}</div>
+                        <div className="ml-1">{cx(amountStars ? amountStars : "0")}</div>
                     </div>
                     <span className="w-1 h-1 rounded-full dark:bg-white bg-black rounded-full mx-2"></span>
 
-                    <div className="text-xs">Update {cx("49 min")} ago</div>
+                    <div className="text-xs">Atualizado {
+                        intlFormatDistance(parseISO(lastEdition), new Date)
+                    }</div>
                 </div>
 
-                <Link href={githubUrl} target="__blank">
+                <Link href={githubURL} target="__blank">
                     <svg viewBox="0 0 24 24" aria-hidden="true" className="h-6 w-6 fill-zinc-500 hover:transition hover:fill-zinc-600 dark:fill-zinc-400 dark:hover:fill-zinc-300"><path fillRule="evenodd" clipRule="evenodd" d="M12 2C6.475 2 2 6.588 2 12.253c0 4.537 2.862 8.369 6.838 9.727.5.09.687-.218.687-.487 0-.243-.013-1.05-.013-1.91C7 20.059 6.35 18.957 6.15 18.38c-.113-.295-.6-1.205-1.025-1.448-.35-.192-.85-.667-.013-.68.788-.012 1.35.744 1.538 1.051.9 1.551 2.338 1.116 2.912.846.088-.666.35-1.115.638-1.371-2.225-.256-4.55-1.14-4.55-5.062 0-1.115.387-2.038 1.025-2.756-.1-.256-.45-1.307.1-2.717 0 0 .837-.269 2.75 1.051.8-.23 1.65-.346 2.5-.346.85 0 1.7.115 2.5.346 1.912-1.333 2.75-1.05 2.75-1.05.55 1.409.2 2.46.1 2.716.637.718 1.025 1.628 1.025 2.756 0 3.934-2.337 4.806-4.562 5.062.362.32.675.936.675 1.897 0 1.371-.013 2.473-.013 2.82 0 .268.188.589.688.486a10.039 10.039 0 0 0 4.932-3.74A10.447 10.447 0 0 0 22 12.253C22 6.588 17.525 2 12 2Z"></path></svg>
                 </Link>
             </div>
diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx
@@ -21,22 +21,22 @@ export default function NavBar({
         <nav className="flex justify-center items-center">
             <ul className="hidden sm:flex sm:justify-stretch sm:items-cente sm:gap-x-3">
                 <li className={cx(router.pathname == "/" &&  "text-zinc-900/90 dark:fill-zinc-400/90 font-semibold", "font-medium sm:min-w-max sm:w-16 sm:flex sm:justify-center hover:text-violet-900/80 hover:transition hover:duration-75 hover:ease-in-out md:text-base md:w-20 select-none")}>
-                    <Link href="/">Home</Link>
+                    <Link href="/">Inicio</Link>
                 </li>
                 <li className={cx(router.pathname == "/about" &&  "text-zinc-900/90 dark:fill-zinc-400/90 font-semibold", "font-medium sm:min-w-max sm:w-16 sm:flex sm:justify-center hover:text-violet-900/80 hover:transition hover:duration-75 hover:ease-in-out md:text-base md:w-20 select-none")}>
-                    <Link href="/about">About</Link>
+                    <Link href="/about">Sobre</Link>
                 </li>
                 <li className={cx(router.pathname == "/projects" &&  "text-zinc-900/90 dark:fill-zinc-400/90 font-semibold", "font-medium sm:min-w-max sm:w-16 sm:flex sm:justify-center hover:text-violet-900/80 hover:transition hover:duration-75 hover:ease-in-out md:text-base md:w-20 select-none")}>
-                    <Link href="/projects">Projects</Link>
-                </li>
-                <li className={cx(router.pathname == "/contact" &&  "text-zinc-900/90 dark:fill-zinc-400/90 font-semibold", "font-medium sm:min-w-max sm:w-16 sm:flex sm:justify-center hover:text-violet-900/80 hover:transition hover:duration-75 hover:ease-in-out md:text-base md:w-20 select-none")}>
-                    <Link href="/contact">Contact</Link>
+                    <Link href="/projects">Projetos</Link>
                 </li>
+                {/* <li className={cx(router.pathname == "/contact" &&  "text-zinc-900/90 dark:fill-zinc-400/90 font-semibold", "font-medium sm:min-w-max sm:w-16 sm:flex sm:justify-center hover:text-violet-900/80 hover:transition hover:duration-75 hover:ease-in-out md:text-base md:w-20 select-none")}>
+                    <Link href="/contact">Contato</Link>
+                </li> */}
             </ul>
 
             <hr className="hidden sm:block w-0.5 h-5 bg-separator/80 dark:bg-white/25 mx-5 md:mx-7 shadow-md rounded-full" />
 
-            <button
+            {/* <button
                 className={cx("relative z-50 text-2xl hover:text-violet-900/80 dark:hover:text-violet-300/70", effect && "animate-effect", "mr-3")}
                 onClick={() => {
                     setEffect(true);
@@ -47,7 +47,7 @@ export default function NavBar({
                 {
                     effect ? <CirclesFour size={25} /> : (isOpenedModal ? <X size={25} /> : <CirclesThreePlus size={25} />)
                 }
-            </button>
+            </button> */}
 
             <ToggleThemeBtn hasAnimation />
         </nav>
diff --git a/src/intl/HomePage.ts b/src/intl/HomePage.ts
diff --git a/src/intl/LanguageProvider.tsx b/src/intl/LanguageProvider.tsx
diff --git a/src/pages/about.tsx b/src/pages/about.tsx
@@ -1,10 +1,31 @@
+import Link from "next/link";
 import Layout from "../components/layout";
 
 export default function About() {
     return (
         <Layout>
-            <p className={"leading-loose"}><strong className={"font-bold"}>Desenvolvedor de sistemas</strong>, estudante de programação 👨‍🎓,</p>
-            <p>interessado em conhecer e sempre aprender novas tecnologias.</p>
+            <p>Oi menu nome e Diego Silva,</p>
+            <p>sou programador, <strong className={"text-black/70 dark:text-white/70 font-bold"}>Desenvolvedor Full-Stack.</strong></p>
+            <p>Procuro sempre aprender novas tecnologias com pessoas programadoras</p>
+            <p>mas me estimulo sempre ao autodidatismo.</p>
+            <br />
+            <p>Gosto do conceito de programação investigativa de ter um problema</p>
+            <p>e ter que buscar a solução para resolve-lo. Atualmente focado na stack <strong className={"text-black/70 dark:text-white/70 font-bold"}>JavaScript</strong>,</p>
+            <p>mas sempre aberto a aprender novas tecnologias, novas linguagens,</p>
+            <p>novos conceitos.</p>
+            <br />
+            <p>Busco sempre construir código com o melhor que a linguagem oferece,</p>
+            <p>idependete da tecnologia. Tenho como foco dominar a arte da programação</p>
+            <p>utilizando não so as melhores ferramentas como as mais adequadas para os contextos especificos.</p>
+            <br />
+            <p>Estou sempre estudando, programando e aprendendo</p>
+            <p>pode ver mais sobre alguns projetos que fiz e que estou desenvolvendo <Link href="/projects" className={"underline text-black/70 dark:text-white/70 hover:text-black/90 dark:hover:text-white/90 hover:transition-colors hover:ease-in"}>clicando aqui!</Link>
+            </p>
+
+            <br /><hr className="w-7 mx-auto lg:ml-80"/><br />
+
+            <p>Gosto de historias, não so mais como são contadas.</p>
+            <p>Pretendo construir uma, e que seja contada da forma mais intrigante possivel!</p>
         </Layout>
     )
 }
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -9,26 +9,26 @@ export default function Home() {
         <div className="flex flex-col gap-10 md:gap-5 px-4">
           <h2 className="flex flex-col text-zinc md:gap-[3px]">
             <div className="text-4xl font-semibold">
-              Hi! my name is
+              Oi! meu nome e
             </div>
             <div className="text-5xl md:text-7xl md:ml-5 font-extralight">
               DIEGO SILVA
             </div>
           </h2>
           <p 
             className="text-xl md:ml-5"
-          >I'm a software <strong>
+          >Eu sou um <strong>
             <Link
               href="https://www.google.com/search?q=what+is+developer"
               className="underline dark:hover:text-white/70 hover:text-zinc-700 hover:transition-colors hover:ease-in"
               target="__blank"
             >
-              developer
+              desenvolvedor
             </Link>
-          </strong>!</p>
+          </strong> de software!</p>
           <button className="max-w-max h-8 px-2 text-xl hover:text-zinc-700 dark:hover:text-white/70 font-regular rounded-lg bg-black/25 dark:bg-white/25 md:ml-5 dark:border-1 md:shadow-sm hover:shadow-violet-500/25 bakcdrop-blur ring-4 dark:ring-2 ring-violet-300/10 border border-transparent hover:transition-colors hover:ease-in hover:border-zinc-700 dark:hover:border-white/50">
             <Link href="/about">
-              about me...
+              sobre min...
             </Link>
           </button>
         </div>
diff --git a/src/pages/projects.tsx b/src/pages/projects.tsx
@@ -1,15 +1,15 @@
 import Layout from "../components/layout";
 import CardBox from "../components/card-project";
 import { useEffect, useState } from "react";
-import api from "../service/api";
+import { gh_api } from "../service/api";
 
 import { PropsCardBox } from "../@Types/api.github";
 
 export default function Projects() {
     const [repositories, setRepositories] = useState<PropsCardBox[]>([]);
 
     useEffect(() => {
-        api.get("/users/dc7devs/repos")
+        gh_api.get("/users/dc7devs/repos")
         .then((repos: any) => {
             setRepositories(
                 repos.data.map((repo: any) => {
@@ -20,14 +20,14 @@ export default function Projects() {
                         amountStars: repo.stargazers_count,
                         language: repo.language,
                         lastEdition: repo.updated_at,
-                        githubUrl: repo.html_url,
+                        githubURL: repo.html_url,
                     };
 
                     return nowDataFormat;
                 })
             );
         }).catch((err) => {
-            console.error("ops! ocorreu um erro" + err);
+            console.error("ops! ocorreu um erro: " + err);
         })
     }, [])
 
@@ -43,7 +43,7 @@ export default function Projects() {
                         amountStars={dataProps.amountStars}
                         language={dataProps.language}
                         lastEdition={dataProps.lastEdition}
-                        githubUrl={dataProps.githubUrl}
+                        githubURL={dataProps.githubURL}
                     />
                 ))
             }</div>
diff --git a/src/service/api.ts b/src/service/api.ts
@@ -1,7 +1,9 @@
 import axios from 'axios';
 
-const api = axios.create({
+export const gh_api = axios.create({
     baseURL: 'https://api.github.com',
 });
 
-export default api;
+export const gh_lang_colors = axios.create({
+    baseURL: 'https://raw.githubusercontent.com',
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -15,6 +15,6 @@
     "jsx": "preserve",
     "incremental": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.jsx", "**/*.js"],
   "exclude": ["node_modules"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -562,6 +562,11 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+date-fns@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+
 debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ export type PropsCardBox = {`
`5`	`5`	`repoDescription: string`
`6`	`6`	`amountStars: number`
`7`	`7`	`language: string`
`8`		`- lastEdition: string`
`9`		`- githubUrl: string`
	`8`	`+ lastEdition: string \| date \| number`
	`9`	`+ githubURL: string`
`10`	`10`	`}`