Changes for V2-5

jeromesigg · Apr 5, 2023 · ff4f267 · ff4f267
1 parent 6bd6238
commit ff4f267
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 97 deletions.
diff --git a/.env.example b/.env.example
@@ -1,60 +1,69 @@
-APP_NAME=Laravel
+APP_NAME=NULL
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_URL=http://homepage.test
 APP_PORT=80
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
 DB_PORT=3306
 DB_HOST=mysql
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=NULL
+DB_USERNAME=NULL
+DB_PASSWORD=NULL
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
-
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-CLEANING_MAIL=null
-
+MAIL_USERNAME=NULL
+MAIL_PASSWORD=NULL
+MAIL_ENCRYPTION=tls
+MAIL_FROM_NAME=NULL
+MAIL_FROM_ADDRESS=NULL
+CLEANING_MAIL=NULL
+INVOICE_MAIL=NULL
+#
 # required
-RECAPTCHA_SITE_KEY=null
-RECAPTCHA_SECRET_KEY=null
+RECAPTCHA_SITE_KEY=NULL
+RECAPTCHA_SECRET_KEY=NULL
 
-GOOGLE_CALENDAR_ID=null
-BEXIO_TOKEN =null
-DIRECT_SEND = false
+GOOGLE_CALENDAR_ID=NULL
+BEXIO_TOKEN=NULL
+DIRECT_SEND=false
 
 FILESYSTEM_CLOUD=google
 GOOGLE_DRIVE_CLIENT_ID=NULL
 GOOGLE_DRIVE_CLIENT_SECRET=NULL
 GOOGLE_DRIVE_REFRESH_TOKEN=NULL
 GOOGLE_DRIVE_FOLDER_ID=NULL
 
-VERSION=1.0
+# Google Sheets
+GOOGLE_SERVICE_ENABLED=false
+GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION=NULL
+SPREADSHEET_ID=NULL
+POST_SHEET_ID=
+GOOGLE_REDIRECT_URL=NULL
+
+VERSION=0.0
 DISCOUNT_ENABLED=false
 SHARING_ENABLED=false
+APPLICATION_ENABLED=false
+ADMIN_PASSWORD=NULL
 
-DEFAULT_SLACK_WEBHOOK_ENDPOINT=https://hooks.slack.com/services/XXXXXX
-DEFAULT_SLACK_CHANNEL='#general'
-DEFAULT_SLACK_USERNAME=Laravel
+DEFAULT_SLACK_WEBHOOK_ENDPOINT=NULL
+DEFAULT_SLACK_CHANNEL='#channel'
+APPLICATION_SLACK_CHANNEL='#channel'
+DEFAULT_SLACK_USERNAME=Booking
 DEFAULT_SLACK_ICON=':ghost:'
-DEFAULT_SLACK_LINKNAMES_CONVERTED=FALSE
-DEFAULT_SLACK_UNFURL_LINKS_STATUS=FALSE
-DEFAULT_SLACK_UNFURL_MEDIA_STATUS=TRUE
-DEFAULT_SLACK_ALLOW_MARKDOWN=TRUE
-DEFAULT_SLACK_MARKDOWN_FIELDS="'text','title'"
+
+DKIM_DOMAIN=NULL
+
+API_TOKEN=NULL
diff --git a/README.md b/README.md
@@ -1,79 +1,39 @@
-<p align="center"><img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1566331377/laravel-logolockup-cmyk-red.svg" width="400"></p>
+<p align="center"><img src="https://itelfingen.ch/img/logo.png" width="400"></p>
+<p align="center"><img src="https://itelfingen.ch/images/hero-bg.jpg"></p>
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
+## Buchungstool für Ferienhäuser
 
