serguzim/reitanlage-oranienburg
1
0
Fork 0
Code Issues Pull requests Releases19 Wiki Activity Actions

Compare commits

..

No commits in common. "main" and "v1.4.2" have entirely different histories.
main ... v1.4.2

14 changed files with 14850 additions and 14825 deletions

29
.forgejo/workflows/release.yaml
View file

@ -1,29 +0,0 @@
on:
push:
tags:
- v**
jobs:
build-artifacts:
runs-on: docker
steps:
- uses: https://code.forgejo.org/actions/checkout@v3
- id: build
run: |
echo "@fontawesome:registry=https://git.serguzim.me/api/packages/fontawesome/npm/" > .npmrc
echo "//git.serguzim.me/api/packages/fontawesome/npm/:_authToken=${{ secrets.FORGEJO_TOKEN }}" >> .npmrc
mkdir /tmp/release-dir
npm install
npm run production
git add -f dist/
git stash
git config --global --add safe.directory ${{ github.workspace }}
git archive --format=zip 'stash@{0}' -o /tmp/release-dir/reitanlage-oranienburg-${{ github.ref_name }}.zip --prefix=reitanlage-oranienburg/
shell: bash
- uses: https://code.forgejo.org/actions/forgejo-release@v1
with:
direction: upload
release-dir: /tmp/release-dir
token: ${{ github.token }}

42
.woodpecker.yml Normal file
View file

@ -0,0 +1,42 @@
workspace:
base: /src/
path: reitanlage-oranienburg/
pipeline:
build_npm:
image: node:16.0.0
secrets: [ fontawesome_token ]
commands:
- echo "@fortawesome:registry=https://npm.fontawesome.com/" > .npmrc
- echo "//npm.fontawesome.com/:_authToken=$${FONTAWESOME_TOKEN}" >> .npmrc
- npm install
- npm run production
when:
event:
- tag
prepare_zip:
image: bitnami/git
commands:
- git add -f dist/
- git commit -m 'TEMP FOR CI'
- git config --global --add safe.directory /src/reitanlage-oranienburg
- git archive --format=zip HEAD -o /src/reitanlage-oranienburg-${CI_COMMIT_TAG}.zip --prefix=reitanlage-oranienburg/
when:
event:
- tag
release:
image: plugins/gitea-release
settings:
api_key:
from_secret: gitea_token
base_url: https://git.serguzim.me
files:
- /src/reitanlage-oranienburg-${CI_COMMIT_TAG}.zip
title: ${CI_COMMIT_TAG}
when:
event:
- tag
branches: main

5
CHANGELOG.md Normal file
View file

