Merge pull request #15 from vanribeiro/dev

feat: add favicon
vanribeiro · Jul 23, 2024 · ca29c3d · ca29c3d
2 parents 58ebd2b + 23558da
commit ca29c3d
Show file tree

Hide file tree

Showing 20 changed files with 172 additions and 74 deletions.
diff --git a/404.html b/404.html
@@ -3,12 +3,20 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400&family=Style+Script&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://vanribeiro.github.io/assets/style/commons/reset.css">
     <link rel="stylesheet" href="https://vanribeiro.github.io/assets/style/app.css">
     <link rel="stylesheet" href="https://vanribeiro.github.io/assets/style/pages/not-found.css">
+
+    <link rel="shortcut icon" href="https://vanribeiro.github.io/assets/img/favicon/favicon.ico" type="image/x-icon">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://vanribeiro.github.io/assets/img/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="https://vanribeiro.github.io/assets/img/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="https://vanribeiro.github.io/assets/img/favicon/favicon-16x16.png">
+    <link rel="manifest" href="https://vanribeiro.github.io/assets/img/favicon/site.webmanifest">
+
     <title>404 - Página não encontrada</title>
 </head>
 <body>

diff --git a/assets/img/favicon/android-chrome-192x192.png b/assets/img/favicon/android-chrome-192x192.png
diff --git a/assets/img/favicon/android-chrome-512x512.png b/assets/img/favicon/android-chrome-512x512.png
diff --git a/assets/img/favicon/apple-touch-icon.png b/assets/img/favicon/apple-touch-icon.png
diff --git a/assets/img/favicon/favicon-16x16.png b/assets/img/favicon/favicon-16x16.png
diff --git a/assets/img/favicon/favicon-32x32.png b/assets/img/favicon/favicon-32x32.png
diff --git a/assets/img/favicon/favicon.ico b/assets/img/favicon/favicon.ico
diff --git a/assets/img/favicon/favicon.svg b/assets/img/favicon/favicon.svg
diff --git a/assets/img/favicon/site.webmanifest b/assets/img/favicon/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/index.html b/index.html
@@ -10,6 +10,11 @@
     <link rel="stylesheet" href="./assets/style/commons/reset.css">
     <link rel="stylesheet" href="./assets/style/app.css">
     <link rel="stylesheet" href="./assets/style/pages/home.css">
+    <link rel="shortcut icon" href="./assets/img/favicon/favicon.ico" type="image/x-icon">
+    <link rel="apple-touch-icon" sizes="180x180" href="./assets/img/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="./assets/img/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="./assets/img/favicon/favicon-16x16.png">
+    <link rel="manifest" href="./assets/img/favicon/site.webmanifest">
     <title>Vanessa Ribeiro - Front-End Developer</title>
 </head>
 <body>

diff --git a/js/components/alura-section.js b/js/components/alura-section.js
@@ -1,4 +1,5 @@
-import { fetchAluraDashboardData } from "../service/api.js";
+import { fetchData } from "../service/api.js";
+import endpoint from "../service/config.js";
 import { aluraStudyngTemplate } from "./../templates/index.js";
 import { aluraCardContainer } from "./elements.js";
 
