PhotoSwipe: switch back to own fork, add as git submodule

Change-Id: I9c3c9a2a78899b91b416d581af584307ce676478

Author: andi34

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "vendor/rpihotspot"]
 	path = vendor/rpihotspot
 	url = https://github.com/andi34/rpihotspot
+[submodule "vendor/PhotoSwipe"]
+	path = vendor/PhotoSwipe
+	url = https://github.com/andi34/PhotoSwipe

gallery.php

@@ -30,8 +30,8 @@
 
 	<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
-	<link rel="stylesheet" href="node_modules/photoswipe/dist/photoswipe.css" />
-	<link rel="stylesheet" href="node_modules/photoswipe/dist/default-skin/default-skin.css" />
+	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/photoswipe.css" />
+	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/default-skin/default-skin.css" />
 	<link rel="stylesheet" href="resources/css/style.css" />
 	<?php if ($config['gallery_bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
@@ -85,8 +85,8 @@
 	<script type="text/javascript" src="resources/js/vendor/EasePack.min.js"></script>
 	<script type="text/javascript" src="resources/js/vendor/jquery.gsap.min.js"></script>
 	<script type="text/javascript" src="resources/js/vendor/CSSPlugin.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/photoswipe.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/photoswipe-ui-default.min.js"></script>
+	<script type="text/javascript" src="vendor/PhotoSwipe/dist/photoswipe.min.js"></script>
+	<script type="text/javascript" src="vendor/PhotoSwipe/dist/photoswipe-ui-default.min.js"></script>
 	<script type="text/javascript" src="resources/js/photoinit.js"></script>
 	<script type="text/javascript" src="resources/js/theme.js"></script>
 	<script type="text/javascript" src="resources/js/core.js"></script>

index.php

@@ -32,8 +32,8 @@
 
 	<link rel="stylesheet" href="node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.css" />
-	<link rel="stylesheet" href="node_modules/photoswipe/dist/photoswipe.css" />
-	<link rel="stylesheet" href="node_modules/photoswipe/dist/default-skin/default-skin.css" />
+	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/photoswipe.css" />
+	<link rel="stylesheet" href="vendor/PhotoSwipe/dist/default-skin/default-skin.css" />
 	<link rel="stylesheet" href="resources/css/style.css" />
 	<?php if ($config['gallery_bottom_bar']): ?>
 	<link rel="stylesheet" href="resources/css/photoswipe-bottom.css" />
@@ -239,8 +239,8 @@
 	<script type="text/javascript" src="resources/js/vendor/EasePack.min.js"></script>
 	<script type="text/javascript" src="resources/js/vendor/jquery.gsap.min.js"></script>
 	<script type="text/javascript" src="resources/js/vendor/CSSPlugin.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/photoswipe.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/photoswipe-ui-default.min.js"></script>
+	<script type="text/javascript" src="vendor/PhotoSwipe/dist/photoswipe.min.js"></script>
+	<script type="text/javascript" src="vendor/PhotoSwipe/dist/photoswipe-ui-default.min.js"></script>
 	<script type="text/javascript" src="resources/js/photoinit.js"></script>
 	<script type="text/javascript" src="resources/js/theme.js"></script>
 	<script type="text/javascript" src="resources/js/core.js"></script>

login/index.php

@@ -45,8 +45,6 @@
 
 	<link rel="stylesheet" href="../node_modules/normalize.css/normalize.css" />
 	<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.css" />
-	<link rel="stylesheet" href="../node_modules/photoswipe/dist/photoswipe.css" />
-	<link rel="stylesheet" href="../node_modules/photoswipe/dist/default-skin/default-skin.css" />
 	<link rel="stylesheet" href="../resources/css/login.css" />
 	<?php if ($config['rounded_corners']): ?>
 	<link rel="stylesheet" href="../resources/css/rounded.css" />

package.json

@@ -47,7 +47,6 @@
     "marvinj": "^1.0.0",
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
-    "photoswipe": "^4.1.3",
     "whatwg-fetch": "^3.2.0"
   },
   "devDependencies": {

scripts/pack-build.js

@@ -80,8 +80,6 @@ function createArchive(fileName, archive) {
     archive.directory('node_modules/marvinj/marvinj/release/');
     archive.file('node_modules/normalize.css/LICENSE.md');
     archive.file('node_modules/normalize.css/normalize.css');
-    archive.file('node_modules/photoswipe/LICENSE');
-    archive.directory('node_modules/photoswipe/dist/');
     archive.file('node_modules/whatwg-fetch/LICENSE');
     archive.file('node_modules/whatwg-fetch/dist/fetch.umd.js');
 

update-booth.sh

@@ -87,7 +87,7 @@ apt dist-upgrade -y
 info "[Info]      Checking for webserver..."
 for server in "${WEBSERVER[@]}"; do
     if [ $(dpkg-query -W -f='${Status}' ${server} 2>/dev/null | grep -c "ok installed") -eq 1 ]; then
-        info "[Webserver] ${server} installed"
+        info "[Webserver] ${server} used."
         if [[ ${server} == "nginx" || ${server} == "lighttpd" ]]; then
             info "[NOTE]      You're using ${server} as your Webserver."
             info "[NOTE]      For a no-hassle-setup Apache2 Webserver is recommend!"
@@ -121,9 +121,14 @@ chown -R www-data:www-data ${booth_source}
 
 for file in "${OLDFILES[@]}"; do
     if [ -f "${booth_source}/${file}" ]; then
-        info "[Info] Deleting unused file: ${booth_source}/${file}"
+        info "[Info]      Deleting unused file: ${booth_source}/${file}"
         rm "${booth_source}/${file}"
     fi
 done
 
+if [ -d "${booth_source}/node_modules/photoswipe" ]; then
+    info "[Info]      Deleting unused module: ${booth_source}/node_modules/photoswipe"
+    rm -rf ${booth_source}/node_modules/photoswipe
+fi
+
 info "[Info]      Updated Photobooth"