@ -0,0 +1,5 @@
# v0.1.0
## 12/21/2019
1. [](#new)
* ChangeLog started...

5
blueprints.yaml
View file

@ -1,5 +1,5 @@
name: Reitanlage Oranienburg
version: 1.5.0
version: 1.4.2
description: Design der Reitanlage Oranienburg
icon: rebel
author:
@ -31,9 +31,6 @@ form:
umami.url:
type: text
label: URL to load umami script from
umami.url_external_tracking:
type: text
label: URL to load umami external tracking script from
custom_logo:
type: file
label: Logo

25
package-lock.json generated
View file

@ -1,15 +1,15 @@
{
"name": "reitanlage-oranienburg",
"version": "1.4.6",
"version": "1.3.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "reitanlage-oranienburg",
"version": "1.4.6",
"version": "1.3.0",
"license": "Apache-2.0",
"dependencies": {
"@fontawesome/fontawesome-pro": "^6.2",
"@fortawesome/fontawesome-pro": "^6.2",
"@popperjs/core": "^2.11.6",
"autoprefixer": "^10.0",
"bootstrap": "^5.2",
@ -1599,10 +1599,13 @@
"node": ">=10.0.0"
}
},
"node_modules/@fontawesome/fontawesome-pro": {
"version": "6.5.2",
"resolved": "https://git.serguzim.me/api/packages/fontawesome/npm/%40fontawesome%2Ffontawesome-pro/-/6.5.2/fontawesome-pro-6.5.2.tgz",
"integrity": "sha512-pIoZIIPL1iiERi6tSAMcR6Xg4/kvxRgmLIig7RTBQGdEqYTNo8+dYsrWtpkL4CYxAIcsWwt0cLvigmG4SR945g=="
"node_modules/@fortawesome/fontawesome-pro": {
"version": "6.2.1",
"resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.2.1/fontawesome-pro-6.2.1.tgz",
"integrity": "sha512-dHk7iiCf5MCmoUvmrYzfN/I3gebpgpA1oqlOffgOThnsaAR4kpaQ5YMTdkdG99Of1hnN0Bok6R+HE28zXb3SOg==",
"engines": {
"node": ">=6"
}
},
"node_modules/@jridgewell/gen-mapping": {
"version": "0.3.2",
@ -9608,10 +9611,10 @@
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
},
"@fontawesome/fontawesome-pro": {
"version": "6.5.2",
"resolved": "https://git.serguzim.me/api/packages/fontawesome/npm/%40fontawesome%2Ffontawesome-pro/-/6.5.2/fontawesome-pro-6.5.2.tgz",
"integrity": "sha512-pIoZIIPL1iiERi6tSAMcR6Xg4/kvxRgmLIig7RTBQGdEqYTNo8+dYsrWtpkL4CYxAIcsWwt0cLvigmG4SR945g=="
"@fortawesome/fontawesome-pro": {
"version": "6.2.1",
"resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.2.1/fontawesome-pro-6.2.1.tgz",
"integrity": "sha512-dHk7iiCf5MCmoUvmrYzfN/I3gebpgpA1oqlOffgOThnsaAR4kpaQ5YMTdkdG99Of1hnN0Bok6R+HE28zXb3SOg=="
},
"@jridgewell/gen-mapping": {
"version": "0.3.2",

4
package.json
View file

@ -1,6 +1,6 @@
{
"name": "reitanlage-oranienburg",
"version": "1.5.0",
"version": "1.4.2",
"description": "The Reitanlage Oranienburg Theme for Grav CMS.",
"main": "index.js",
"scripts": {
@ -20,7 +20,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"@fontawesome/fontawesome-pro": "^6.2",
"@fortawesome/fontawesome-pro": "^6.2",
"@popperjs/core": "^2.11.6",
"autoprefixer": "^10.0",
"bootstrap": "^5.2",

48
src/css/sidebar.css
View file

@ -4,11 +4,7 @@
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE)
*/
#wrapper,
#sidebar-wrapper,
#menu-toggle-icon,
#menu-toggle,
.sidebar-nav {
#wrapper, #sidebar-wrapper, #menu-toggle-icon {
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
@ -61,6 +57,10 @@
padding: 0.5em;
text-align: center;
color: #fff;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
.content-wrapper {
@ -82,6 +82,10 @@
padding: 0;
padding-bottom: 3em;
list-style: none;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
#wrapper.toggled #sidebar-wrapper .sidebar-nav {
@ -153,11 +157,14 @@
height: 3em;
}
@media (min-width: 768px) {
@media (min-width: 576px) {
.sidebar-nav {
width: 0;
}
#sidebar-wrapper {
left: 250px;
width: 250px;
width: 3em;
height: 100%;
margin-left: -250px;
@ -166,7 +173,7 @@
#wrapper {
padding-top: 0em;
padding-left: 250px !important;
padding-left: 3em;
}
.content-wrapper {
@ -174,15 +181,28 @@
position: relative;
}
#wrapper #sidebar-wrapper .sidebar-nav {
#wrapper.toggled #menu-toggle-icon {
-moz-transform: scale(-1, 1);
-webkit-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
}
#wrapper.toggled #sidebar-wrapper {
width: 250px;
}
#wrapper.toggled {
padding-left: 250px;
}
#wrapper.toggled #sidebar-wrapper .sidebar-nav {
width: 100%;
}
#menu-toggle {
visibility: hidden;
}
.sidebar-nav>.sidebar-spacer {
height: 0;
width: auto;
text-align: right;
}
}

14
src/js/app.js
View file

@ -10,17 +10,3 @@ document.querySelector("#menu-toggle").onclick = function(e) {
e.preventDefault();
document.querySelector("#wrapper").classList.toggle("toggled");
};
let min_width_query = window.matchMedia("(min-width: 768px)");
function check_and_open_navbar(mwq) {
if (mwq.matches) {
document.querySelector("#wrapper").classList.add("toggled");
}
}
min_width_query.addEventListener("change", function(e) {
check_and_open_navbar(e);
});
check_and_open_navbar(min_width_query);

2
src/sass/app.scss
View file

@ -3,7 +3,7 @@ $primary: #2b3bb4;
@import '~bootstrap/scss/bootstrap';
// FontAwesome
@import '~@fontawesome/fontawesome-pro/css/all.css';
@import '~@fortawesome/fontawesome-pro/css/all.css';
// PhotoSwipe
@import '~photoswipe/dist/photoswipe.css';

4
templates/kontakt.html.twig
View file

@ -12,10 +12,8 @@
</div>
</div>
<div class="row">
<div class="col-12 h-100">
<div class="w-100" style="min-height: 300px">
<div class="col-12" style="height: 300px">
{% include 'partials/osm.html.twig' %}
</div>
</div>
</div>
{% endblock %}

6
templates/partials/base.html.twig
View file

@ -43,7 +43,7 @@
<header class="p-2 bg-ro text-white">
<div class="container">
<div class="row row-fixed-h mb-2">
<a href="/" class="col-12" data-umami-event="Header-Logo button">
<a href="/" class="col-12">
{% include 'partials/logo.html.twig' with {style: 'filter: invert(100%); margin-right: 0.5rem;'} %}
{% for media_item in header_page.media.images %}
{% set aspect = media_item.width / media_item.height %}
@ -79,6 +79,9 @@
<div class="row">
<p class="mx-auto w-auto">&#169; Heike Tischler</p>
</div>
<div class="row">
<p class="mx-auto w-auto">Diese Webseite nutzt <a target="_blank" rel="noopener" href="http://getgrav.org">Grav</a> von <a target="_blank" rel="noopener" href="http://www.rockettheme.com">RocketTheme</a>.</p>
</div>
</footer>
{% endblock %}
</footer>
@ -95,7 +98,6 @@
{% if theme_var('umami.enabled') %}
<script async defer data-website-id="{{ theme_var('umami.id') }}" src="{{ theme_var('umami.url') }}"></script>
<script async defer src="{{ theme_var('umami.url_external_tracking') }}"></script>
{% endif %}
</html>

2
templates/partials/navbar.html.twig
View file

@ -7,7 +7,7 @@
<ul class="sidebar-nav">
<li class="sidebar-spacer"></li>
<li class="sidebar-brand">
<a href="{{ home_url }}" class="navbar-brand mr-10" data-umami-event="Sidebar-Logo button">
<a href="{{ home_url }}" class="navbar-brand mr-10">
{% include 'partials/logo.html.twig' %}
</a>
</li>

19
templates/partials/osm.html.twig
View file

@ -1,19 +1,20 @@
<div class="w-100 h-100 d-flex flex-column pb-2">
<div class="w-100 h-100 d-flex flex-column">
<div class="flex-grow-1">
<div class="position-relative w-100">
<a target="_blank" rel="noopener" href="https://www.openstreetmap.org/way/203340031" data-umami-event="OSM button">
<img class="w-100" alt="Diese Karte zeigt unseren Hof" src="{{ url('theme://images/map.webp') }}">
</a>
<small class="d-block position-absolute bottom-0 start-0 mb-3">
<a class="bg-white text-black p-3 border border-white" target="_blank" rel="noopener" href="https://goo.gl/maps/WFYcPCQVA5u2vegy8" data-umami-event="Google-Maps button">
Auf Google Maps öffnen
</a>
</small>
<small class="d-block position-absolute bottom-0 end-0">
<a class="bg-white text-black p-1" target="_blank" rel="noopener" href="https://www.openstreetmap.org/copyright" data-umami-event="OSM-copyright button">
<a class="bg-white text-black p-1" target="_blank" rel="noopener" href="https://www.openstreetmap.org/copyright">
&#169; OpenStreetMap contributors
</a>
</small>
</div>
</div>
<small class="py-2 row">
<a class="py-2 py-md-0 col-12 col-md-6" target="_blank" rel="noopener" href="https://www.openstreetmap.org/way/203340031">
Auf OpenStreetMaps öffnen
</a>
<a class="py-2 py-md-0 col-12 col-md-6 text-md-end" target="_blank" rel="noopener" href="https://goo.gl/maps/WFYcPCQVA5u2vegy8">
Auf Google Maps öffnen
</a>
</small>
</div>

2
templates/partials/socialmedia.html.twig
View file

@ -1,4 +1,4 @@
<a role="button" class="btn btn-primary btn-facebook" target="_blank" rel="noopener" href="https://www.facebook.com/Reitanlage-Oranienburg-Heike-Tischler-456154271116487/" data-umami-event="Facebook button">
<a role="button" class="btn btn-primary btn-facebook" target="_blank" rel="noopener" href="https://www.facebook.com/Reitanlage-Oranienburg-Heike-Tischler-456154271116487/">
<i class="fab fa-facebook-f"></i>
<span class="sr-only">zu unserer Facebook-Seite</span>
</a>