@@ -24,9 +25,9 @@ const aluraSection = async () => {
 
     const isEmpty = (data) => data.length === 0 || data === undefined || data === null;
 
-    return await fetchAluraDashboardData()
-        .then(values => {
-            const [ response, result ] = values;
+    return await fetchData(endpoint.ALURA, '?collection=progresso')
+        .then(data => {
+            const { response, result } = data;
 
             isEmpty(result)
             ? setMessageWhenNoCourseIsInProgress()

diff --git a/js/components/dev-to-section.js b/js/components/dev-to-section.js
@@ -1,6 +1,7 @@
 import { devToPostsCardTemplate } from "../templates/index.js";
-import { fetchDevToData } from "../service/api.js";
+import { fetchData } from "../service/api.js";
 import { devToCardsContainer } from './elements.js';
+import endpoint from "../service/config.js";
 
 const populateCards = (item) => {
     const article = document.createElement('article');
@@ -19,8 +20,11 @@ const populateCards = (item) => {
 }
 
 const devToPostSection = async () => {
-    return await fetchDevToData()
-        .then(result => result.data.map(item => populateCards(item)));
+    return await fetchData(endpoint.DEV_TO_POSTS_SUMMARY, '?collection=progresso')
+        .then(data => {
+            const { result } = data;
+            return result.data.slice(0, 4).map(item => populateCards(item))
+        });
 }
 
 export default devToPostSection;
diff --git a/js/components/github-section.js b/js/components/github-section.js
@@ -1,6 +1,7 @@
 import { githubCardRepoTemplate } from "./../templates/index.js";
-import { fetchGithubReposData } from "./../service/api.js";
+import { fetchData } from "./../service/api.js";
 import { githubCardsContainer } from './elements.js';
+import endpoint from "../service/config.js";
 
 const populateCards = (item) => {
     const article = document.createElement('article');
@@ -25,9 +26,12 @@ const sortByLastestRepoUpdates = (a, b) => {
 }
 
 const githubSection = async () => {
-    return await fetchGithubReposData()
-        .then(data => data.sort(sortByLastestRepoUpdates)
-        .slice(0, 4).map(item => populateCards(item)));
+    return await fetchData(endpoint.GITHUB, '?sort=updated&direction=desc')
+        .then(data => {
+            const { result } = data;
+            result.sort(sortByLastestRepoUpdates)
+            .slice(0, 4).map(item => populateCards(item))
+        });
 }
 
 export default githubSection;
diff --git a/js/components/instagram-section.js b/js/components/instagram-section.js
@@ -1,4 +1,5 @@
-import { fetchInstagramMediaData } from "./../service/api.js";
+import endpoint from "../service/config.js";
+import { fetchData } from "./../service/api.js";
 import { instagramItemTemplate } from "./../templates/index.js";
 import { instagramListContainer } from "./elements.js";
 
@@ -20,7 +21,7 @@ const populateCards = (item) => {
 }
 
 const instagramSection = async () => {
-    return await fetchInstagramMediaData() 
+    return await fetchData(`${endpoint.ALURA}/api/meu-instagram`) 
                 .then(insta => { 
                     insta.data.slice(0, 15)
                     .map(item => populateCards(item))

diff --git a/js/components/site-iframe-urls.js b/js/components/site-iframe-urls.js
@@ -0,0 +1,20 @@
+const urlDictionary = [
+    {
+        "title": "abrir em outra aba: 30 day of JavaScript - WesBos Challenge",
+        "url": "https://vanribeiro-30daysofjavascript.netlify.app"
+    },
+    {
+        "title": "abrir em outra aba: documentação back-end deste site",
+        "url": "https://vanribeiro-github-io-backend.vercel.app"
+    },
+    {
+        "title": "abrir em outra aba: Know more about countries app - Frontend Mentor Challenge",
+        "url": "https://know-more-about-countries-app.vercel.app"
+    }, 
+    {
+        "title": "abrir em outra aba: Advice Generator App - Frontend Mentor Challenge",
+        "url": "https://advice-generator-app-cyan.vercel.app"
+    } 
+];
+
+export default urlDictionary;
diff --git a/js/components/site-iframe.js b/js/components/site-iframe.js
@@ -1,26 +1,8 @@
+import urlDictionary from './site-iframe-urls.js';
 const iframe = document.querySelector('.live-jobs__source');
 const link = document.querySelector('.live-jobs__link');
 const span = link.querySelector('.live-jobs__link__url');
 
-const urlDictionary = [
-    {
-        title: 'abrir em outra aba: 30 day of JavaScript - WesBos Challenge',
-        url: 'https://vanribeiro-30daysofjavascript.netlify.app'
-    },
-    {
-        title: 'abrir em outra aba: documentação back-end deste site',
-        url: 'https://vanribeiro-github-io-backend.vercel.app'
-    },
-    {
-        title: 'abrir em outra aba: Know more about countries app - Frontend Mentor Challenge',
-        url: 'https://know-more-about-countries-app.vercel.app'
-    }, 
-    {
-        title: 'abrir em outra aba: Advice Generator App - Frontend Mentor Challenge',
-        url: 'https://advice-generator-app-cyan.vercel.app',
-    } 
-];
-
 function getRandomNumber(min, max) {
     const MIN = Math.ceil(min);
     const MAX = Math.floor(max);

diff --git a/js/service/api.js b/js/service/api.js
@@ -1,40 +1,9 @@
-import { 
-    URL_BASE_API_ALURA, 
-    URL_BASE_API_GITHUB, 
-    URL_BASE_API_DEV_TO_SUMMARY 
-} from "./config.js";
-
-/** 
- * @todo: DRY - refactor this function to use a generic fetch function
- */
-
-const fetchGithubReposData = async () => {
-    const response = await fetch(`${URL_BASE_API_GITHUB}?sort=updated&direction=desc`);
-    const data = await response.json();
-    return data;        
-}
-
-const fetchDevToData = async () => {
-    const response = await fetch(`${URL_BASE_API_DEV_TO_SUMMARY}`);
-    const data = await response.json();
-    return data;        
-}
-
-const fetchInstagramMediaData = async () => {
-    const response = await fetch(`${URL_BASE_API}/api/meu-instagram`);
-    const data = await response.json();
-    return data;        
-}
-
-const fetchAluraDashboardData = async () => {
-    const response = await fetch(`${URL_BASE_API_ALURA}?collection=progresso`);
+const fetchData = async (url, query) => {
+    const response = await fetch(`${url}${query ? query : ''}`);
     const result = await response.json();
-    return [ response, result ];        
+    return { response, result };        
 }
 
 export {
-    fetchDevToData,
-    fetchGithubReposData,
-    fetchInstagramMediaData,
-    fetchAluraDashboardData
+    fetchData,
 };
diff --git a/js/service/config.js b/js/service/config.js
@@ -2,12 +2,14 @@
  * @todo: refactor endpoints with dynamic paths 
  */
 
-const URL_BASE_API_ALURA = 'https://vanribeiro-github-io-backend.vercel.app/api/alura/dashboard';
-const URL_BASE_API_DEV_TO_SUMMARY = 'https://vanribeiro-github-io-backend.vercel.app/api/dev-to/posts-summary';
+const URL_BASE_API = 'https://vanribeiro-github-io-backend.vercel.app/api';
 const URL_BASE_API_GITHUB = 'https://api.github.com/users/vanribeiro/repos';
 
-export { 
-  URL_BASE_API_ALURA,
-  URL_BASE_API_GITHUB,
-  URL_BASE_API_DEV_TO_SUMMARY
-}
+const endpoint = {
+  ALURA: `${URL_BASE_API}/alura/dashboard`,
+  GITHUB: `${URL_BASE_API_GITHUB}`,
+  DEV_TO_POSTS: `${URL_BASE_API}/dev-to/posts`,
+  DEV_TO_POSTS_SUMMARY: `${URL_BASE_API}/dev-to/posts-summary`,
+};
+
+export default endpoint;
diff --git a/paginas/links.html b/paginas/links.html
@@ -10,6 +10,11 @@
     <link rel="stylesheet" href="./../assets/style/commons/reset.css">
     <link rel="stylesheet" href="./../assets/style/app.css">
     <link rel="stylesheet" href="./../assets/style/pages/links.css">
+    <link rel="shortcut icon" href="./../assets/img/favicon/favicon.ico" type="image/x-icon">
+    <link rel="apple-touch-icon" sizes="180x180" href="./../assets/img/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="./../assets/img/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="./../assets/img/favicon/favicon-16x16.png">
+    <link rel="manifest" href="./../assets/img/favicon/site.webmanifest">
     <title>Vanessa Ribeiro - Front-End Developer</title>
 </head>
 <body>

diff --git a/paginas/updates.html b/paginas/updates.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link rel="stylesheet"
@@ -14,6 +15,13 @@
     <link rel="stylesheet" href="./../assets/style/libs/language-colors.css">
     <link rel="stylesheet" href="./../assets/style/app.css">
     <link rel="stylesheet" href="./../assets/style/pages/updates.css">
+
+    <link rel="shortcut icon" href="./../assets/img/favicon/favicon.ico" type="image/x-icon">
+    <link rel="apple-touch-icon" sizes="180x180" href="./../assets/img/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="./../assets/img/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="./../assets/img/favicon/favicon-16x16.png">
+    <link rel="manifest" href="./../assets/img/favicon/site.webmanifest">
+
     <title>Vanessa Ribeiro - Atualizações</title>
 </head>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}