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

Update js dependencies and fix stuff

Browse source
This commit is contained in:
Tobias Reisinger 2022-12-05 20:45:15 +01:00
parent 8667959f16
commit b11ebc1d3b
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
11 changed files with 179 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitattributes vendored Normal file
View file

@ -0,0 +1,6 @@
* text=auto
*.html.twig diff=html
package-lock.json -diff
composer.lock -diff

BIN
package-lock.json generated
View file

Binary file not shown.

22
package.json
View file

@ -19,18 +19,16 @@
"keywords": [],
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"laravel-mix": "^6.0.25",
"resolve-url-loader": "^4.0.0",
"sass": "^1.35.1",
"sass-loader": "^12.1.0"
},
"dependencies": {
"@fortawesome/fontawesome-pro": "^6.0.0",
"bootstrap": "^4.6.0",
"cross-env": "^7.0.3",
"jquery": "^3.6.0",
"photoswipe": "^4.1.3",
"popper.js": "^1.16.1"
"@fortawesome/fontawesome-pro": "^6.2",
"@popperjs/core": "^2.11.6",
"autoprefixer": "^10.0",
"bootstrap": "^5.2",
"cross-env": "^7.0",
"laravel-mix": "^6.0",
"photoswipe": "^4",
"resolve-url-loader": "^5.0",
"sass": "^1.56",
"sass-loader": "^13.2"
}
}

8
src/js/app.js
View file

@ -1,4 +1,4 @@
require('./bootstrap');
let bootstrap = require('bootstrap')
import PhotoSwipe from 'photoswipe/dist/photoswipe'
import PhotoSwipeDefaultUI from 'photoswipe/dist/photoswipe-ui-default'
@ -6,7 +6,7 @@ import PhotoSwipeDefaultUI from 'photoswipe/dist/photoswipe-ui-default'
window.PhotoSwipe = PhotoSwipe;
window.PhotoSwipeDefaultUI = PhotoSwipeDefaultUI;
$("#menu-toggle").click(function(e) {
document.querySelector("#menu-toggle").onclick = function(e) {
e.preventDefault();
$("#wrapper").toggleClass("toggled");
});
document.querySelector("#wrapper").classList.toggle("toggled");
};

14
src/js/bootstrap.js vendored
View file

@ -1,14 +0,0 @@
window._ = require('lodash');
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery');
require('bootstrap');
} catch (e) {}

119
src/sass/app.scss
View file

