Release Urán-3.1. Merge branch 'uran-2.x'

Author: luksan47

.env.travis

@@ -0,0 +1,14 @@
+APP_NAME=Urán
+APP_ENV=testing
+APP_KEY=Something
+APP_DEBUG=true
+APP_URL=http://localhost/
+DB_CONNECTION=testing
+DB_TEST_USERNAME=root
+DB_TEST_PASSWORD=
+BCRYPT_ROUNDS=4
+CACHE_DRIVER=array
+MAIL_DRIVER=array
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=array
+BUGSNAG_API_KEY=randkey

.gitignore

@@ -1,6 +1,9 @@
 /node_modules
+/public/css
 /public/hot
+/public/js
 /public/storage
+/public/mix-manifest.json
 /storage/*.key
 /vendor
 .env

.travis.yml

@@ -0,0 +1,27 @@
+os:
+  - linux
+language: php
+php:
+  - 7.3
+services:
+  - mysql
+cache:
+  directories:
+    - node_modules
+    - vendor
+before_script:
+  - cp .env.travis .env
+  - sudo mysql -e 'create database homestead;'
+  - composer self-update
+  - composer install --prefer-source --no-interaction --dev
+  - npm install
+  - npm run dev
+  - php artisan key:generate
+  - php artisan migrate
+script:
+  - php artisan test
+branches:
+  only:
+  - master
+  - uran-2.x
+  

CONTRIBUTING.md

@@ -24,6 +24,8 @@ With these steps you should be able to run Mars on your machine:
 7. Run `vagrant up`.
 8. Get a console to the virtual machine with `vagrant ssh`.
    * In the project root (`cd /home/vagrant/mars`) run `composer install` and `php artisan migrate:fresh --seed`.
+   * Run `npm install` to install JS related dependencies.
+   * Run `npm run dev` to create the CSS and JS files in the `public` directory. 
 9. The project should be running at [mars.local](http://mars.local/).
 
 The MySQL database listens on port 3306 in the virtual machine, 33060 is forwarded from the host. See credentials in `.env`.
@@ -33,6 +35,13 @@ The project contains basic configuration for this IDE with the Homestead environ
 
 You can even use XDebug with this setup. Turn on listening for remote debug connections in PHPStorm and use the [XDebug](https://xdebug.org) browser extension in your favourite browser.
 
+### For everyday use
+
+Most of the above setup is a one-time thing to do. However, whenever you start working on based on a newer version, you will have to run the following commands:
+
+ * `npm run dev`: In case of recent UI changes (ie. JS or CSS), this will generate the new assets from `webpack.mix.js`. For frontend developers, `npm watch` might be useful -- it does the same, but also updates on change.
+ * `php artisan migrate:fresh --seed`: This will migrate everything from scratch (useful if you work on changes in parallel) and seeds the database.
+
 ## Keep it minimal
 
 The main problem with Urán 1.1 was its *reinventing the wheel* strategy. Laravel provides everything we need. Use it.

README.md

@@ -1,11 +1,14 @@
+[![Build Status](https://travis-ci.com/luksan47/mars.svg?branch=uran-2.x)](https://travis-ci.com/luksan47/mars)
+[![StyleCI](https://github.styleci.io/repos/211704659/shield?branch=uran-2.x&style=plastic)](https://github.styleci.io/repos/211704659)
+
 # Mars
 
 Mars is the [Urán 2.0](https://github.com/kovacsur10/uran) unified information system for Eötvös Collegium. It's a complete 
 rewrite, therefore comes under a new name and repository. Only a few resources are migrated from the Urán system.
 
 ## Architecture
 
-Urán is a Laravel based application. For more information, see the [official Laravel documentation](https://laravel.com/docs/6.x).
+Urán is a Laravel based application. For more information, see the [official Laravel documentation](https://laravel.com/docs).
 
 ## Contributions
 

app/Console/Commands.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console;
+
+
+/**
+ * Collection of exec commands.
+ * The commands return values accordingly in deug mode as well.
+ */
+class Commands
+{
+    private static function isDebugMode()
+    {
+        return config('app.debug');
+    }
+
+    public static function updateCompletedPrintingJobs()
+    {
+        if (self::isDebugMode()) {
+            $result = [0];
+        } else {
+            $result = exec("lpstat -W completed -o " . config('print.printer_name') . " | awk '{print $1}'", $result);
+        }
+        return $result;
+    }
+
+    public static function print($command)
+    {
+        if (self::isDebugMode()) {
+            $job_id = 0;
+            $result = "request id is " . config('print.printer_name') . "-" . $job_id . " (1 file(s))";
+        } else {
+            $result = exec($command);
+        }
+        return $result;
+    }
+
+    public static function getPages($path)
+    {
+        if (self::isDebugMode()) {
+            $result = rand(1, 10);
+        } else {
+            $result = exec("pdfinfo " . $path . " | grep '^Pages' | awk '{print $2}' 2>&1");
+        }
+        return $result;
+    }
+}

