Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/follow-redirects-1…
Browse files Browse the repository at this point in the history
….14.8
  • Loading branch information
camillaborges committed Apr 19, 2022
2 parents 27caedd + 7deee65 commit ff9a112
Show file tree
Hide file tree
Showing 13 changed files with 99 additions and 88 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ git clone https://github.com/[replace-with-your-github-username]/live-resume.git

5. Inner the folder of the cloned project, start the application:
```
ng serve -o --host 0.0.0.0 --configuration=en
ng serve -o --host 0.0.0.0 --configuration en
```
**Note:** the optional parameters:
* `-o` aliases for opening the default browser as soon the application is served.
Expand Down
4 changes: 4 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,21 @@
]
},
"en": {
"aot": true,
"localize": [
"en"
],
"outputPath": "dist/en/",
"baseHref": "/en/",
"i18nMissingTranslation": "error"
},
"pt": {
"aot": true,
"localize": [
"pt"
],
"outputPath": "dist/pt/",
"baseHref": "/pt/",
"i18nMissingTranslation": "error"
},
"es5": {
Expand Down
6 changes: 6 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
rm -rf ./dist
npm run build-locale --prod --aot
aws s3 rm s3://www.guilhermeborgesbastos.com --recursive
aws s3 cp ./dist/en s3://www.guilhermeborgesbastos.com --recursive
aws s3 cp ./dist/pt s3://www.guilhermeborgesbastos.com --recursive
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"start:en": "ng serve --configuration=en",
"start:pt": "ng serve --configuration=pt",
"start:en": "ng serve --configuration en",
"start:pt": "ng serve --configuration pt",
"build": "ng build",
"build:en": "ng build --configuration=en",
"build:pt": "ng build --configuration=pt",
"build:en": "ng build --configuration en",
"build:pt": "ng build --configuration pt",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"int:extract": "ng xi18n --output-path src/locales",
"build-locale:en": "ng build --prod --configuration=en",
"build-locale:pt": "ng build --prod --configuration=pt",
"build-locale:en": "ng build --configuration en",
"build-locale:pt": "ng build --configuration pt",
"build-locale": "npm run build-locale:en && npm run build-locale:pt"
},
"private": true,
Expand Down
9 changes: 5 additions & 4 deletions src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
<li><a (click)="resetMenu()" href="#experience" i18n="nav@@experiences" itemprop="url"><span itemprop="name">Experiences</span></a></li>
<li><a (click)="resetMenu()" href="#posts" i18n="nav@@posts" itemprop="url"><span itemprop="name">Posts</span></a></li>
<li><a (click)="resetMenu()" href="#contact" i18n="nav@@contact" itemprop="url"><span itemprop="name">Contact</span></a></li>
<li><a (click)="resetMenu()" href="https://assets.guilhermeborgesbastos.com/live-resume/cv-english-guilherme-bastos-v2.0.pdf" i18n-title="nav@@open.as.pdf" title="Open Resume as PDF" target="_blank"><fa-icon [icon]="faCloudDownloadAlt" class="bar-icon"></fa-icon></a></li>
<!-- TODO: update here -->
<li><a (click)="resetMenu()" href="assets/cv-english-guilherme-bastos-v2.0.pdf" i18n-title="nav@@open.as.pdf" title="Open Resume as PDF" target="_blank"><fa-icon [icon]="faCloudDownloadAlt" class="bar-icon"></fa-icon></a></li>
</ul>
</div>

<div class="child language-container">
<div class="frame">
<ul>
<li itemprop="availableLanguage" itemscope itemtype="https://schema.org/Language">
<a href="/en" [ngClass]="{'active': locale === 'en'}" itemprop="name">EN</a>
<a href="/en/index.html" [ngClass]="{'active': locale === 'en'}" itemprop="name">EN</a>
</li>
<li itemprop="availableLanguage" itemscope itemtype="https://schema.org/Language">
<a href="/pt" [ngClass]="{'active': locale === 'pt'}" itemprop="name">PT</a>
<a href="/pt/index.html" [ngClass]="{'active': locale === 'pt'}" itemprop="name">PT</a>
</li>
</ul>
</div>
Expand All @@ -35,4 +36,4 @@
<fa-icon [icon]="faShareAlt" class="icon" (click)="share()" alt="share" itemprop="share"></fa-icon>
</div>

