Skip to content

Commit

Permalink
Merge pull request #31 from theophane-girard/develop
Browse files Browse the repository at this point in the history
migrate to esbuild and update email
  • Loading branch information
theophane-girard authored Nov 20, 2023
2 parents efad01b + 19981c3 commit 4361abe
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 35 deletions.
15 changes: 4 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,15 @@
"prefix": "cv",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": [
"zone.js"
],
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"node_modules/font-awesome/css/font-awesome.min.css",
"src/styles.scss"
Expand All @@ -64,9 +59,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand Down
16 changes: 10 additions & 6 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ import { WaveBackground } from './wave-separator/data/wave.types';
[backgroundColor]="homeBackgroundColor"
[colors]="firstColors"
/>
<cv-xp [backgroundColor]="secondBackgroundColor"/>
<cv-wave-separator
[backgroundColor]="secondBackgroundColor"
[colors]="secondColors"
/>
<cv-hobbies [backgroundColor]="homeBackgroundColor"/>
@defer() {
<cv-xp [backgroundColor]="secondBackgroundColor"/>
<cv-wave-separator
[backgroundColor]="secondBackgroundColor"
[colors]="secondColors"
/>
}
@defer() {
<cv-hobbies [backgroundColor]="homeBackgroundColor"/>
}
`,
standalone: true,
styleUrls: ['./app.component.scss'],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "sass:math";

@use './src/assets/global';
@use 'src/assets/global.scss';

#scout-picture {
$scouting-picture-width: 40em;
Expand Down
2 changes: 1 addition & 1 deletion src/app/hobbies/hobbies.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

section {
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion src/app/hobbies/ui/components/cliff/cliff.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#cliff-top {
z-index: 2;
Expand Down
2 changes: 1 addition & 1 deletion src/app/hobbies/ui/components/grass/grass.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

$dark-grass-blade-background: #00642d;
$light-grass-blade-background: #009a46;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#container {
width: global.$pine-tree-width;
Expand Down
2 changes: 1 addition & 1 deletion src/app/hobbies/ui/components/sky/sky.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

.star {
border-radius: 50%;
Expand Down
2 changes: 1 addition & 1 deletion src/app/hobbies/ui/components/tent/tent.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#tent {
width: global.$tent-width;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "sass:math";

@use './src/assets/global';
@use 'src/assets/global.scss';

section {
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/home.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#content {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/ui/clock/clock.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "sass:math";

@use './src/assets/global';
@use 'src/assets/global.scss';

$hand-color: black;
$clock-width: 2.66em;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/ui/laptop/laptop.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';
@use 'sass:math';

$html-logo-glow: white;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/ui/me/me.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#left-arm {
transform-origin: center;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/ui/mug/mug.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "sass:math";

@use './src/assets/global';
@use 'src/assets/global.scss';

#mug {
width: global.$mug-width;
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/ui/plant/plant.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';
@use "sass:math";

$jar-background: orange;
Expand Down
4 changes: 2 additions & 2 deletions src/app/home/ui/socials/socials.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FlexDirective } from '@shared/ui/directives/flex.directive';
template: `
<div id="contact-container" flex>
<a
href="mailto:theophane.girard@pm.me"
href="mailto:girard[email protected]"
class="contact-logo margin-1em justify-content-center align-items-center"
id="mail-logo-container"
target="_blank"
Expand All @@ -21,7 +21,7 @@ import { FlexDirective } from '@shared/ui/directives/flex.directive';
priority
width="50"
height="25"
alt="theophane.girard@pm.me"
alt="girard[email protected]"
/>
</a>
<div class="margin-1em">
Expand Down
2 changes: 1 addition & 1 deletion src/app/xp/xp.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './src/assets/global';
@use 'src/assets/global.scss';

#timeline-container {
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* You can add global styles to this file, and also import other style files */
@use './src/assets/global';
@use 'src/assets/global.scss';

div {
margin: 0;
Expand Down

0 comments on commit 4361abe

Please sign in to comment.