Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
marcode24 authored Jan 24, 2024
2 parents 55fe1cf + aa69a47 commit c3d3f17
Show file tree
Hide file tree
Showing 68 changed files with 87 additions and 124 deletions.
Binary file removed public/images/angular.png
Binary file not shown.
Binary file added public/images/angular.webp
Binary file not shown.
Binary file removed public/images/astro.png
Binary file not shown.
Binary file added public/images/astro.webp
Binary file not shown.
Binary file removed public/images/azure.png
Binary file not shown.
Binary file added public/images/azure.webp
Binary file not shown.
Binary file removed public/images/bootstrap.png
Binary file not shown.
Binary file added public/images/bootstrap.webp
Binary file not shown.
Binary file removed public/images/css.png
Binary file not shown.
Binary file added public/images/css.webp
Binary file not shown.
Binary file removed public/images/docker.png
Binary file not shown.
Binary file added public/images/docker.webp
Binary file not shown.
Binary file removed public/images/figma.png
Binary file not shown.
Binary file added public/images/figma.webp
Binary file not shown.
Binary file removed public/images/git.png
Binary file not shown.
Binary file added public/images/git.webp
Binary file not shown.
Binary file removed public/images/html.png
Binary file not shown.
Binary file added public/images/html.webp
Binary file not shown.
Binary file removed public/images/jasmine.png
Binary file not shown.
Binary file added public/images/jasmine.webp
Binary file not shown.
Binary file removed public/images/jest.png
Binary file not shown.
Binary file added public/images/jest.webp
Binary file not shown.
Binary file removed public/images/js.png
Binary file not shown.
Binary file added public/images/js.webp
Binary file not shown.
Binary file removed public/images/mongo.png
Binary file not shown.
Binary file added public/images/mongo.webp
Binary file not shown.
Binary file removed public/images/mysql.png
Binary file not shown.
Binary file added public/images/mysql.webp
Binary file not shown.
Binary file removed public/images/nestjs.png
Binary file not shown.
Binary file added public/images/nestjs.webp
Binary file not shown.
Binary file removed public/images/nodejs.png
Binary file not shown.
Binary file added public/images/nodejs.webp
Binary file not shown.
Binary file added public/images/portfolio/bon-appetito.webp
Binary file not shown.
Binary file added public/images/portfolio/cloud-box.webp
Binary file not shown.
Binary file added public/images/portfolio/guess-word.webp
Binary file not shown.
Binary file added public/images/portfolio/inforeader.webp
Binary file not shown.
Binary file added public/images/portfolio/memory-game.webp
Binary file not shown.
Binary file added public/images/portfolio/smart-dental.webp
Binary file not shown.
Binary file added public/images/portfolio/twitter-clone.webp
Binary file not shown.
Binary file added public/images/portfolio/unit-converter.webp
Binary file not shown.
Binary file removed public/images/postgresql.png
Binary file not shown.
Binary file added public/images/postgresql.webp
Binary file not shown.
Binary file removed public/images/postman.png
Binary file not shown.
Binary file added public/images/postman.webp
Binary file not shown.
Binary file removed public/images/sass.png
Binary file not shown.
Binary file added public/images/sass.webp
Binary file not shown.
Binary file removed public/images/sqlserver.png
Binary file not shown.
Binary file added public/images/sqlserver.webp
Binary file not shown.
Binary file removed public/images/svelte.png
Binary file not shown.
Binary file added public/images/svelte.webp
Binary file not shown.
Binary file removed public/images/tailwind.png
Binary file not shown.
Binary file added public/images/tailwind.webp
Binary file not shown.
Binary file removed public/images/ts.png
Binary file not shown.
Binary file added public/images/ts.webp
Binary file not shown.
Binary file removed public/images/vue.png
Binary file not shown.
Binary file added public/images/vue.webp
Binary file not shown.
Binary file removed public/me.jpg
Binary file not shown.
Binary file added public/me.webp
Binary file not shown.
Binary file removed public/programming.jpg
Diff not rendered.
Binary file added public/programming.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/About.astro
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const YEARS_OLD = new Date().getFullYear() - 2001;
</div>
<div class="image">
<figure>
<img src="programming.jpg" alt="programming-image">
<img src="programming.webp" alt="programming-image">
</figure>
</div>
</div>
Expand Down
17 changes: 12 additions & 5 deletions src/components/Contact.astro
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import {
</div>
<div class="buttons">
<a href={`mailto:${EMAIL_URL}`} class="btn icon" aria-label="Send email">
<SendIcon width={28} height={28} />
<SendIcon width={26} height={26} />
</a>
<button class="btn icon copy" aria-label="Copy email">
<CopyIcon width={28} height={28} />
<CopyIcon width={26} height={26} />
</button>
</div>
</div>
Expand Down Expand Up @@ -144,16 +144,23 @@ import {
}

.email-wrapper .email {
padding: 0.8rem 1.2rem;
padding: 9px 16px;
height: 44px;
background-color: var(--bg-color-button);
border-radius: 0.5rem;
color: var(--font-color);
border: 1px solid var(--border-color);
font-size: 22px;
font-size: 18px;
font-weight: 500;
width: 100%;
overflow: hidden;
}

.email-wrapper .email span {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.email-wrapper .buttons {
Expand Down Expand Up @@ -199,7 +206,7 @@ import {
}

.email-wrapper .email {
font-size: 18px;
font-size: 16px;
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/Hero.astro
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { GITHUB_URL, LINKEDIN_URL } from '@constants/urls.ts';
</div>
</div>
<figure>
<img src="me.jpg" alt="profile-image" class="profile">
<img src="me.webp" alt="profile-image" class="profile">
</figure>
</section>

Expand Down
7 changes: 3 additions & 4 deletions src/components/Portfolio.astro
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ import projects from '@data/projects.json';
href={project.urlGithub}
aria-label="github-repository"
>
Código <GithubIcon width={28} height={28}/>
Código <GithubIcon width={26} height={26}/>
</a>
<a
class="btn icon"
target="_blank"
href={project.urlProduction}
aria-label="project-demo"
>
Demo <ExternalIcon width={28} height={28} />
Demo <ExternalIcon width={26} height={26} />
</a>
</div>
</div>
Expand Down Expand Up @@ -158,6 +158,7 @@ import projects from '@data/projects.json';
flex-direction: row;
align-items: center;
justify-content: flex-start;
gap: 1rem;
}

.description .links .btn {
Expand All @@ -168,9 +169,7 @@ import projects from '@data/projects.json';
border-radius: 0.5rem;
background-color: var(--bg-color-button-2);
color: var(--bg-color);
font-size: 1.2rem;
font-weight: 600;
margin-right: 1rem;
transition: all 0.3s ease;
gap: 0.5rem;
}
Expand Down
80 changes: 40 additions & 40 deletions src/data/projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,102 +2,102 @@
{
"name": "Cloud Box",
"description": "This is a simple cloud storage service that allows users to upload and download files. Here you can also create folders and subfolders to organize your files",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705527264/Portfolio/726shots_so_bjwehm.png",
"image": "images/portfolio/cloud-box.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "NodeJs", "image": "nodejs.png" },
{ "name": "MongoDB", "image": "mongo.png" },
{ "name": "Docker", "image": "docker.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "NodeJs", "image": "nodejs.webp" },
{ "name": "MongoDB", "image": "mongo.webp" },
{ "name": "Docker", "image": "docker.webp" }
],
"urlGithub": "https://github.com/marcode24/cloudbox-frontend",
"urlProduction": "https://cloudbox-m.netlify.app/"
},
{
"name": "InfoReader App",
"description": "This is a web application that allows you to read technology news, using RSS feeds from different sources and saving them in a database. It also allows you to create a user account and save your favorite news.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705811570/Portfolio/504shots_so_imzfwr.png",
"image": "images/portfolio/inforeader.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "NodeJs", "image": "nodejs.png" },
{ "name": "MongoDB", "image": "mongo.png" },
{ "name": "Docker", "image": "docker.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "NodeJs", "image": "nodejs.webp" },
{ "name": "MongoDB", "image": "mongo.webp" },
{ "name": "Docker", "image": "docker.webp" }
],
"urlGithub": "https://github.com/marcode24/InfoReader-App",
"urlProduction": "https://inforeader.netlify.app/"
},
{
"name": "Smart Dental",
"description": "This application allows you to manage a dental clinic, it allows you to guide a history of the patient, manage the appointments, inventory, employees and patients.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705811699/Portfolio/216shots_so_ixmmow.png",
"image": "images/portfolio/smart-dental.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "NestJs", "image": "nestjs.png" },
{ "name": "MySQL", "image": "mysql.png" },
{ "name": "Docker", "image": "docker.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "NestJs", "image": "nestjs.webp" },
{ "name": "MySQL", "image": "mysql.webp" },
{ "name": "Docker", "image": "docker.webp" }
],
"urlGithub": "https://github.com/marcode24/smart-dental-frontend",
"urlProduction": "https://smart-dental-a704f.web.app/"
"urlProduction": "https://smart-dental.netlify.app/"
},
{
"name": "Bon Appetito App",
"description": "Here you can buy or build your own pizza, choose the ingredients and the size of the pizza, and then you can order it.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705812238/Portfolio/768shots_so_eay7aj.png",
"image": "images/portfolio/bon-appetito.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "TypeScript", "image": "ts.png" },
{ "name": "SASS", "image": "sass.png" },
{ "name": "HTML", "image": "html.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "TypeScript", "image": "ts.webp" },
{ "name": "SASS", "image": "sass.webp" },
{ "name": "HTML", "image": "html.webp" }
],
"urlGithub": "https://github.com/marcode24/bon-appetito",
"urlProduction": "https://bon-appetito.netlify.app/"
},
{
"name": "Guess Word Game",
"description": "This a game where you have to guess the answer to a question. Depending on the difficulty level, you will have a certain number of attempts to guess the answer. The game ends when you run out of attempts or you guess the answer correctly",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705958849/Portfolio/qbvnsvant4lberbsvcob.png",
"image": "images/portfolio/guess-word.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "NodeJs", "image": "nodejs.png" },
{ "name": "SASS", "image": "sass.png" },
{ "name": "MongoDB", "image": "mongo.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "NodeJs", "image": "nodejs.webp" },
{ "name": "SASS", "image": "sass.webp" },
{ "name": "MongoDB", "image": "mongo.webp" }
],
"urlGithub": "https://github.com/marcode24/GuessWord-Game",
"urlProduction": "https://wordguess-game.netlify.app/"
},
{
"name": "Twitter Clone",
"description": "This is a clone of the Twitter application, it allows you to create a user account, post tweets, follow other users, like tweets, etc.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705812645/Portfolio/236shots_so_dynxet.png",
"image": "images/portfolio/twitter-clone.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "NodeJs", "image": "nodejs.png" },
{ "name": "SASS", "image": "sass.png" },
{ "name": "MongoDB", "image": "mongo.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "NodeJs", "image": "nodejs.webp" },
{ "name": "SASS", "image": "sass.webp" },
{ "name": "MongoDB", "image": "mongo.webp" }
],
"urlGithub": "https://github.com/marcode24/twitter-clone",
"urlProduction": "https://twitter-clone-challenge.netlify.app/"
},
{
"name": "Memory Game",
"description": "This is a memory game, you have to find the pairs of cards, you have 3 levels of difficulty, easy, medium and hard.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705812759/Portfolio/103shots_so_j62bcm.png",
"image": "images/portfolio/memory-game.webp",
"technologies": [
{ "name": "HTML", "image": "html.png" },
{ "name": "CSS", "image": "css.png" },
{ "name": "JavaScript", "image": "js.png" }
{ "name": "HTML", "image": "html.webp" },
{ "name": "CSS", "image": "css.webp" },
{ "name": "JavaScript", "image": "js.webp" }
],
"urlGithub": "https://github.com/marcode24/memory-game",
"urlProduction": "https://marcode24.github.io/memory-game/"
},
{
"name": "Unit Converter",
"description": "This is a unit converter, you can convert from one unit to another, it has different categories, such as length, weight, volume, etc.",
"image": "https://res.cloudinary.com/dfeujtobk/image/upload/v1705813173/Portfolio/821shots_so_qhpsfq.png",
"image": "images/portfolio/unit-converter.webp",
"technologies": [
{ "name": "Angular", "image": "angular.png" },
{ "name": "TypeScript", "image": "ts.png" },
{ "name": "SASS", "image": "sass.png" },
{ "name": "HTML", "image": "html.png" }
{ "name": "Angular", "image": "angular.webp" },
{ "name": "TypeScript", "image": "ts.webp" },
{ "name": "SASS", "image": "sass.webp" },
{ "name": "HTML", "image": "html.webp" }
],
"urlGithub": "https://github.com/marcode24/Unit-Converter",
"urlProduction": "https://unit-converter-site.netlify.app/"
Expand Down
48 changes: 24 additions & 24 deletions src/data/skills.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,128 +2,128 @@
"cardsDataFrontend": [
{
"name": "HTML",
"imagePath": "images/html.png",
"imagePath": "images/html.webp",
"alt": "html"
},
{
"name": "CSS 3",
"imagePath": "images/css.png",
"imagePath": "images/css.webp",
"alt": "css"
},
{
"name": "JavaScript",
"imagePath": "images/js.png",
"imagePath": "images/js.webp",
"alt": "js"
},
{
"name": "TypeScript",
"imagePath": "images/ts.png",
"imagePath": "images/ts.webp",
"alt": "ts"
},
{
"name": "Angular",
"imagePath": "images/angular.png",
"imagePath": "images/angular.webp",
"alt": "angular"
},
{
"name": "Astro",
"imagePath": "images/astro.png",
"imagePath": "images/astro.webp",
"alt": "astro"
},
{
"name": "Svelte",
"imagePath": "images/svelte.png",
"imagePath": "images/svelte.webp",
"alt": "svelte"
},
{
"name": "SASS",
"imagePath": "images/sass.png",
"imagePath": "images/sass.webp",
"alt": "scss"
},
{
"name": "Bootstrap",
"imagePath": "images/bootstrap.png",
"imagePath": "images/bootstrap.webp",
"alt": "bootstrap"
}
],
"cardsDataBackend": [
{
"name": "Nodejs",
"imagePath": "images/nodejs.png",
"imagePath": "images/nodejs.webp",
"alt": "nodejs"
},
{
"name": "Nestjs",
"imagePath": "images/nestjs.png",
"imagePath": "images/nestjs.webp",
"alt": "nestjs"
},
{
"name": "MongoDB",
"imagePath": "images/mongo.png",
"imagePath": "images/mongo.webp",
"alt": "mongodb"
},
{
"name": "PostgreSql",
"imagePath": "images/postgresql.png",
"imagePath": "images/postgresql.webp",
"alt": "postgresql"
},
{
"name": "Sql Server",
"imagePath": "images/sqlserver.png",
"imagePath": "images/sqlserver.webp",
"alt": "sqlserver"
},
{
"name": "MySql",
"imagePath": "images/mysql.png",
"imagePath": "images/mysql.webp",
"alt": "mysql"
},
{
"name": "Docker",
"imagePath": "images/docker.png",
"imagePath": "images/docker.webp",
"alt": "docker"
}
],
"cardsDataOthers": [
{
"name": "Git",
"imagePath": "images/git.png",
"imagePath": "images/git.webp",
"alt": "git"
},
{
"name": "Azure",
"imagePath": "images/azure.png",
"imagePath": "images/azure.webp",
"alt": "azure"
},
{
"name": "Figma",
"imagePath": "images/figma.png",
"imagePath": "images/figma.webp",
"alt": "figma"
},
{
"name": "Postman",
"imagePath": "images/postman.png",
"imagePath": "images/postman.webp",
"alt": "postman"
},
{
"name": "Jest",
"imagePath": "images/jest.png",
"imagePath": "images/jest.webp",
"alt": "jest"
},
{
"name": "Jasmine",
"imagePath": "images/jasmine.png",
"imagePath": "images/jasmine.webp",
"alt": "jasmine"
}
],
"cardsDataLearning": [
{
"name": "Vue",
"imagePath": "images/vue.png",
"imagePath": "images/vue.webp",
"alt": "vue"
},
{
"name": "Tailwind",
"imagePath": "images/tailwind.png",
"imagePath": "images/tailwind.webp",
"alt": "tailwind"
}
]
Expand Down
Loading

0 comments on commit c3d3f17

Please sign in to comment.