</header>
</header>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="skills">
<img loading="lazy" class="background" src="/assets/template/welcome/illustration-back.png" alt="Background circle"/>
<img loading="lazy" class="skill-icon first" src="/assets/template/welcome/icons/docker.svg" alt="Docker"/>
<img loading="lazy" class="skill-icon second" src="/assets/template/welcome/icons/css3.svg" alt="CSS3"/>
<img loading="lazy" class="skill-icon third" src="/assets/template/welcome/icons/git.svg" alt="Git"/>
<img loading="lazy" class="skill-icon fourth" src="/assets/template/welcome/icons/html5.svg" alt="HTML5"/>
<img loading="lazy" class="skill-icon fifth" src="/assets/template/welcome/icons/sql.svg" alt="SQL"/>
<img loading="lazy" class="skill-icon sixth" src="/assets/template/welcome/icons/php.svg" alt="PHP"/>
<img loading="lazy" class="skill-icon seventh" src="/assets/template/welcome/icons/java.svg" alt="JAVA"/>
<img loading="lazy" class="skill-icon eighth" src="/assets/template/welcome/icons/bitbucket.svg" alt="BitBucket"/>
<img loading="lazy" class="skill-icon ninth" src="/assets/template/welcome/icons/android.svg" alt="Android"/>
</div>
<img loading="lazy" class="background" src="assets/template/welcome/illustration-back.png" alt="Background circle"/>
<img loading="lazy" class="skill-icon first" src="assets/template/welcome/icons/docker.svg" alt="Docker"/>
<img loading="lazy" class="skill-icon second" src="assets/template/welcome/icons/css3.svg" alt="CSS3"/>
<img loading="lazy" class="skill-icon third" src="assets/template/welcome/icons/git.svg" alt="Git"/>
<img loading="lazy" class="skill-icon fourth" src="assets/template/welcome/icons/html5.svg" alt="HTML5"/>
<img loading="lazy" class="skill-icon fifth" src="assets/template/welcome/icons/sql.svg" alt="SQL"/>
<img loading="lazy" class="skill-icon sixth" src="assets/template/welcome/icons/php.svg" alt="PHP"/>
<img loading="lazy" class="skill-icon seventh" src="assets/template/welcome/icons/java.svg" alt="JAVA"/>
<img loading="lazy" class="skill-icon eighth" src="assets/template/welcome/icons/bitbucket.svg" alt="BitBucket"/>
<img loading="lazy" class="skill-icon ninth" src="assets/template/welcome/icons/android.svg" alt="Android"/>
</div>
2 changes: 1 addition & 1 deletion src/app/welcome/welcome.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="welcome">
<div class="layer_one">
<div class="avatar-container">
<img loading="lazy" class="illustration" src="../../../assets/template/welcome/{{characterIllustration}}" alt="{{characterName}}"/>
<img loading="lazy" class="illustration" src="assets/template/welcome/{{characterIllustration}}" alt="{{characterName}}"/>
<app-welcome-background></app-welcome-background>
</div>
<app-welcome-dialog></app-welcome-dialog>
Expand Down
Binary file added src/assets/cv-english-guilherme-bastos-v2.0.pdf
Binary file not shown.
26 changes: 13 additions & 13 deletions src/assets/data/experiences.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"endAt": "12-24-2010",
"companyName": "Fácil Tecnologias",
"website": "http://www.faciltecnologias.com.br/",
"logo": "../../assets/template/experience/logo/facil-logo.png",
"logo": "assets/template/experience/logo/facil-logo.png",
"internationalizations": [
{
"language": "pt",
Expand All @@ -33,7 +33,7 @@
"http": "https://www.facebook.com/editoranossotransito/"
}
],
"backgroundUrl": "../../assets/template/experience/uberaba.jpg"
"backgroundUrl": "assets/template/experience/uberaba.jpg"
},
{
"id": 2,
Expand All @@ -42,7 +42,7 @@
"endAt": "06-16-2014",
"companyName": "E-tática",
"website": "https://www.e-tatica.com/",
"logo": "../../assets/template/experience/logo/etatica-logo.png",
"logo": "assets/template/experience/logo/etatica-logo.png",
"internationalizations": [
{
"language": "pt",
Expand Down Expand Up @@ -79,7 +79,7 @@
"http": "https://www.instagram.com/somos_etatica/"
}
],
"backgroundUrl": "../../assets/template/experience/rio.jpg"
"backgroundUrl": "assets/template/experience/rio.jpg"
},
{
"id": 3,
Expand All @@ -88,7 +88,7 @@
"endAt": "12-23-2016",
"companyName": "Deevo Studio",
"website": "http://deevo.com.br/",
"logo": "../../assets/template/experience/logo/deevo-logo.png",
"logo": "assets/template/experience/logo/deevo-logo.png",
"internationalizations": [
{
"language": "pt",
Expand All @@ -115,15 +115,15 @@
"http": "https://www.linkedin.com/company/deevo/about/"
}
],
"backgroundUrl": "../../assets/template/experience/sao-paulo.jpg"
"backgroundUrl": "assets/template/experience/sao-paulo.jpg"
},
{
"id": 4,
"position": 4,
"startAt": "01-02-2017",
"endAt": "11-30-2017",
"companyName": "Skydreamer",
"logo": "../../assets/template/experience/logo/skydreamer-logo.png",
"logo": "assets/template/experience/logo/skydreamer-logo.png",
"internationalizations": [
{
"language": "pt",
Expand Down Expand Up @@ -155,7 +155,7 @@
"http": "https://www.facebook.com/skydreamer.io/"
}
],
"backgroundUrl": "../../assets/template/experience/utrecht.jpg"
"backgroundUrl": "assets/template/experience/utrecht.jpg"
},
{
"id": 5,
Expand All @@ -164,7 +164,7 @@
"endAt": "04-15-2020",
"companyName": "QAT Global",
"website": "https://www.qat.com/",
"logo": "../../assets/template/experience/logo/qat-global-logo.png",
"logo": "assets/template/experience/logo/qat-global-logo.png",
"internationalizations": [
{
"language": "pt",
Expand Down Expand Up @@ -201,15 +201,15 @@
"http": "https://www.youtube.com/c/QatGlobal-USA"
}
],
"backgroundUrl": "../../assets/template/experience/uberaba.jpg"
"backgroundUrl": "assets/template/experience/uberaba.jpg"
},
{
"id": 6,
"position": 6,
"startAt": "05-01-2020",
"companyName": "Swisscom AG",
"website": "https://www.swisscom.ch/",
"logo": "../../assets/template/experience/logo/swisscom-logo.png",
"logo": "assets/template/experience/logo/swisscom-logo.png",
"internationalizations": [
{
"language": "pt",
Expand Down Expand Up @@ -246,6 +246,6 @@
"http": "https://www.youtube.com/swisscom"
}
],
"backgroundUrl": "../../assets/template/experience/rotterdam.jpg"
"backgroundUrl": "assets/template/experience/rotterdam.jpg"
}
]
]
20 changes: 10 additions & 10 deletions src/assets/data/posts.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"thumbnail": "../../assets/posts/post-11-03-2019.jpg",
"thumbnail": "assets/posts/post-11-03-2019.jpg",
"http": "https://www.linkedin.com/pulse/anti-traversing-2d-array-formula-guilherme-borges-bastos/",
"date": "11-03-2019",
"internationalizations": [
Expand All @@ -17,7 +17,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-01-15-2019.jpg",
"thumbnail": "assets/posts/post-01-15-2019.jpg",
"http": "https://www.linkedin.com/pulse/em-2019-saia-do-desemprego-seja-voc%C3%AA-um-web-developer-borges-bastos/",
"date": "01-15-2019",
"internationalizations": [
Expand All @@ -34,7 +34,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-07-10-2016.jpg",
"thumbnail": "assets/posts/post-07-10-2016.jpg",
"http": "https://www.linkedin.com/pulse/map-item-navigation-android-opensource-en-guilherme-borges-bastos/",
"date": "07-10-2016",
"internationalizations": [
Expand All @@ -51,7 +51,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-05-07-2016.jpg",
"thumbnail": "assets/posts/post-05-07-2016.jpg",
"http": "https://www.linkedin.com/pulse/geo-distance-search-mysql-php-guilherme-borges-bastos/",
"date": "05-07-2016",
"internationalizations": [
Expand All @@ -68,7 +68,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-06-18-2016.jpg",
"thumbnail": "assets/posts/post-06-18-2016.jpg",
"http": "https://www.linkedin.com/pulse/envio-de-e-mail-autenticado-php-guilherme-borges-bastos/",
"date": "06-18-2016",
"internationalizations": [
Expand All @@ -85,7 +85,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-06-04-2016.jpg",
"thumbnail": "assets/posts/post-06-04-2016.jpg",
"http": "https://www.linkedin.com/pulse/sharing-android-6-opensource-download-guilherme-borges-bastos/",
"date": "06-04-2016",
"internationalizations": [
Expand All @@ -102,7 +102,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-05-28-2016.jpg",
"thumbnail": "assets/posts/post-05-28-2016.jpg",
"http": "https://www.linkedin.com/pulse/capturing-contact-list-android-open-source-en-borges-bastos/",
"date": "05-28-2016",
"internationalizations": [
Expand All @@ -119,7 +119,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-05-14-2016.jpg",
"thumbnail": "assets/posts/post-05-14-2016.jpg",
"http": "https://www.linkedin.com/pulse/tinder-slide-card-android-open-source-en-guilherme-borges-bastos/",
"date": "05-14-2016",
"internationalizations": [
Expand All @@ -136,7 +136,7 @@
]
},
{
"thumbnail": "../../assets/posts/post-05-21-2016.jpg",
"thumbnail": "assets/posts/post-05-21-2016.jpg",
"http": "https://www.linkedin.com/pulse/push-notification-para-android-totorial-open-source-borges-bastos/",
"date": "05-21-2016",
"internationalizations": [
Expand All @@ -152,4 +152,4 @@
}
]
}
]
]
41 changes: 41 additions & 0 deletions src/assets/fonts/_fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@font-face {
font-family: 'Montserrat';
src: url('./black/Montserrat-Black.woff2') format('woff2'), url('./black/Montserrat-Black.woff') format('woff');
font-weight: 900;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('./thin/Montserrat-Thin.woff2') format('woff2'), url('./thin/Montserrat-Thin.woff') format('woff');
font-weight: 100;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('./semi-bold/Montserrat-SemiBold.woff2') format('woff2'), url('./semi-bold/Montserrat-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('./bold/Montserrat-Bold.woff2') format('woff2'), url('./bold/Montserrat-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('./regular/Montserrat-Regular.woff2') format('woff2'), url('./regular/Montserrat-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('./italic/Montserrat-Italic.woff2') format('woff2'), url('./italic/Montserrat-Italic.woff') format('woff');
font-weight: normal;
font-style: italic;
}
Loading

0 comments on commit ff9a112

Please sign in to comment.