scout-ch · Vento-Nuenenen · Nov 7, 2020 · Nov 7, 2020 · Nov 8, 2020 · Nov 8, 2020
diff --git a/.DS_Store b/.DS_Store
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,22 @@
+FROM php:7.4-fpm-alpine as builder
+
+WORKDIR /var/www
+COPY ./source/ .
+
+RUN apk add --update --no-cache nodejs npm yarn
+
+RUN yarn install && yarn prod
+
+RUN curl -s https://getcomposer.org/installer | php
+RUN php composer.phar install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --no-scripts --optimize-autoloader
+
+FROM nginx:1.19-alpine as production
+
+WORKDIR /var/www
+COPY --from=builder /var/www /var/www
+
+COPY docker-config/nginx/default.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+STOPSIGNAL SIGTERM
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,19 @@
+version: "3.8"
+
+services:
+  addresstool:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: address_tool
+    volumes:
+    - "./source/:/var/www/"
+    ports:
+    - '80:80'
+    links:
+      - fpm
+
+  fpm:
+    image: php:7.4-fpm-alpine
+    volumes:
+    - "./source/:/var/www/"
diff --git a/docker-config/nginx/default.conf b/docker-config/nginx/default.conf
@@ -0,0 +1,34 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    root /var/www/public;
+
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Content-Type-Options "nosniff";
+
+    index index.html index.htm index.php;
+
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    error_page 404 /index.php;
+
+    location ~ \.php$ {
+        fastcgi_pass fpm:9000;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
+    }
+}
diff --git a/.editorconfig → source/.editorconfig b/.editorconfig → source/.editorconfig
diff --git a/.env.example → source/.env.example b/.env.example → source/.env.example
diff --git a/.gitattributes → source/.gitattributes b/.gitattributes → source/.gitattributes
diff --git a/source/.gitignore b/source/.gitignore
@@ -0,0 +1,109 @@
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.env
+.env.backup
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+yarn.lock
+composer.phar
+
+
+# Created by https://www.gitignore.io/api/phpstorm+all
+# Edit at https://www.gitignore.io/?templates=phpstorm+all
+
+### PhpStorm+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+.idea/symfony2.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PhpStorm+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+# End of https://www.gitignore.io/api/phpstorm+all
+
+.DS_Store
diff --git a/.phraseapp.yml → source/.phraseapp.yml b/.phraseapp.yml → source/.phraseapp.yml
diff --git a/.styleci.yml → source/.styleci.yml b/.styleci.yml → source/.styleci.yml
diff --git a/app/Auth/HitobitoProvider.php → source/app/Auth/HitobitoProvider.php b/app/Auth/HitobitoProvider.php → source/app/Auth/HitobitoProvider.php
diff --git a/app/Console/Kernel.php → source/app/Console/Kernel.php b/app/Console/Kernel.php → source/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php → source/app/Exceptions/Handler.php b/app/Exceptions/Handler.php → source/app/Exceptions/Handler.php
diff --git a/app/Helpers/csv_helper.php → source/app/Helpers/csv_helper.php b/app/Helpers/csv_helper.php → source/app/Helpers/csv_helper.php
diff --git a/app/Helpers/hitobito_api_helper.php → source/app/Helpers/hitobito_api_helper.php b/app/Helpers/hitobito_api_helper.php → source/app/Helpers/hitobito_api_helper.php
diff --git a/...Http/Controllers/Auth/LoginController.php → ...Http/Controllers/Auth/LoginController.php b/...Http/Controllers/Auth/LoginController.php → ...Http/Controllers/Auth/LoginController.php
diff --git a/app/Http/Controllers/Controller.php → source/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php → source/app/Http/Controllers/Controller.php
diff --git a/app/Http/Controllers/HomeController.php → ...e/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php → ...e/app/Http/Controllers/HomeController.php
diff --git a/...tp/Controllers/LocalizationController.php → ...tp/Controllers/LocalizationController.php b/...tp/Controllers/LocalizationController.php → ...tp/Controllers/LocalizationController.php
diff --git a/app/Http/Controllers/MailController.php → ...e/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php → ...e/app/Http/Controllers/MailController.php
diff --git a/app/Http/Controllers/UploadController.php → ...app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php → ...app/Http/Controllers/UploadController.php
diff --git a/app/Http/Kernel.php → source/app/Http/Kernel.php b/app/Http/Kernel.php → source/app/Http/Kernel.php
diff --git a/app/Http/Middleware/Authenticate.php → source/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php → source/app/Http/Middleware/Authenticate.php
diff --git a/...tp/Middleware/CheckForMaintenanceMode.php → ...tp/Middleware/CheckForMaintenanceMode.php b/...tp/Middleware/CheckForMaintenanceMode.php → ...tp/Middleware/CheckForMaintenanceMode.php
diff --git a/app/Http/Middleware/EncryptCookies.php → ...ce/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php → ...ce/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/Localization.php → source/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php → source/app/Http/Middleware/Localization.php
diff --git a/...tp/Middleware/RedirectIfAuthenticated.php → ...tp/Middleware/RedirectIfAuthenticated.php b/...tp/Middleware/RedirectIfAuthenticated.php → ...tp/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php → source/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php → source/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustProxies.php → source/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php → source/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php → ...e/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php → ...e/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Mail/AddressMail.php → source/app/Mail/AddressMail.php b/app/Mail/AddressMail.php → source/app/Mail/AddressMail.php
diff --git a/app/Models/HitobitoUser.php → source/app/Models/HitobitoUser.php b/app/Models/HitobitoUser.php → source/app/Models/HitobitoUser.php
diff --git a/app/Models/User.php → source/app/Models/User.php b/app/Models/User.php → source/app/Models/User.php
diff --git a/app/Providers/AppServiceProvider.php → source/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php → source/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php → source/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php → source/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php → ...pp/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php → ...pp/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php → ...ce/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php → ...ce/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php → ...ce/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php → ...ce/app/Providers/RouteServiceProvider.php
diff --git a/artisan → source/artisan b/artisan → source/artisan
diff --git a/bootstrap/app.php → source/bootstrap/app.php b/bootstrap/app.php → source/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore → source/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore → source/bootstrap/cache/.gitignore
diff --git a/composer.json → source/composer.json b/composer.json → source/composer.json
diff --git a/composer.lock → source/composer.lock b/composer.lock → source/composer.lock
diff --git a/config/app.php → source/config/app.php b/config/app.php → source/config/app.php
diff --git a/config/auth.php → source/config/auth.php b/config/auth.php → source/config/auth.php
diff --git a/config/broadcasting.php → source/config/broadcasting.php b/config/broadcasting.php → source/config/broadcasting.php
diff --git a/config/cache.php → source/config/cache.php b/config/cache.php → source/config/cache.php
diff --git a/config/database.php → source/config/database.php b/config/database.php → source/config/database.php
diff --git a/config/filesystems.php → source/config/filesystems.php b/config/filesystems.php → source/config/filesystems.php
diff --git a/config/hashing.php → source/config/hashing.php b/config/hashing.php → source/config/hashing.php
diff --git a/config/logging.php → source/config/logging.php b/config/logging.php → source/config/logging.php
diff --git a/config/mail.php → source/config/mail.php b/config/mail.php → source/config/mail.php
diff --git a/config/queue.php → source/config/queue.php b/config/queue.php → source/config/queue.php
diff --git a/config/services.php → source/config/services.php b/config/services.php → source/config/services.php
diff --git a/config/session.php → source/config/session.php b/config/session.php → source/config/session.php
diff --git a/config/urls.php → source/config/urls.php b/config/urls.php → source/config/urls.php
diff --git a/config/view.php → source/config/view.php b/config/view.php → source/config/view.php
diff --git a/database/.gitignore → source/database/.gitignore b/database/.gitignore → source/database/.gitignore
diff --git a/database/dev.db → source/database/dev.db b/database/dev.db → source/database/dev.db
diff --git a/database/factories/UserFactory.php → source/database/factories/UserFactory.php b/database/factories/UserFactory.php → source/database/factories/UserFactory.php
diff --git a/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php b/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php
diff --git a/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php b/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php
diff --git a/database/seeds/DatabaseSeeder.php → source/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php → source/database/seeds/DatabaseSeeder.php
diff --git a/example_file.csv → source/example_file.csv b/example_file.csv → source/example_file.csv
diff --git a/package-lock.json → source/package-lock.json b/package-lock.json → source/package-lock.json
diff --git a/package.json → source/package.json b/package.json → source/package.json
diff --git a/phpunit.xml → source/phpunit.xml b/phpunit.xml → source/phpunit.xml
diff --git a/public/.htaccess → source/public/.htaccess b/public/.htaccess → source/public/.htaccess
diff --git a/public/css/app.css → source/public/css/app.css b/public/css/app.css → source/public/css/app.css
diff --git a/public/favicon.ico → source/public/favicon.ico b/public/favicon.ico → source/public/favicon.ico
diff --git a/public/images/export_file.png → source/public/images/export_file.png b/public/images/export_file.png → source/public/images/export_file.png
diff --git a/public/images/export_options.png → source/public/images/export_options.png b/public/images/export_options.png → source/public/images/export_options.png
diff --git a/public/images/midata.svg → source/public/images/midata.svg b/public/images/midata.svg → source/public/images/midata.svg
diff --git a/public/images/sheet.png → source/public/images/sheet.png b/public/images/sheet.png → source/public/images/sheet.png
diff --git a/public/index.php → source/public/index.php b/public/index.php → source/public/index.php
diff --git a/public/js/app.js → source/public/js/app.js b/public/js/app.js → source/public/js/app.js
diff --git a/public/mix-manifest.json → source/public/mix-manifest.json b/public/mix-manifest.json → source/public/mix-manifest.json
diff --git a/public/robots.txt → source/public/robots.txt b/public/robots.txt → source/public/robots.txt
diff --git a/public/web.config → source/public/web.config b/public/web.config → source/public/web.config
diff --git a/resources/images/logo.png → source/resources/images/logo.png b/resources/images/logo.png → source/resources/images/logo.png
diff --git a/resources/images/midata.svg → source/resources/images/midata.svg b/resources/images/midata.svg → source/resources/images/midata.svg
diff --git a/resources/js/app.js → source/resources/js/app.js b/resources/js/app.js → source/resources/js/app.js
diff --git a/resources/js/bootstrap.js → source/resources/js/bootstrap.js b/resources/js/bootstrap.js → source/resources/js/bootstrap.js
diff --git a/resources/lang/de/auth.php → source/resources/lang/de/auth.php b/resources/lang/de/auth.php → source/resources/lang/de/auth.php
diff --git a/resources/lang/de/content.php → source/resources/lang/de/content.php b/resources/lang/de/content.php → source/resources/lang/de/content.php
diff --git a/resources/lang/de/pagination.php → source/resources/lang/de/pagination.php b/resources/lang/de/pagination.php → source/resources/lang/de/pagination.php
diff --git a/resources/lang/de/passwords.php → source/resources/lang/de/passwords.php b/resources/lang/de/passwords.php → source/resources/lang/de/passwords.php
diff --git a/resources/lang/de/validation.php → source/resources/lang/de/validation.php b/resources/lang/de/validation.php → source/resources/lang/de/validation.php
diff --git a/resources/lang/en/auth.php → source/resources/lang/en/auth.php b/resources/lang/en/auth.php → source/resources/lang/en/auth.php
diff --git a/resources/lang/en/pagination.php → source/resources/lang/en/pagination.php b/resources/lang/en/pagination.php → source/resources/lang/en/pagination.php
diff --git a/resources/lang/en/passwords.php → source/resources/lang/en/passwords.php b/resources/lang/en/passwords.php → source/resources/lang/en/passwords.php
diff --git a/resources/lang/en/validation.php → source/resources/lang/en/validation.php b/resources/lang/en/validation.php → source/resources/lang/en/validation.php
diff --git a/resources/lang/fr/auth.php → source/resources/lang/fr/auth.php b/resources/lang/fr/auth.php → source/resources/lang/fr/auth.php
diff --git a/resources/lang/fr/pagination.php → source/resources/lang/fr/pagination.php b/resources/lang/fr/pagination.php → source/resources/lang/fr/pagination.php
diff --git a/resources/lang/fr/passwords.php → source/resources/lang/fr/passwords.php b/resources/lang/fr/passwords.php → source/resources/lang/fr/passwords.php
diff --git a/resources/lang/fr/validation.php → source/resources/lang/fr/validation.php b/resources/lang/fr/validation.php → source/resources/lang/fr/validation.php
diff --git a/resources/lang/it/auth.php → source/resources/lang/it/auth.php b/resources/lang/it/auth.php → source/resources/lang/it/auth.php
diff --git a/resources/lang/it/pagination.php → source/resources/lang/it/pagination.php b/resources/lang/it/pagination.php → source/resources/lang/it/pagination.php
diff --git a/resources/lang/it/passwords.php → source/resources/lang/it/passwords.php b/resources/lang/it/passwords.php → source/resources/lang/it/passwords.php
diff --git a/resources/lang/it/validation.php → source/resources/lang/it/validation.php b/resources/lang/it/validation.php → source/resources/lang/it/validation.php
diff --git a/resources/sass/_hitobito_oauth.scss → source/resources/sass/_hitobito_oauth.scss b/resources/sass/_hitobito_oauth.scss → source/resources/sass/_hitobito_oauth.scss
diff --git a/resources/sass/_home.scss → source/resources/sass/_home.scss b/resources/sass/_home.scss → source/resources/sass/_home.scss
diff --git a/resources/sass/_variables.scss → source/resources/sass/_variables.scss b/resources/sass/_variables.scss → source/resources/sass/_variables.scss
diff --git a/resources/sass/app.scss → source/resources/sass/app.scss b/resources/sass/app.scss → source/resources/sass/app.scss
diff --git a/resources/views/auth/login.blade.php → source/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php → source/resources/views/auth/login.blade.php
diff --git a/resources/views/home.blade.php → source/resources/views/home.blade.php b/resources/views/home.blade.php → source/resources/views/home.blade.php
diff --git a/resources/views/layouts/app.blade.php → source/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php → source/resources/views/layouts/app.blade.php
diff --git a/resources/views/layouts/nav.blade.php → source/resources/views/layouts/nav.blade.php b/resources/views/layouts/nav.blade.php → source/resources/views/layouts/nav.blade.php
diff --git a/resources/views/mail.blade.php → source/resources/views/mail.blade.php b/resources/views/mail.blade.php → source/resources/views/mail.blade.php
diff --git a/resources/views/summary.blade.php → source/resources/views/summary.blade.php b/resources/views/summary.blade.php → source/resources/views/summary.blade.php
diff --git a/resources/views/template/mail.blade.php → ...e/resources/views/template/mail.blade.php b/resources/views/template/mail.blade.php → ...e/resources/views/template/mail.blade.php
diff --git a/resources/views/upload.blade.php → source/resources/views/upload.blade.php b/resources/views/upload.blade.php → source/resources/views/upload.blade.php
diff --git a/routes/api.php → source/routes/api.php b/routes/api.php → source/routes/api.php
diff --git a/routes/channels.php → source/routes/channels.php b/routes/channels.php → source/routes/channels.php
diff --git a/routes/console.php → source/routes/console.php b/routes/console.php → source/routes/console.php
diff --git a/routes/web.php → source/routes/web.php b/routes/web.php → source/routes/web.php
diff --git a/server.php → source/server.php b/server.php → source/server.php
diff --git a/storage/app/.gitignore → source/storage/app/.gitignore b/storage/app/.gitignore → source/storage/app/.gitignore
diff --git a/storage/app/public/.gitignore → source/storage/app/public/.gitignore b/storage/app/public/.gitignore → source/storage/app/public/.gitignore
diff --git a/storage/framework/.gitignore → source/storage/framework/.gitignore b/storage/framework/.gitignore → source/storage/framework/.gitignore
diff --git a/storage/framework/cache/.gitignore → source/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore → source/storage/framework/cache/.gitignore
diff --git a/storage/framework/cache/data/.gitignore → ...e/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore → ...e/storage/framework/cache/data/.gitignore
diff --git a/storage/framework/sessions/.gitignore → source/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore → source/storage/framework/sessions/.gitignore
diff --git a/storage/framework/testing/.gitignore → source/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore → source/storage/framework/testing/.gitignore
diff --git a/storage/framework/views/.gitignore → source/storage/framework/views/.gitignore b/storage/framework/views/.gitignore → source/storage/framework/views/.gitignore
diff --git a/storage/logs/.gitignore → source/storage/logs/.gitignore b/storage/logs/.gitignore → source/storage/logs/.gitignore
diff --git a/tests/CreatesApplication.php → source/tests/CreatesApplication.php b/tests/CreatesApplication.php → source/tests/CreatesApplication.php
diff --git a/tests/Feature/ExampleTest.php → source/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php → source/tests/Feature/ExampleTest.php
diff --git a/tests/TestCase.php → source/tests/TestCase.php b/tests/TestCase.php → source/tests/TestCase.php
diff --git a/tests/Unit/ExampleTest.php → source/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php → source/tests/Unit/ExampleTest.php
diff --git a/webpack.mix.js → source/webpack.mix.js b/webpack.mix.js → source/webpack.mix.js