From c86542dabfe85db835b86502d2abe323d28c10ad Mon Sep 17 00:00:00 2001 From: Gianmarco Pettinato Date: Sun, 15 May 2022 18:12:58 +0200 Subject: [PATCH] add blog --- Jenkinsfile | 14 +++- package-lock.json | 38 +++++++++ package.json | 3 +- src/elements/AboutMe.svelte | 2 +- src/elements/Contacts.svelte | 3 +- src/elements/JobElement.svelte | 19 +---- src/elements/Jobs.svelte | 26 +++++- src/elements/Menu.svelte | 12 +-- src/elements/Training.svelte | 11 +-- src/model/job.d.ts | 5 +- src/model/schema.json | 3 + src/routes/blog.svelte | 0 src/routes/blog/[post].svelte | 124 +++++++++++++++++++++++++++++ src/routes/blog/index.svelte | 132 +++++++++++++++++++++++++++++++ src/routes/index.svelte | 42 +++++++++- static/blogPosts/2022-05-15.json | 18 +++++ 16 files changed, 410 insertions(+), 42 deletions(-) delete mode 100644 src/routes/blog.svelte create mode 100644 src/routes/blog/[post].svelte create mode 100644 src/routes/blog/index.svelte create mode 100644 static/blogPosts/2022-05-15.json diff --git a/Jenkinsfile b/Jenkinsfile index 81750b9..a8597ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,13 @@ -{ \ No newline at end of file +pipeline { + agent any + stages { + stage('Build') { + npm run build + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2770287..b5b8ca1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "svelte": "^3.42.6", "svelte-check": "^2.2.6", "svelte-jester": "^2.1.5", + "svelte-meta-tags": "^2.5.5", "svelte-preprocess": "^4.9.4", "svelte-preprocess-markdown": "^2.7.3", "svelte-scrollto": "^0.2.0", @@ -8212,6 +8213,15 @@ "node": ">=10" } }, + "node_modules/schema-dts": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/schema-dts/-/schema-dts-1.1.0.tgz", + "integrity": "sha512-vdmbs/5ycj4zyKpZIDqTcy+IZi4s7c38RVAYuDmRi7zgxUT8wRWPMLzg0jr7FjdVunYu9yZ00F3+XcZTTFcTOQ==", + "dev": true, + "peerDependencies": { + "typescript": ">=4.1.0" + } + }, "node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -8541,6 +8551,18 @@ "svelte": ">= 3" } }, + "node_modules/svelte-meta-tags": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/svelte-meta-tags/-/svelte-meta-tags-2.5.5.tgz", + "integrity": "sha512-15eS7pxg6i4FKZ4j8tUToEPjmcFReRbpQdapZ18rUq+vccw53/xEK4rFqqrH+JjR+SNRlLhuVYWLCzt2b+cjkQ==", + "dev": true, + "dependencies": { + "schema-dts": "1.1.0" + }, + "peerDependencies": { + "svelte": "^3.39.0" + } + }, "node_modules/svelte-preprocess": { "version": "4.9.7", "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.7.tgz", @@ -15558,6 +15580,13 @@ "xmlchars": "^2.2.0" } }, + "schema-dts": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/schema-dts/-/schema-dts-1.1.0.tgz", + "integrity": "sha512-vdmbs/5ycj4zyKpZIDqTcy+IZi4s7c38RVAYuDmRi7zgxUT8wRWPMLzg0jr7FjdVunYu9yZ00F3+XcZTTFcTOQ==", + "dev": true, + "requires": {} + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -15805,6 +15834,15 @@ "dev": true, "requires": {} }, + "svelte-meta-tags": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/svelte-meta-tags/-/svelte-meta-tags-2.5.5.tgz", + "integrity": "sha512-15eS7pxg6i4FKZ4j8tUToEPjmcFReRbpQdapZ18rUq+vccw53/xEK4rFqqrH+JjR+SNRlLhuVYWLCzt2b+cjkQ==", + "dev": true, + "requires": { + "schema-dts": "1.1.0" + } + }, "svelte-preprocess": { "version": "4.9.7", "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.7.tgz", diff --git a/package.json b/package.json index 7ee3220..c13e644 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "svelte": "^3.42.6", "svelte-check": "^2.2.6", "svelte-jester": "^2.1.5", + "svelte-meta-tags": "^2.5.5", "svelte-preprocess": "^4.9.4", "svelte-preprocess-markdown": "^2.7.3", "svelte-scrollto": "^0.2.0", @@ -46,4 +47,4 @@ "milligram": "^1.4.1", "punycode": "^2.1.1" } -} +} \ No newline at end of file diff --git a/src/elements/AboutMe.svelte b/src/elements/AboutMe.svelte index 340d52a..dbaa5c4 100644 --- a/src/elements/AboutMe.svelte +++ b/src/elements/AboutMe.svelte @@ -61,6 +61,6 @@ // border: solid 1px $border-color; border-radius: $default-border-radius; padding: 30px; - margin: 30px; + margin: 10px; } diff --git a/src/elements/Contacts.svelte b/src/elements/Contacts.svelte index 2977185..c3aa5eb 100644 --- a/src/elements/Contacts.svelte +++ b/src/elements/Contacts.svelte @@ -1,7 +1,7 @@
- profile + profile
  • @@ -37,7 +37,6 @@ // border: solid 1px $border-color; border-radius: $default-border-radius; padding: 30px; - margin: 30px; display: flex; flex-direction: column; justify-content: space-evenly; diff --git a/src/elements/JobElement.svelte b/src/elements/JobElement.svelte index a68d3d0..fb40208 100644 --- a/src/elements/JobElement.svelte +++ b/src/elements/JobElement.svelte @@ -58,10 +58,6 @@ diff --git a/src/elements/Jobs.svelte b/src/elements/Jobs.svelte index fb2da70..30891d6 100644 --- a/src/elements/Jobs.svelte +++ b/src/elements/Jobs.svelte @@ -2,13 +2,20 @@ import type { Schema } from 'src/model/job'; import JobElement from './JobElement.svelte'; export let currentLanguage = ''; + export let isBlogContainer = false; export let jobs: Schema[] = [];
    - {#each jobs as job} - - {/each} + {#if isBlogContainer} + {#each jobs as job} + + {/each} + {:else} + {#each jobs as job} +
    + {/each} + {/if}
    diff --git a/src/elements/Menu.svelte b/src/elements/Menu.svelte index 30c192a..adcbd1a 100644 --- a/src/elements/Menu.svelte +++ b/src/elements/Menu.svelte @@ -12,27 +12,27 @@
    - + {menu.home[currentLanguage]} - {menu.job[currentLanguage]} - {menu.school[currentLanguage]} - {menu.portfolio[currentLanguage]} - + >
    diff --git a/src/elements/Training.svelte b/src/elements/Training.svelte index abfbacc..18d2db4 100644 --- a/src/elements/Training.svelte +++ b/src/elements/Training.svelte @@ -25,18 +25,19 @@
diff --git a/src/routes/blog/index.svelte b/src/routes/blog/index.svelte new file mode 100644 index 0000000..a368022 --- /dev/null +++ b/src/routes/blog/index.svelte @@ -0,0 +1,132 @@ + + + + +
+ +
+ + +
+ +
+ +
+
+

{title[currentLanguage]}

+ +
+
+ + diff --git a/src/routes/index.svelte b/src/routes/index.svelte index c874025..38b9153 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,4 +1,5 @@ + +
@@ -73,12 +111,11 @@ justify-content: end; position: absolute; z-index: 999; - @media (max-width: $min-desktop) { + @media (max-width: $min-desktop) { width: 100%; position: unset; padding-bottom: 10px; background-color: $basecolor2; - } } .menu { @@ -104,7 +141,6 @@ margin-right: 5px; } .custom-button:hover { - background-color: $text-color; color: white; } diff --git a/static/blogPosts/2022-05-15.json b/static/blogPosts/2022-05-15.json new file mode 100644 index 0000000..473e113 --- /dev/null +++ b/static/blogPosts/2022-05-15.json @@ -0,0 +1,18 @@ +{ + "year": { + "start": "2022-05-15", + "end": "" + }, + "title": { + "en": "blog", + "it": "Il blog" + }, + "content": { + "en": "Articolo di prova in inglese", + "it": "Articolo di prova in italiano." + }, + "collaborators": [], + "languages": [], + "tecnologies": [], + "images": [] +} \ No newline at end of file