From fcfed7842ec75d0026913bffee8c3eb6c0a50c01 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Thu, 4 Jun 2020 00:04:32 +0200 Subject: [PATCH] added services template updated .drone.yml --- .drone.yml | 13 ++- .eleventy.js | 3 +- img/matrix.png | Bin 0 -> 4355 bytes package-lock.json | 149 +++++++++++++++++++++++++------ scss/main.scss | 58 +++++++++++- sites/_data/services.json | 60 +++++++++++++ sites/_data/site.js | 5 +- sites/_includes/layouts/base.njk | 10 ++- sites/de/about.html | 11 +-- sites/de/projects.html | 11 +++ sites/de/recommendations.html | 9 +- sites/de/services.html | 24 ++++- sites/de/services/invidous.md | 8 ++ sites/de/services/searx.md | 8 ++ sites/en/about.html | 10 --- sites/en/services.html | 23 ++++- 16 files changed, 340 insertions(+), 62 deletions(-) create mode 100644 img/matrix.png create mode 100644 sites/_data/services.json create mode 100644 sites/de/projects.html create mode 100644 sites/de/services/invidous.md create mode 100644 sites/de/services/searx.md delete mode 100644 sites/en/about.html diff --git a/.drone.yml b/.drone.yml index 155cddd..d50bcbf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: default +name: build steps: - name: build @@ -9,6 +9,12 @@ steps: - npm install - npm run build +--- +kind: pipeline +type: docker +name: deploy + +steps: - name: deploy image: alpine environment: @@ -22,6 +28,9 @@ steps: - which lftp || ( apk --update add lftp ) - lftp -e "mirror -R ./dist/ sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST +depends_on: + - build + trigger: branch: - - master \ No newline at end of file + - master diff --git a/.eleventy.js b/.eleventy.js index c7ce05e..96f2620 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -9,6 +9,7 @@ module.exports = function(eleventyConfig) { "img": "img", "font": "font", "node_modules/@fortawesome/fontawesome-free/webfonts/": "font", + "node_modules/fork-awesome/fonts/": "font", "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags" }); @@ -24,4 +25,4 @@ module.exports = function(eleventyConfig) { output: "dist" } }; -}; \ No newline at end of file +}; diff --git a/img/matrix.png b/img/matrix.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca178a0a56a9e9a7ca190c299d6d5889bbe2657 GIT binary patch literal 4355 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 - + @@ -50,7 +50,7 @@ title: sp-codes {% for language in site.languages %} {% set translatedUrl = "/" + language.code + "/" %} {% for item in collections.all %} - {% if item.data.key == key and item.data.locale == language.code %} + {% if item.data.key == key and item.data.locale == language.code and not item.data.hidden %} {% set translatedUrl = item.url %} {% endif %} {% endfor%} @@ -62,7 +62,9 @@ title: sp-codes {% endfor %}
- {{ content | safe }} +
+ {{ content | safe }} +
Samuel Philipp
@@ -72,4 +74,4 @@ title: sp-codes
Code
- \ No newline at end of file + diff --git a/sites/de/about.html b/sites/de/about.html index dc67b33..d09ea03 100644 --- a/sites/de/about.html +++ b/sites/de/about.html @@ -2,9 +2,10 @@ layout: base.njk key: about title: Über -eleventyNavigation: - key: about - title: Über - order: 1 +#eleventyNavigation: +# key: about +# title: Über +# order: 1 --- -

Über mich

\ No newline at end of file +

Über mich

+Comming soon! diff --git a/sites/de/projects.html b/sites/de/projects.html new file mode 100644 index 0000000..2154ce4 --- /dev/null +++ b/sites/de/projects.html @@ -0,0 +1,11 @@ +--- +layout: base.njk +key: projects +title: Projekte +#eleventyNavigation: +# key: projects +# title: Projekte +# order: 4 +--- +

Projekte

+Comming soon! diff --git a/sites/de/recommendations.html b/sites/de/recommendations.html index d7f1ced..1101887 100644 --- a/sites/de/recommendations.html +++ b/sites/de/recommendations.html @@ -2,9 +2,10 @@ layout: base.njk key: recommendations title: Empfehlungen -eleventyNavigation: - key: recommendations - title: Empfehlungen - order: 2 +#eleventyNavigation: +# key: recommendations +# title: Empfehlungen +# order: 2 ---

Empfehlungen

+Comming soon! diff --git a/sites/de/services.html b/sites/de/services.html index e0f8e18..697f177 100644 --- a/sites/de/services.html +++ b/sites/de/services.html @@ -5,6 +5,28 @@ title: Dienste eleventyNavigation: key: services title: Dienste + icon: server order: 2 --- -

Services

+
+ Status +

Dienste

+

In meiner Freizeit stelle ich verschiedene quelloffene Dienste für die freie Nutzung bereit. Hier finden Sie eine + Übersicht der einzelnen Services und jeweils eine kurze Beschreibung. Alle Services werden in Deutschland + gehostet. Fühlen Sie sich frei davon Gebrauch zu machen.

+
+ {%- for service in services %} +
+
+ +
+ +

{{service.name}}{% if service.url %} {% endif %}

+
{{service.summary[locale]}}
+
+
+
+ {%- endfor %} +
+
diff --git a/sites/de/services/invidous.md b/sites/de/services/invidous.md new file mode 100644 index 0000000..753ddb9 --- /dev/null +++ b/sites/de/services/invidous.md @@ -0,0 +1,8 @@ +--- +layout: base.njk +key: invidious +title: Invidious +--- +# Invidious + +Die Beschreibung zu Invidious folgt in Kürze. diff --git a/sites/de/services/searx.md b/sites/de/services/searx.md new file mode 100644 index 0000000..847c423 --- /dev/null +++ b/sites/de/services/searx.md @@ -0,0 +1,8 @@ +--- +layout: base.njk +key: searx +title: Searx +--- +# Searx + +Die Beschreibung zu Searx folgt in Kürze. diff --git a/sites/en/about.html b/sites/en/about.html deleted file mode 100644 index f624c29..0000000 --- a/sites/en/about.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: base.njk -key: about -title: About -eleventyNavigation: - key: about - title: About - order: 1 ---- -

About me

\ No newline at end of file diff --git a/sites/en/services.html b/sites/en/services.html index 51d1cd7..a0d7181 100644 --- a/sites/en/services.html +++ b/sites/en/services.html @@ -5,6 +5,27 @@ title: Services eleventyNavigation: key: services title: Services + icon: server order: 2 --- -

Services

+
+ Status +

Services

+

In my spare time I provide various open source services for free. Here you can find an overview of the individual + services and a short description for each of them. All services are hosted in Germany. Feel free to use it.

+
+ {%- for service in services %} +
+
+ +
+ +

{{service.name}}{% if service.url %} {% endif %}

+
{{service.summary[locale]}}
+
+
+
+ {%- endfor %} +
+