Apply changes from laravel template

.env.cypress

@@ -2,12 +2,23 @@ APP_NAME=Qualix
 APP_ENV=testing
 APP_KEY=base64:DoNotReuseThisKeyThisIsOnlyADummyForTesting=
 APP_DEBUG=true
+APP_TIMEZONE=UTC
 APP_URL=http://qualix
 
+APP_LOCALE=de
+APP_FALLBACK_LOCALE=de
+APP_FAKER_LOCALE=de_CH
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
 APP_CONTACT_LINK= # Enable contactlink in footer by adding mailto:[email protected] or a link
 #APP_CONTACT_TEXT="CUSTOM TEXT" #Override contact text
 
 LOG_CHANNEL=stack
+LOG_STACK=daily
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
@@ -17,12 +28,19 @@ DB_DATABASE=qualix
 DB_USERNAME=qualix
 DB_PASSWORD=qualix
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 SESSION_SECURE_COOKIE=false
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+
+CACHE_STORE=file
+CACHE_PREFIX=
 
 #MAIL_MAILER=log
 MAIL_MAILER=smtp
@@ -45,6 +63,5 @@ COLLABORATION_SIGNALING_SERVERS="wss://signaling.yjs.dev wss://y-webrtc-signalin
 
 SENTRY_RELEASE=
 SENTRY_LARAVEL_DSN=https://[email protected]/12345
-SENTRY_USER_FEEDBACK_URL=https://sentry.io/api/0/projects/xyz/xyz/user-feedback/
 SENTRY_CSP_REPORT_URI=http://localhost/dummy
 MIX_SENTRY_VUE_DSN=https://[email protected]/56789

.env.example

@@ -2,12 +2,23 @@ APP_NAME=Qualix
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_TIMEZONE=UTC
 APP_URL=http://localhost
 
+APP_LOCALE=de
+APP_FALLBACK_LOCALE=de
+APP_FAKER_LOCALE=de_CH
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
 APP_CONTACT_LINK= # Enable contactlink in footer by adding mailto:[email protected] or a link
 #APP_CONTACT_TEXT="CUSTOM TEXT" #Override contact text
 
 LOG_CHANNEL=stack
+LOG_STACK=daily
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
@@ -17,13 +28,20 @@ DB_DATABASE=qualix
 DB_USERNAME=qualix
 DB_PASSWORD=qualix
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 # Set this to true if you use https (e.g. in production)
 SESSION_SECURE_COOKIE=false
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+
+CACHE_STORE=file
+CACHE_PREFIX=
 
 #MAIL_MAILER=log
 MAIL_MAILER=smtp
@@ -47,6 +65,5 @@ COLLABORATION_SIGNALING_SERVERS="wss://signaling.yjs.dev wss://y-webrtc-signalin
 
 SENTRY_RELEASE=
 SENTRY_LARAVEL_DSN=
-SENTRY_USER_FEEDBACK_URL=
 SENTRY_CSP_REPORT_URI=
 MIX_SENTRY_VUE_DSN=

.env.testing

@@ -2,12 +2,23 @@ APP_NAME=Qualix
 APP_ENV=testing
 APP_KEY=base64:DoNotReuseThisKeyThisIsOnlyADummyForTesting=
 APP_DEBUG=false
+APP_TIMEZONE=UTC
 APP_URL=http://localhost
 
-#APP_CONTACT_LINK=# Enable contactlink in footer by adding mailto:[email protected] or a link
+APP_LOCALE=de
+APP_FALLBACK_LOCALE=de
+APP_FAKER_LOCALE=de_CH
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
+APP_CONTACT_LINK=# Enable contactlink in footer by adding mailto:[email protected] or a link
 #APP_CONTACT_TEXT="CUSTOM TEXT" #Override contact text
 
 LOG_CHANNEL=stack
+LOG_STACK=daily
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
@@ -17,12 +28,19 @@ DB_DATABASE=qualix
 DB_USERNAME=qualix
 DB_PASSWORD=qualix
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+
+CACHE_STORE=file
+CACHE_PREFIX=
 MAIL_MAILER=log
 #MAIL_HOST=smtp.mailtrap.io
 #MAIL_PORT=2525
@@ -43,6 +61,5 @@ COLLABORATION_SIGNALING_SERVERS="wss://signaling.yjs.dev wss://y-webrtc-signalin
 
 SENTRY_RELEASE=
 SENTRY_LARAVEL_DSN=https://[email protected]/12345