-## About Laravel
+Die Webseite bietet die Möglichkeit, das Ferienhaus zu präsentieren, Buchungen und Kontaktanfragen zu erstellen und diese auch zu Administrieren
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+## Lokale Installation
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+Das Tool ist ein PHP-Projekt basiernd auf dem Framework [Laravel](https://laravel.com/). Um es lokal auszuführen brauchst du einen [Docker Container](https://docs.docker.com/).
 
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+Um das Tool lokal bei dir benutzen zu können musst du den Quellcode herunterladen und mittels [Laravel Sail](https://laravel.com/docs/9.x/sail) starten:
 
-## Learning Laravel
+```bash
+# clone the GitRepo
+git clone https://github.com/jeromesigg/itelfingen
+cd itelfingen
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+# install the dependencies
+docker run --rm \
+    -u "$(id -u):$(id -g)" \
+    -v $(pwd):/var/www/html \
+    -w /var/www/html \
+    laravelsail/php81-composer:latest \
+    composer install --ignore-platform-reqs
+
+cp .env.example .env
 
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+# launch the application
+./vendor/bin/sail up
 
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
-
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- [UserInsights](https://userinsights.com)
-- [Fragrantica](https://www.fragrantica.com)
-- [SOFTonSOFA](https://softonsofa.com/)
-- [User10](https://user10.com)
-- [Soumettre.fr](https://soumettre.fr/)
-- [CodeBrisk](https://codebrisk.com)
-- [1Forge](https://1forge.com)
-- [TECPRESSO](https://tecpresso.co.jp/)
-- [Runtime Converter](http://runtimeconverter.com/)
-- [WebL'Agence](https://weblagence.com/)
-- [Invoice Ninja](https://www.invoiceninja.com)
-- [iMi digital](https://www.imi-digital.de/)
-- [Earthlink](https://www.earthlink.ro/)
-- [Steadfast Collective](https://steadfastcollective.com/)
-- [We Are The Robots Inc.](https://watr.mx/)
-- [Understand.io](https://www.understand.io/)
-- [Abdel Elrafa](https://abdelelrafa.com)
-- [Hyper Host](https://hyper.host)
-- [Appoly](https://www.appoly.co.uk)
-- [OP.GG](https://op.gg)
-- [云软科技](http://www.yunruan.ltd/)
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Code of Conduct
-
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [[email protected]](mailto:[email protected]). All security vulnerabilities will be promptly addressed.
+# initialize the database
+./vendor/bin/sail artisan migrate --seed
+```
 
+Anschliessend kannst du deine Webseite unter [http://localhost](http://localhost) aufrufen.
 ## License
 
 The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/composer.json b/composer.json
@@ -36,13 +36,13 @@
         "spatie/laravel-google-calendar": "^3.3",
         "symfony/http-client": "^6.1",
         "symfony/mailgun-mailer": "^6.1",
+        "nunomaduro/collision": "^6.1",
         "yajra/laravel-datatables-oracle": "^9.19"
     },
     "require-dev": {
         "laravel/pint": "^1.2",
         "laravel/sail": "^1.13",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.3",
         "spatie/laravel-ignition": "^1.0"
     },

diff --git a/resources/views/admin/changes.blade.php b/resources/views/admin/changes.blade.php
@@ -8,6 +8,31 @@
                     <h2 class="h5 display"><a data-toggle="collapse" data-parent="#features-wrapper" href="#features-box" aria-expanded="true" aria-controls="features-box">Änderungen und Anpassungen</a></h2><a data-toggle="collapse" data-parent="#features-wrapper" href="#features-box" aria-expanded="true" aria-controls="features-box"><i class="fa fa-angle-down"></i></a>
                 </div>
                 <div id="features-box" role="tabpanel" class="card-body collapse show">
+                    <h3>V2.5</h3>
+                    <ul>
+                        <li>
+                            <h4>Features:</h4>
+                            <ul>
+                                <li>Bessere Übersicht der Buchungen</li>
+                                <li>Mehr Informationen an Slack übermittelt</li>
+                                <li>ics-Kalender-Anfrage in Buchungsbestätigung</li>
+                                <li>Buchungsübersicht inkl. csv-Download</li>
+                                <li>"Impressum" und "Über uns" aufgetrennt</li>
+                                <li>Footer mit Impressum, Über uns, FAQ und Login vereinheitlicht</li>
+                                <li>Möglichkeit eigener Text für Mail-Verkehr</li>
+                            </ul>
+                        </li>
+                        <li>
+                            <h4>Bug-Fix:</h4>
+                            <ul>
+                                <li>FAQ ohne übermässige Abstände</li>
+                                <li>Bewerbungen ohne Anrede und mit Grund als Pflicht</li>
+                                <li>Nur zukünftige Buchungen werden auf Homepage geladen</li>
+                                <li>50% Last-Minute Rabatt</li>
+                                <li>Anpassung HotTub Text</li>
+                            </ul>
+                        </li>
+                    </ul>
                     <h3>V2.4</h3>
                     <ul>
                         <li>Alle E-Mails aus der Applikation</li>
@@ -51,7 +76,9 @@
                 <div id="roadmap-box" role="tabpanel" class="card-body collapse show">
                     <h3>Nächste Versionen</h3>
                     <ul>
-                        <li>ics-Datei mit Mail versenden</li>
+                        <li>Buchungs-Rabatt an Wochen-Tagen</li>
+                        <li>Facebook Conversion API</li>
+                        <li>Testing</li>
                     </ul>
                 </div>
             </div>

diff --git a/resources/views/contents/rooms.blade.php b/resources/views/contents/rooms.blade.php
@@ -54,7 +54,7 @@
           <div class="card_content">
             <span class="card_title card_title-line">Wellness</span>
             <p class="card_text">
-              Bei einer Buchung im Zeitraum vom 1. November bis 31. März ist der saisonal aufgestellte Hot Tub inklusive. Er bietet Platz für 8 Personen.
+              Der aufgestellte Hot Tub ist inklusive. Er bietet Platz für 8 Personen.
             </p>
           </div>
       </div>