Merge branch 'master' into hotfix

# Conflicts:
#	composer.lock

Author: Alain Van Driessche

.env.example

@@ -1,12 +1,23 @@
 APP_ENV=local
 APP_KEY=base64:ilyL17PxJTnZXqNBVr+P36ARu9NF7HgqJ87ciGWvo5E=
 APP_DEBUG=false
+APP_TIMEZONE=UTC
 APP_URL=http://localhost
+VITE_APP_URL=http://localhost
+
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
 
 DB_CONNECTION=sqlite
 DB_DATABASE=database/database.sqlite
 
-CACHE_DRIVER=array
+CACHE_STORE=array
 SESSION_DRIVER=array
 QUEUE_DRIVER=sync
 
@@ -22,7 +33,14 @@ AWS_BUCKET=codeweek-dev
 AWS_URL=https://codeweek-s3.s3.amazonaws.com/
 
 LOG_CHANNEL=stack
+LOG_STACK=single
 
 LOCALES=al,ba,bg,cs,da,de,el,en,es,et,fi,fr,hr,hu,it,lt,lv,me,mk,nl,pl,pt,ro,rs,sk,sl,sv
 
 ADMIN_EMAIL=admin@codeweek.test
+
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+AUTH_MODEL=App\User

.env.travis

@@ -10,7 +10,7 @@ DB_DATABASE=codeweek
 DB_USERNAME=root
 DB_PASSWORD=
 
-CACHE_DRIVER=array
+CACHE_STORE=array
 SESSION_DRIVER=array
 QUEUE_DRIVER=sync
 

.github/workflows/laravel.yml

@@ -14,7 +14,8 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
       with:
-        php-version: '8.1'
+        php-version: '8.3'
+        tools: composer:v2
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - uses: actions/checkout@v3
@@ -23,14 +24,15 @@ jobs:
     - name: Copy composer.json
       run: php -r "copy('composer-test.json', 'composer.json');"      
     - name: Install Dependencies
+      env:
+        NOVA_USERNAME: ${{ secrets.NOVA_USERNAME }}
+        NOVA_PASSWORD: ${{ secrets.NOVA_PASSWORD }}
       run: |
           php --version
-          composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }}
+          composer config http-basic.nova.laravel.com $NOVA_USERNAME $NOVA_PASSWORD
           composer install -n --prefer-dist
     - name: Generate key
       run: php artisan key:generate
-    - name: generate vue-i18n
-      run: php artisan vue-i18n:generate
     - name: Directory Permissions
       run: chmod -R 777 storage bootstrap/cache
     - name: Create Database
@@ -40,8 +42,8 @@ jobs:
     - name: Setup Node
       uses: actions/setup-node@v3
       with:
-        node-version: 16
-    - run: npm install && npm run dev
+        node-version: 21
+    - run: npm install && npm run build
     - name: Execute tests (Unit and Feature tests) via PHPUnit
       env:
         DB_CONNECTION: sqlite

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /public/hot
+/public/build
 /public/storage
 /storage/*.key
 /vendor
@@ -18,10 +19,14 @@ public/css/app.css
 public/mix-manifest.json
 public/vendor/nova/*
 resources/lang/vendor/*
+resources/lang/*.json
 resources/latex/texput.log
 !app/Nova
 auth.json
 vue-i18n-locales.generated.js
 /storage/debugbar/
 /phpunit.xml
+/.phpunit.cache
 /.phpunit.result.cache
+
+.DS_Store

.run/dev.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="dev" type="js.build_tools.npm" activateToolWindowBeforeRun="false" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.travis.yml

@@ -15,7 +15,7 @@ before_script:
   - travis_retry composer install ${COMPOSER_FLAGS} --no-interaction --prefer-source
   - php artisan vue-i18n:generate
   - yarn install
-  - npm run prod
+  - npm run build
   - php artisan key:generate
 
 cache:

app/Achievements/Achievement.php

@@ -1,22 +1,22 @@
 <?php
 
-
 namespace App\Achievements;
 
-
 use App\User;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Achievement extends Model
 {
-
     protected $guarded = [];
 
-    public function awardTo(User $user){
+    public function awardTo(User $user)
+    {
         $this->users()->attach($user);
     }
 
-    public function users(){
+    public function users(): BelongsToMany
+    {
         return $this->belongsToMany(User::class, 'user_achievements');
     }
 
@@ -29,9 +29,9 @@ public function levelAsNumber()
         ][$this->level];
     }
 
-//    public function newCollection(array $models = [])
-//    {
-//        return new Achievements($models);
-//    }
+    //    public function newCollection(array $models = [])
+    //    {
+    //        return new Achievements($models);
+    //    }
 
 }

app/Achievements/Achievements.php

@@ -1,14 +1,13 @@
 <?php
 
-
 namespace App\Achievements;
 
-
 use Illuminate\Database\Eloquent\Collection;
 
 class Achievements extends Collection
 {
-    public function for($user){
+    public function for($user)
+    {
         return $user->achievements;
     }
 
@@ -30,4 +29,4 @@ public function asPercentageOfTotalAvailable()
 
         return $totalAchievements ? round($this->count() / $totalAchievements * 100) : 0;
     }
-}
+}

app/Achievements/AchievementsServiceProvider.php

@@ -1,22 +1,16 @@
 <?php
 
-
 namespace App\Achievements;
 
-
 use App\Achievements\Console\GenerateAchievementCommand;
 use App\Achievements\Console\SyncExperience;
 use App\Achievements\Console\SyncUsersAchievements;
 use App\Achievements\Events\UserEarnedExperience;
-
-
-use App\Achievements\Types\StartYourEngines;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
 
 class AchievementsServiceProvider extends ServiceProvider
 {
-
     protected $achievements = [
         Types\OrganiserActive2021::class,
         Types\OrganiserExpert2021::class,
@@ -47,16 +41,26 @@ class AchievementsServiceProvider extends ServiceProvider
         Types\InfluencerActive2023::class,
         Types\InfluencerExpert2023::class,
         Types\InfluencerChampion2023::class,
-        Types\InfluencerLegendary2023::class
+        Types\InfluencerLegendary2023::class,
+        Types\OrganiserActive2024::class,
+        Types\OrganiserExpert2024::class,
+        Types\OrganiserChampion2024::class,
+        Types\OrganiserLegendary2024::class,
+        Types\OrganiserMaster2024::class,
+        Types\Influencer2024::class,
+        Types\InfluencerActive2024::class,
+        Types\InfluencerExpert2024::class,
+        Types\InfluencerChampion2024::class,
+        Types\InfluencerLegendary2024::class,
 
     ];
 
-    public function boot()
+    public function boot(): void
     {
         Event::listen(UserEarnedExperience::class, AwardAchievements::class);
     }
 
-    public function register()
+    public function register(): void
     {
         $this->app->singleton('achievements', function () {
             return cache()->rememberForever('achievements', function () {
@@ -66,9 +70,6 @@ public function register()
             });
         });
 
-        $this->commands([GenerateAchievementCommand::class,SyncUsersAchievements::class, SyncExperience::class]);
+        $this->commands([GenerateAchievementCommand::class, SyncUsersAchievements::class, SyncExperience::class]);
     }
-
-
-
 }

app/Achievements/AwardAchievements.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\Achievements;
 
-
 use App\Achievements\Events\UserEarnedExperience;
 
 class AwardAchievements
@@ -19,4 +17,4 @@ public function scanForAwards($user)
             app('achievements')->filter->qualifier($user)->map->modelKey()
         );
     }
-}
+}