samuel-p/sp-magic.de
samuel-p/sp-magic.de
1
0
Fork 0
Code Issues Pull requests 2 Actions Releases Wiki Activity

Merge pull request 'develop' (#82) from develop into main
All checks were successful
continuous-integration/drone the build was successful
Details

Browse source 
Reviewed-on: #82
This commit is contained in:
Samuel Philipp 2021-10-01 23:57:32 +00:00
parent 0813b1734c f20343be73
commit 09ba609baa
3 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.woodpecker.yml Normal file
View file

@ -0,0 +1,34 @@
pipeline:
build:
image: node:lts
commands:
- npm install
- npm run build
deploy-dev:
image: alpine
secrets:
- FTP_HOST
- FTP_USERNAME
- FTP_PASSWORD
commands:
- which lftp || ( apk --update add lftp )
- lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
when:
branch:
- develop
event:
- push
deploy:
image: alpine
secrets:
- FTP_HOST
- FTP_USERNAME
- FTP_PASSWORD
commands:
- which lftp || ( apk --update add lftp )
- lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
when:
branch:
- main
event:
- push

16
package.json
View file

@ -12,27 +12,27 @@
"url": "https://git.sp-codes.de/samuel-p/sp-magic.de" "url": "https://git.sp-codes.de/samuel-p/sp-magic.de"
}, },
"optionalDependencies": { "optionalDependencies": {
"browser-sync": "^2.26.14" "browser-sync": "^2.27.5"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "10.2.6", "autoprefixer": "10.3.6",
"cssnano": "5.0.5", "cssnano": "5.0.8",
"del": "6.0.0", "del": "6.0.0",
"gulp": "4.0.2", "gulp": "4.0.2",
"gulp-concat": "2.6.1", "gulp-concat": "2.6.1",
"gulp-flatmap": "1.0.2", "gulp-flatmap": "1.0.2",
"gulp-header": "2.0.9", "gulp-header": "2.0.9",
"gulp-optimize-js": "1.1.0", "gulp-optimize-js": "1.1.0",
"gulp-postcss": "9.0.0", "gulp-postcss": "9.0.1",
"gulp-rename": "2.0.0", "gulp-rename": "2.0.0",
"gulp-sass": "4.1.0", "gulp-sass": "4.1.1",
"gulp-terser": "2.0.1", "gulp-terser": "2.1.0",
"lazypipe": "1.0.2", "lazypipe": "1.0.2",
"node-sass-tilde-importer": "^1.0.2", "node-sass-tilde-importer": "^1.0.2",
"postcss": "^8.3.0" "postcss": "^8.3.8"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-free": "^5.15.4",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"jquery": "^3.6.0" "jquery": "^3.6.0"
} }

1
src/index.html
View file

@ -31,6 +31,7 @@
<link rel="shortcut icon" href="img/samuel.png"> <link rel="shortcut icon" href="img/samuel.png">
<link rel="stylesheet" href="css/main.min.css"> <link rel="stylesheet" href="css/main.min.css">
<script async defer data-domain="sp-magic.de" src="https://plausible.sp-codes.de/js/plausible.js"></script> <script async defer data-domain="sp-magic.de" src="https://plausible.sp-codes.de/js/plausible.js"></script>
<script async defer data-website-id="dfb1ca1d-dc41-488a-8a95-f0e036bd3490" data-domains="sp-magic.de" src="https://umami.sp-codes.de/umami.js"></script>
</head> </head>
<body class="d-flex flex-column"> <body class="d-flex flex-column">
<div class="container flex-column flex-grow p-3"> <div class="container flex-column flex-grow p-3">