app/Console/Kernel.php

@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->call(EventTrigger::listen)->hourly();
     }
 
     /**

app/EventTrigger.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace App;
+
+use App\Http\Controllers\SecretariatController;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * This class implements the logic of triggering certain (recurring) events (eg. automatic status changes)
+ * when we reach a given datetime. The triggers will fire a signal that we handle accordingly.
+ * Members of this models should not get created through the site. It is stored in the database
+ * so the dates can be changed on the run, everything else should be static.
+ * The handlers of each signal will do one or two things:
+ *  - Runs the function/does the changes relvant to the event.
+ *  - (only recurring events) Updates the trigger date.
+ */
+class EventTrigger extends Model
+{
+    public $timestamps = false;
+    public $incrementing = false;
+    protected $primaryKey = 'signal';
+    protected $fillable = [
+        'name', 'data', 'date', 'signal', 'comment',
+    ];
+
+    protected $casts = [
+        'date' => 'datetime',
+    ];
+
+    // Signal for setting the default activation date to the next semester.
+    const INTERNET_ACTIVATION_SIGNAL = 0;
+    // Signal for notifying the students to make a statement regarding their status
+    // in the next semester.
+    const SEND_STATUS_STATEMENT_REQUEST = 1;
+    // Deadline for the above signal; when triggered, everyone who did not make a
+    // statement will be set to inactive.
+    const DEACTIVATE_STATUS_SIGNAL = 2;
+    const SIGNALS = [
+        self::INTERNET_ACTIVATION_SIGNAL,
+        self::SEND_STATUS_STATEMENT_REQUEST,
+        self::DEACTIVATE_STATUS_SIGNAL,
+    ];
+
+    public static function listen()
+    {
+        $now = Carbon::now();
+        $events = EventTrigger::where('date', '<=', $now)
+                              ->where('date', '>', $now->subHours(1));
+        foreach ($events as $event) {
+            $event->handleSignal();
+        }
+
+        return $events;
+    }
+
+    /* Getters */
+
+    public static function internetActivationDeadline()
+    {
+        return self::find(self::INTERNET_ACTIVATION_SIGNAL)->data;
+    }
+
+    public static function statementRequestDate()
+    {
+        return self::find(self::SEND_STATUS_STATEMENT_REQUEST)->date;
+    }
+
+    public static function statementDeadline()
+    {
+        return self::find(self::DEACTIVATE_STATUS_SIGNAL)->date;
+    }
+
+    /* Handlers which are fired when the set date is reached. */
+
+    public function handleSignal()
+    {
+        switch ($this->signal) {
+            case self::INTERNET_ACTIVATION_SIGNAL:
+                $this->handleInternetActivationSignal();
+                break;
+            case self::SEND_STATUS_STATEMENT_REQUEST:
+                $this->handleSendStatusStatementRequest();
+                break;
+            case self::DEACTIVATE_STATUS_SIGNAL:
+                $this->deactivateStatus();
+                break;
+            default:
+                Log::warning('Event Trigger got undefined signal: '.$this->signal);
+                break;
+        }
+
+        return $this;
+    }
+
+    private function handleInternetActivationSignal()
+    {
+        $months_to_add = Semester::current()->isSpring() ? 7 : 5;
+        $current_date = Carbon::instance($this->date);
+        $current_data = Carbon::parse($this->data);
+        $this->update([
+            // Update the new trigger date
+            'date' => $current_date->addMonth($months_to_add),
+            // Update the new activation deadline
+            'data' => $current_data->addMonth($months_to_add),
+        ]);
+    }
+
+    private function handleSendStatusStatementRequest()
+    {
+        $months_to_add = Semester::current()->isSpring() ? 7 : 5;
+        $current_date = Carbon::instance($this->date);
+
+        // Triggering the event
+        SecretariatController::sendStatementMail();
+
+        $this->update([
+            // Update the new trigger date
+            'date' => $current_date->addMonth($months_to_add),
+        ]);
+    }
+
+    private function deactivateStatus()
+    {
+        $months_to_add = Semester::current()->isSpring() ? 7 : 5;
+        $current_date = Carbon::instance($this->date);
+
+        // Triggering the event
+        SecretariatController::finalizeStatements();
+
+        $this->update([
+            // Update the new trigger date
+            'date' => $current_date->addMonth($months_to_add),
+        ]);
+    }
+}

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -32,7 +32,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +44,7 @@ public function report(Exception $exception)
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/Http/Controllers/Admin/RegistrationsController.php

@@ -24,14 +24,14 @@ public function accept(Request $request)
     {
         User::findOrFail($request->user_id)->update(['verified' => true]);
 
-        return redirect()->route('admin.registrations');
+        return redirect()->back()->with('message', __('general.successful_modification'));
     }
 
     public function reject(Request $request)
     {
         User::findOrFail($request->user_id)->delete();
 
-        return redirect()->route('admin.registrations');
+        return redirect()->back()->with('message', __('general.successful_modification'));
     }
 
     public function show(Request $request)