@ -1,7 +1,5 @@
// Bootstrap
$theme-colors: (
"primary": #2b3bb4,
);
$primary: #2b3bb4;
@import '~bootstrap/scss/bootstrap';
// FontAwesome
@ -11,5 +9,118 @@ $theme-colors: (
@import '~photoswipe/dist/photoswipe.css';
@import '~photoswipe/dist/default-skin/default-skin.css';
@import './theme';
@import '../css/sidebar.css';
body, #wrapper
{
min-height: 100vh;
}
.flex-fill
{
flex: 1 1 auto;
}
.card-image img
{
width: 100%;
}
.card-columns img,video
{
width: 100%;
}
.card-columns
{
column-gap: 1em;
column-count: 2;
}
.card-columns.card
{
margin-bottom: 1em;
}
@media (min-width: 768px)
{
.card-columns
{
column-count: 3;
}
}
@media (min-width: 992px)
{
.card-columns
{
column-count: 4;
}
}
@media (min-width: 1200px)
{
.card-columns
{
column-count: 6;
}
}
.navbar-brand
{
font-size: 1em;
}
.navbar-brand img
{
height: 3em;
}
header div.row-fixed-h,
header img
{
height: 5rem;
overflow: hidden;
}
.bg-ro
{
background-color: #2b3bb4 !important;
}
footer.bg-ro a
{
color: #fff;
text-decoration: underline;
}
.btn-facebook
{
color: #fff;
background-color: #3b5998;
border-color: #3b5998;
}
#home-carousel
{
display: flex;
align-items: center;
height: 400px;
}
#home-carousel img
{
max-width: 100%;
max-height: 400px;
}
table tbody tr:nth-of-type(2n+1)
{
background:
#d0d6d3;
}
table td,
table th
{
padding: 0.6rem 0.4rem;
}

113
src/sass/theme.scss
View file

@ -1,113 +0,0 @@
body, #wrapper
{
min-height: 100vh;
}
.flex-fill
{
flex: 1 1 auto;
}
.card-image img
{
width: 100%;
}
.card-columns img,video
{
width: 100%;
}
.card-columns
{
column-gap: 1em;
column-count: 2;
}
.card-columns.card
{
margin-bottom: 1em;
}
@media (min-width: 768px)
{
.card-columns
{
column-count: 3;
}
}
@media (min-width: 992px)
{
.card-columns
{
column-count: 4;
}
}
@media (min-width: 1200px)
{
.card-columns
{
column-count: 6;
}
}
.navbar-brand
{
font-size: 1em;
}
.navbar-brand img
{
height: 3em;
}
header div.row-fixed-h,
header img
{
height: 5rem;
overflow: hidden;
}
.bg-ro
{
background-color: #2b3bb4 !important;
}
footer.bg-ro a
{
color: #fff;
text-decoration: underline;
}
.btn-facebook
{
color: #fff;
background-color: #3b5998;
border-color: #3b5998;
}
#home-carousel
{
display: flex;
align-items: center;
height: 400px;
}
#home-carousel img
{
max-width: 100%;
max-height: 400px;
}
table tbody tr:nth-of-type(2n+1)
{
background:
#d0d6d3;
}
table td,
table th
{
padding: 0.6rem 0.4rem;
}

2
templates/home.html.twig
View file

@ -13,7 +13,7 @@ <h1 class="d-inline">
{% include 'partials/osm.html.twig' %}
</div>
<div>
<a role="button" class="btn btn-primary mr-1" href="/kontakt">Kontakt</a>
<a role="button" class="btn btn-primary me-1" href="/kontakt">Kontakt</a>
{% include 'partials/socialmedia.html.twig' %}
</div>
</div>

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

@ -68,7 +68,7 @@
{% block footer %}
<footer class="container-fluid text-light py-3">
<div class="row">
<p class="mx-auto">
<p class="mx-auto w-auto">
<a href="/impressum">Impressum</a>
<span> | </span>
<a href="/datenschutzerklaerung">Datenschutzerklärung</a>
@ -77,10 +77,10 @@
</p>
</div>
<div class="row">
<p class="mx-auto">&#169; Heike Tischler</p>
<p class="mx-auto w-auto">&#169; Heike Tischler</p>
</div>
<div class="row">
<p class="mx-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>
<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 %}

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

@ -1,10 +1,19 @@
<div class="w-100 h-100 d-flex flex-column">
<img class="flex-grow-1 w-100" alt="Diese Karte zeigt unseren Hof" src="{{ url('theme://images/map.webp') }}">
<div class="flex-grow-1">
<div class="position-relative w-100">
<img class="w-100" alt="Diese Karte zeigt unseren Hof" src="{{ url('theme://images/map.webp') }}">
<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">
&#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/?mlat=52.76605&mlon=13.18774#map=18/52.76605/13.18774">
<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-right" target="_blank" rel="noopener" href="https://goo.gl/maps/WFYcPCQVA5u2vegy8">
<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>

11
webpack.mix.js
View file

@ -2,8 +2,9 @@
let mix = require('laravel-mix');
mix.setPublicPath('dist');
mix.setResourceRoot('/user/themes/reitanlage-oranienburg/dist/');
mix.js('src/js/app.js', 'dist');
mix.sass('src/sass/app.scss', 'dist');
mix.setPublicPath('dist')
.setResourceRoot('/user/themes/reitanlage-oranienburg/dist/')
.js('src/js/app.js', 'dist')
.sass('src/sass/app.scss', 'dist')
.sourceMaps(false)
.version();