Wir verwenden nun Webpack direkt

.gitlab-ci.yml

@@ -30,7 +30,7 @@ update(144.76.113.134):
     - chmod -R 777 bootstrap/cache
     - npm install
     - php artisan migrate --force
-    - ./gulpbuild.sh
+    - npm run prod
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
@@ -70,7 +70,7 @@ update(metager2):
     - chmod -R 777 bootstrap/cache
     - npm install
     - php artisan migrate --force
-    - ./gulpbuild.sh
+    - npm run prod
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
@@ -110,7 +110,7 @@ update(metager3.de):
     - chmod -R 777 bootstrap/cache
     - npm install
     - php artisan migrate --force
-    - ./gulpbuild.sh
+    - npm run prod
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done

composer.json

@@ -7,12 +7,12 @@
     "require": {
         "php": ">=5.6.4",
         "laravel/framework": "5.4.*",
+        "laravel/tinker": "~1.0",
         "predis/predis": "^1.1",
-        "mcamara/laravel-localization": "^1.1",
-        "jenssegers/agent": "^2.3",
-        "piwik/piwik-php-tracker": "^1.0",
-        "fideloper/proxy": "^3.1",
-        "guzzlehttp/guzzle": "^6.2"
+        "mcamara/laravel-localization": "1.2.*",
+        "jenssegers/agent": "2.6.*",
+        "fideloper/proxy": "^3.3",
+        "guzzlehttp/guzzle": "6.*"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
@@ -30,9 +30,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/TestCase.php"
-        ]
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     },
     "scripts": {
         "post-root-package-install": [
@@ -51,6 +51,8 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "optimize-autoloader": true
     }
-}
+}
\ No newline at end of file

gulpbuild.sh

-#!/bin/bash
-
-rm -R public/build/
-gulp -production
\ No newline at end of file

gulpfile.js

-const elixir = require('laravel-elixir')
-require('laravel-elixir-vue-2')
-/*
- |--------------------------------------------------------------------------
- | Elixir Asset Management
- |--------------------------------------------------------------------------
- |
- | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Sass
- | file for our application, as well as publishing vendor resources.
- |
- */
-elixir(function (mix) {
-  mix.less('default.less', 'public/css/themes/default.css')
-  /*
-   | Not mixed (specific pages only)
-   |
-   | widgets.js
-   | editLanguage.js
-   | kontakt.js
-   | scriptResultPage.js
-   | scriptStartPage.js
-   | settings.js
-  */
-  mix.scripts(['lib/jquery.js', 'lib/jquery-ui.min.js', 'lib/bootstrap.js', 'lib/masonry.js', 'lib/imagesloaded.js', 'lib/openpgp.min.js', 'lib/iframeResizer.min.js', 'lib/md5.js'], 'public/js/lib.js')
-  mix.scripts(['scriptStartPage.js', 'results.js'], 'public/js/scriptStartPage.js');
-  mix.scripts(['scriptResultPage.js', 'results.js'], 'public/js/scriptResultPage.js');
-  //mix.scripts(['scriptSubpages.js'], 'public/js/scriptSubpages.js');
-  mix.less('metager/beitritt.less', 'public/css/beitritt.css')
-  // utility
-  mix.scripts(['utility.js'], 'public/js/utility.js');
-  mix.less('utility.less', 'public/css/utility.css');
-  mix.version(['css/themes/default.css', 'js/lib.js', 'js/utility.js', 'css/utility.css', 'js/widgets.js', 'js/editLanguage.js', 'js/kontakt.js', 'js/scriptResultPage.js', 'js/scriptStartPage.js', 'js/settings.js', 'css/beitritt.css']);
-
-})