-SENTRY_USER_FEEDBACK_URL=https://sentry.io/api/0/projects/xyz/xyz/user-feedback/
 SENTRY_CSP_REPORT_URI=
 MIX_SENTRY_VUE_DSN=https://[email protected]/56789

.github/actions/deploy/action.yml

@@ -176,6 +176,5 @@ runs:
         COLLABORATION_ENABLED: ${{ inputs.collaboration-enabled }}
         COLLABORATION_SIGNALING_SERVERS: ${{ inputs.collaboration-signaling-servers }}
         SENTRY_LARAVEL_DSN: ${{ inputs.sentry-laravel-dsn }}
-        SENTRY_USER_FEEDBACK_URL: ${{ inputs.sentry-user-feedback-url }}
         SENTRY_CSP_REPORT_URI: ${{ inputs.sentry-csp-report-uri }}
         SENTRY_VUE_DSN: ${{ inputs.sentry-vue-dsn }}

.github/actions/deploy/deploy.sh

@@ -52,7 +52,6 @@ sed -ri "s~^COLLABORATION_SIGNALING_SERVERS=.*$~COLLABORATION_SIGNALING_SERVERS=
 
 sed -ri "s~^SENTRY_RELEASE=.*$~SENTRY_RELEASE=$(git rev-parse HEAD)~" .env
 sed -ri "s~^SENTRY_LARAVEL_DSN=.*$~SENTRY_LARAVEL_DSN=$SENTRY_LARAVEL_DSN~" .env
-sed -ri "s~^SENTRY_USER_FEEDBACK_URL=.*$~SENTRY_USER_FEEDBACK_URL=$SENTRY_USER_FEEDBACK_URL~" .env
 sed -ri "s~^SENTRY_CSP_REPORT_URI=.*$~SENTRY_CSP_REPORT_URI=$SENTRY_CSP_REPORT_URI~" .env
 sed -ri "s~^MIX_SENTRY_VUE_DSN=.*$~MIX_SENTRY_VUE_DSN=$SENTRY_VUE_DSN~" .env
 

.github/workflows/ci.yml

@@ -135,7 +135,6 @@ jobs:
           collaboration-enabled: ${{ secrets.COLLABORATION_ENABLED }}
           collaboration-signaling-servers: ${{ secrets.COLLABORATION_SIGNALING_SERVERS }}
           sentry-laravel-dsn: ${{ secrets.SENTRY_LARAVEL_DSN }}
-          sentry-user-feedback-url: ${{ secrets.SENTRY_USER_FEEDBACK_URL }}
           sentry-csp-report-uri: ${{ secrets.SENTRY_CSP_REPORT_URI }}
           sentry-vue-dsn: ${{ secrets.SENTRY_VUE_DSN }}
 

.gitignore

@@ -3,6 +3,7 @@
 /vendor
 .env
 .ready
+.phpactor.json
 .phpunit.result.cache
 .phpunit.cache
 Homestead.json

README.md

@@ -130,7 +130,6 @@ COLLABORATION_ENABLED=true
 COLLABORATION_SIGNALING_SERVERS="wss://signaling.yjs.dev wss://y-webrtc-signaling-eu.herokuapp.com wss://y-webrtc-signaling-us.herokuapp.com"
 
 SENTRY_LARAVEL_DSN=<snip>
-SENTRY_USER_FEEDBACK_URL=<snip>
 SENTRY_CSP_REPORT_URI=<snip>
 MIX_SENTRY_VUE_DSN=<snip>
 ```

app/Http/Controllers/BlockController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Exceptions\ECamp2BlockOverviewParsingException;
-use App\Exceptions\Handler;
 use App\Exceptions\UnsupportedFormatException;
 use App\Http\Requests\BlockGenerateRequest;
 use App\Http\Requests\BlockImportRequest;
@@ -88,7 +87,7 @@ public function import(BlockImportRequest $request, Course $course) {
         } catch (UnsupportedFormatException $e) {
             throw ValidationException::withMessages(['file' => trans('t.views.admin.block_import.error_unsupported_format')]);
         } catch (Exception $e) {
-            app(Handler::class)->report($e);
+            report($e);
             return Redirect::back()->with('alert-danger', trans('t.views.admin.block_import.unknown_error'));
         }
 

app/Http/Controllers/Controller.php

@@ -2,11 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, ValidatesRequests;
+    //
 }