package.json

 {
   "private": true,
   "scripts": {
-    "prod": "gulp --production",
-    "dev": "gulp watch"
+    "dev": "npm run development",
+    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch-poll": "npm run watch -- --watch-poll",
+    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "prod": "npm run production",
+    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "bootstrap-sass": "^3.3.7",
-    "gulp": "^3.9.1",
-    "gulp-clean-css": "^3.2.0",
-    "gulp-uglify": "^2.1.2",
-    "jquery": "^3.1.0",
-    "laravel-elixir": "^6.0.0-9",
-    "laravel-elixir-vue-2": "^0.2.0",
-    "laravel-elixir-webpack-official": "^1.0.2",
-    "lodash": "^4.16.2",
-    "vue": "^2.0.1",
-    "vue-resource": "^1.0.3"
+    "axios": "^0.15.3",
+    "cross-env": "^3.2.3",
+    "detect-browser": "2.1.*",
+    "laravel-mix": "0.*",
+    "lodash": "^4.17.4",
+    "postcss-discard-comments": "^2.0.4",
+    "purify-css": "^1.2.5",
+    "purifycss-webpack": "^0.7.0",
+    "vue": "^2.1.10"
+  },
+  "dependencies": {
+    "axios": "^0.15.3",
+    "cross-env": "^3.2.3",
+    "detect-browser": "2.1.*",
+    "laravel-mix": "0.*",
+    "lodash": "^4.17.4",
+    "postcss-discard-comments": "^2.0.4",
+    "purify-css": "^1.2.5",
+    "purifycss-webpack": "^0.7.0",
+    "vue": "^2.1.10"
   }
-}
+}
\ No newline at end of file

public/css/lightslider.css

-/*! lightslider - v1.1.3 - 2015-04-14
-* https://github.com/sachinchoolur/lightslider
-* Copyright (c) 2015 Sachin N; Licensed MIT */
-
-
-/** /!!! core css Should not edit !!!/**/
-
-.lSSlideOuter {
-    overflow: hidden;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.lightSlider:before, .lightSlider:after {
-    content: " ";
-    display: table;
-}
-
-.lightSlider {
-    /* overflow: hidden;*/
-    margin: 0;
-}
-
-.lSSlideWrapper {
-    max-width: 100%;
-    overflow: hidden;
-    position: relative;
-}
-
-.lSSlideWrapper > .lightSlider:after {
-    clear: both;
-}
-
-.lSSlideWrapper .lSSlide {
-    -webkit-transform: translate(0px, 0px);
-    -ms-transform: translate(0px, 0px);
-    transform: translate(0px, 0px);
-    -webkit-transition: all 1s;
-    -webkit-transition-property: -webkit-transform, height;
-    -moz-transition-property: -moz-transform, height;
-    transition-property: transform, height;
-    -webkit-transition-duration: inherit !important;
-    transition-duration: inherit !important;
-    -webkit-transition-timing-function: inherit !important;
-    transition-timing-function: inherit !important;
-}
-
-.lSSlideWrapper .lSFade {
-    position: relative;
-}
-
-.lSSlideWrapper .lSFade > * {
-    position: absolute !important;
-    top: 0;
-    left: 0;
-    z-index: 9;
-    margin-right: 0;
-    width: 100%;
-}
-
-.lSSlideWrapper.usingCss .lSFade > * {
-    opacity: 0;
-    -webkit-transition-delay: 0s;
-    transition-delay: 0s;
-    -webkit-transition-duration: inherit !important;
-    transition-duration: inherit !important;
-    -webkit-transition-property: opacity;
-    transition-property: opacity;
-    -webkit-transition-timing-function: inherit !important;
-    transition-timing-function: inherit !important;
-}
-
-.lSSlideWrapper .lSFade > *.active {
-    z-index: 10;
-}
-
-.lSSlideWrapper.usingCss .lSFade > *.active {
-    opacity: 1;
-}
-
-
-/** /!!! End of core css Should not edit !!!/**/
-
-
-/* Pager */
-
-.lSSlideOuter .lSPager.lSpg {
-    margin: 10px 0 0;
-    padding: 0;
-    text-align: center;
-}
-
-.lSSlideOuter .lSPager.lSpg > li {
-    cursor: pointer;
-    display: inline-block;
-    padding: 0 5px;
-}
-
-.lSSlideOuter .lSPager.lSpg > li a {
-    background-color: #222222;
-    border-radius: 30px;
-    display: inline-block;
-    height: 8px;
-    overflow: hidden;
-    text-indent: -999em;
-    width: 8px;
-    position: relative;
-    z-index: 99;
-    -webkit-transition: all 0.5s linear 0s;
-    transition: all 0.5s linear 0s;
-}
-
-.lSSlideOuter .lSPager.lSpg > li:hover a, .lSSlideOuter .lSPager.lSpg > li.active a {
-    background-color: #428bca;
-}
-
-.lSSlideOuter .media {
-    opacity: 0.8;
-}
-
-.lSSlideOuter .media.active {
-    opacity: 1;
-}
-
-
-/* End of pager */
-
-
-/** Gallery */
-
-.lSSlideOuter .lSPager.lSGallery {
-    list-style: none outside none;
-    padding-left: 0;
-    margin: 0;
-    overflow: hidden;
-    transform: translate3d(0px, 0px, 0px);
-    -moz-transform: translate3d(0px, 0px, 0px);
-    -ms-transform: translate3d(0px, 0px, 0px);
-    -webkit-transform: translate3d(0px, 0px, 0px);
-    -o-transform: translate3d(0px, 0px, 0px);
-    -webkit-transition-property: -webkit-transform;
-    -moz-transition-property: -moz-transform;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.lSSlideOuter .lSPager.lSGallery li {
-    overflow: hidden;
-    -webkit-transition: border-radius 0.12s linear 0s 0.35s linear 0s;
-    transition: border-radius 0.12s linear 0s 0.35s linear 0s;
-}
-
-.lSSlideOuter .lSPager.lSGallery li.active, .lSSlideOuter .lSPager.lSGallery li:hover {
-    border-radius: 5px;
-}
-
-.lSSlideOuter .lSPager.lSGallery img {
-    display: block;
-    height: auto;
-    max-width: 100%;
-}
-
-.lSSlideOuter .lSPager.lSGallery:before, .lSSlideOuter .lSPager.lSGallery:after {
-    content: " ";
-    display: table;
-}
-
-.lSSlideOuter .lSPager.lSGallery:after {
-    clear: both;
-}
-
-
-/* End of Gallery*/
-
-
-/* slider actions */
-
-.lSAction > a {
-    width: 32px;
-    display: block;
-    top: 50%;
-    height: 32px;
-    /*    background-image: url('../img/controls.png'); */
-    cursor: pointer;
-    position: absolute;
-    z-index: 99;
-    margin-top: -16px;
-    opacity: 0.5;
-    -webkit-transition: opacity 0.35s linear 0s;
-    transition: opacity 0.35s linear 0s;
-}
-
-.lSAction > a:hover {
-    opacity: 1;
-}
-
-.lSAction > .lSPrev {
-    background-position: 0 0;
-    left: 10px;
-}
-
-.lSAction > .lSNext {
-    background-position: -32px 0;
-    right: 10px;
-}
-
-.lSAction > a.disabled {
-    pointer-events: none;
-}
-
-.cS-hidden {
-    height: 1px;
-    opacity: 0;
-    filter: alpha(opacity=0);
-    overflow: hidden;
-}
-
-
-/* vertical */
-
-.lSSlideOuter.vertical {
-    position: relative;
-}
-
-.lSSlideOuter.vertical.noPager {
-    padding-right: 0px !important;
-}
-
-.lSSlideOuter.vertical .lSGallery {
-    position: absolute !important;
-    right: 0;
-    top: 0;
-}
-
-.lSSlideOuter.vertical .lightSlider > * {
-    width: 100% !important;
-    max-width: none !important;
-}
-
-
-/* vertical controlls */
-
-.lSSlideOuter.vertical .lSAction > a {
-    left: 50%;
-    margin-left: -14px;
-    margin-top: 0;
-}
-
-.lSSlideOuter.vertical .lSAction > .lSNext {
-    background-position: 31px -31px;
-    bottom: 10px;
-    top: auto;
-}
-
-.lSSlideOuter.vertical .lSAction > .lSPrev {
-    background-position: 0 -31px;
-    bottom: auto;
-    top: 10px;
-}
-
-
-/* vertical */
-
-
-/* Rtl */
-
-.lSSlideOuter.lSrtl {
-    direction: rtl;
-}
-
-.lSSlideOuter .lightSlider, .lSSlideOuter .lSPager {
-    padding-left: 0;
-    list-style: none outside none;
-}
-
-.lSSlideOuter.lSrtl .lightSlider, .lSSlideOuter.lSrtl .lSPager {
-    padding-right: 0;
-}
-
-.lSSlideOuter .lightSlider > *, .lSSlideOuter .lSGallery li {
-    float: left;
-}
-
-.lSSlideOuter.lSrtl .lightSlider > *, .lSSlideOuter.lSrtl .lSGallery li {
-    float: right !important;
-}
-
-
-/* Rtl */
-
-@-webkit-keyframes rightEnd {
-    0% {
-        left: 0;
-    }
-    50% {
-        left: -15px;
-    }
-    100% {
-        left: 0;
-    }
-}
-
-@keyframes rightEnd {
-    0% {
-        left: 0;
-    }
-    50% {
-        left: -15px;
-    }
-    100% {
-        left: 0;
-    }
-}
-
-@-webkit-keyframes topEnd {
-    0% {
-        top: 0;
-    }
-    50% {
-        top: -15px;
-    }
-    100% {
-        top: 0;
-    }
-}
-
-@keyframes topEnd {
-    0% {
-        top: 0;
-    }
-    50% {
-        top: -15px;
-    }
-    100% {
-        top: 0;
-    }
-}
-
-@-webkit-keyframes leftEnd {
-    0% {
-        left: 0;
-    }
-    50% {
-        left: 15px;
-    }
-    100% {
-        left: 0;
-    }
-}
-
-@keyframes leftEnd {
-    0% {
-        left: 0;
-    }
-    50% {
-        left: 15px;
-    }
-    100% {
-        left: 0;
-    }
-}
-
-@-webkit-keyframes bottomEnd {
-    0% {
-        bottom: 0;
-    }
-    50% {
-        bottom: -15px;
-    }
-    100% {
-        bottom: 0;
-    }
-}
-
-@keyframes bottomEnd {
-    0% {
-        bottom: 0;
-    }
-    50% {
-        bottom: -15px;
-    }
-    100% {
-        bottom: 0;
-    }
-}
-
-.lSSlideOuter .rightEnd {
-    -webkit-animation: rightEnd 0.3s;
-    animation: rightEnd 0.3s;
-    position: relative;
-}
-
-.lSSlideOuter .leftEnd {
-    -webkit-animation: leftEnd 0.3s;
-    animation: leftEnd 0.3s;
-    position: relative;
-}
-
-.lSSlideOuter.vertical .rightEnd {
-    -webkit-animation: topEnd 0.3s;
-    animation: topEnd 0.3s;
-    position: relative;
-}
-
-.lSSlideOuter.vertical .leftEnd {
-    -webkit-animation: bottomEnd 0.3s;
-    animation: bottomEnd 0.3s;
-    position: relative;
-}
-
-.lSSlideOuter.lSrtl .rightEnd {
-    -webkit-animation: leftEnd 0.3s;
-    animation: leftEnd 0.3s;
-    position: relative;
-}
-
-.lSSlideOuter.lSrtl .leftEnd {
-    -webkit-animation: rightEnd 0.3s;
-    animation: rightEnd 0.3s;
-    position: relative;
-}
-
-
-/*/  GRab cursor */
-
-.lightSlider.lsGrab > * {
-    cursor: -webkit-grab;
-    cursor: -moz-grab;
-    cursor: -o-grab;
-    cursor: -ms-grab;
-    cursor: grab;
-}
-
-.lightSlider.lsGrabbing > * {
-    cursor: move;
-    cursor: -webkit-grabbing;
-    cursor: -moz-grabbing;
-    cursor: -o-grabbing;
-    cursor: -ms-grabbing;
-    cursor: grabbing;
-}
\ No newline at end of file

public/css/style.css

-/* 
-