v1.5.25a - Updated UserController

Added comments in middleware

.idea/codeStyles/Project.xml

@@ -94,7 +94,6 @@
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
             </rule>
           </section>
           <section>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/dataSources.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="laravel.sqlite" uuid="bf392a85-1584-4a27-a552-e491a55b9410">
+    <data-source source="LOCAL" name="laravel.sqlite" uuid="f7be1ece-08dd-4ce3-8bc7-5dce0780cc96">
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
 </project>

.idea/encodings.xml

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/backpack-hvid.svg" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/eye-dark.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/feedback.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/food.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/location.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/phone.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/preview-dark.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/preview.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/print-hvid.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/questionmark.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/statistics.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/users-hvid.svg" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/wash.svg" charset="UTF-8" />
   </component>
 </project>

.idea/php.xml

@@ -4,30 +4,23 @@
     <include_path>
       <path value="$PROJECT_DIR$/skolehjem/vendor/psr/container" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/psr/event-dispatcher" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-factory" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-message" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/psr/log" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/psy/psysh" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/opis/closure" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/voku/portable-ascii" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/asm89/stack-cors" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/brick/math" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/nikic/php-parser" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/defuse/php-encryption" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/league/commonmark" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/league/event" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/league/flysystem" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/league/oauth2-server" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/nesbot/carbon" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/nyholm/psr7" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/collection" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/uuid" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/vlucas/phpdotenv" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/dnoegel/php-xdg-base-dir" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/egulias/email-validator" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-diactoros" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-zendframework-bridge" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/laravel/framework" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/laravel/passport" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/laravel/tinker" />
@@ -62,16 +55,12 @@
       <path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/inflector" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/lexer" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/firebase/php-jwt" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/lcobucci/jwt" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/php-http/message-factory" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/fideloper/proxy" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/fruitcake/laravel-cors" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/paragonie/random_compat" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpoption/phpoption" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpseclib/phpseclib" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/guzzle" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/promises" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/psr7" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
@@ -79,21 +68,12 @@
       <path value="$PROJECT_DIR$/skolehjem/vendor/composer" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/spatie/laravel-permission" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/laravel/ui" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/jenssegers/agent" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/scrivo/highlight.php" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/filp/whoops" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition-contracts" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/mockery/mockery" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/theseer/tokenizer" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/webmozart/assert" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/fzaninotto/faker" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-timer" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-text-template" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-token-stream" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/version" />
@@ -119,9 +99,52 @@
       <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/phpunit" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/myclabs/deep-copy" />
       <path value="$PROJECT_DIR$/skolehjem/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/laravelcollective/html" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/directorytree/ldaprecord" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/directorytree/ldaprecord-laravel" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/tightenco/collect" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/dompdf/dompdf" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/barryvdh/laravel-dompdf" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/phenx/php-font-lib" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/phenx/php-svg-lib" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/laravel-notification-channels/webpush" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/minishlink/web-push" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-client" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-key-mgmt" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-diactoros" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/laminas/laminas-zendframework-bridge" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/lcobucci/jwt" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/php-http/message-factory" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/league/commonmark" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/filp/whoops" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/fideloper/proxy" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/promises" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/jenssegers/agent" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/spomky-labs/base64url" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-core" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/league/mime-type-detection" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/scrivo/highlight.php" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/thecodingmachine/safe" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/psy/psysh" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/postcss/postcss" />
+      <path value="$PROJECT_DIR$/skolehjem/vendor/react/promise" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
   <component name="PhpUnit">
     <phpunit_settings>
       <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/skolehjem/vendor/autoload.php" />

.idea/skolehjem-webapp.iml

@@ -2,23 +2,25 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/skolehjem/app" isTestSource="false" packagePrefix="App\" />
       <sourceFolder url="file://$MODULE_DIR$/skolehjem/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/skolehjem/app" isTestSource="false" packagePrefix="App\" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/asm89/stack-cors" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/barryvdh/laravel-dompdf" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/brick/math" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/defuse/php-encryption" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dnoegel/php-xdg-base-dir" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/inflector" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/instantiator" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/lexer" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dompdf/dompdf" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dragonmantank/cron-expression" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/egulias/email-validator" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/flare-client-php" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition-contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fgrosse/phpasn1" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fideloper/proxy" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/filp/whoops" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/firebase/php-jwt" />
@@ -30,17 +32,18 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/hamcrest/hamcrest-php" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jenssegers/agent" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laminas/laminas-diactoros" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel-notification-channels/webpush" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laminas/laminas-zendframework-bridge" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/framework" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/passport" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/tinker" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravel/ui" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/lcobucci/jwt" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laravelcollective/html" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/commonmark" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/event" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/flysystem" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/mime-type-detection" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/oauth2-server" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/minishlink/web-push" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mockery/mockery" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/monolog/monolog" />
@@ -53,7 +56,8 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/paragonie/random_compat" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phar-io/manifest" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phar-io/version" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/php-http/message-factory" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phenx/php-font-lib" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phenx/php-svg-lib" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/reflection-common" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/reflection-docblock" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/type-resolver" />
@@ -68,6 +72,7 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/phpunit" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/container" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/event-dispatcher" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/http-client" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/http-factory" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/http-message" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/log" />
@@ -76,7 +81,7 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/collection" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/uuid" />
-      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/scrivo/highlight.php" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sabberworm/php-css-parser" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/code-unit-reverse-lookup" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/comparator" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/diff" />
@@ -90,6 +95,7 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/type" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/version" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spatie/laravel-permission" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spomky-labs/base64url" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/console" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/css-selector" />
@@ -98,6 +104,7 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/event-dispatcher" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/event-dispatcher-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/finder" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/http-client-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/http-foundation" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/http-kernel" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/mime" />
@@ -122,7 +129,14 @@
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/vlucas/phpdotenv" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/voku/portable-ascii" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-core" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-key-mgmt" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-signature-algorithm-ecdsa" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/web-token/jwt-util-ecc" />
       <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/webmozart/assert" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/postcss/postcss" />
+      <excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/react/promise" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

mobileapp/android/app/src/main/java/sde/odense/skolehjem/MainActivity.java

@@ -1,35 +1,101 @@
 package sde.odense.skolehjem;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.webkit.JavascriptInterface;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
 import android.webkit.JsResult;
+import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class MainActivity extends AppCompatActivity {
-
     private WebView webView;
     private static final String TEL_PREFIX = "tel:";
 
+    private static final String TAG = MainActivity.class.getSimpleName();
+    private final static int FCR = 1;
+    private String mCM;
+    private ValueCallback<Uri> mUM;
+    private ValueCallback<Uri[]> mUMA;
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            Uri[] results = null;
+
+            //Check if response is positive
+            if (resultCode == Activity.RESULT_OK) {
+                if (requestCode == FCR) {
+
+                    if (null == mUMA) {
+                        return;
+                    }
+                    if (intent == null) {
+                        //Capture Photo if no image available
+                        if (mCM != null) {
+                            results = new Uri[]{Uri.parse(mCM)};
+                        }
+                    } else {
+                        String dataString = intent.getDataString();
+                        if (dataString != null) {
+                            results = new Uri[]{Uri.parse(dataString)};
+                        }
+                    }
+                }
+            }
+            mUMA.onReceiveValue(results);
+            mUMA = null;
+        } else {
+
+            if (requestCode == FCR) {
+                if (null == mUM) return;
+                Uri result = intent == null || resultCode != RESULT_OK ? null : intent.getData();
+                mUM.onReceiveValue(result);
+                mUM = null;
+            }
+        }
+    }
+
     @SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"})
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        if (Build.VERSION.SDK_INT >= 23 && (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)) {
+            ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA}, 1);
+        }
+
         webView = findViewById(R.id.webView);
-        webView.setWebViewClient(new CustomWebViewClient());
-        webView.setWebChromeClient(new CustomWebChromeClient(this));
 
         //Settings
         WebSettings webSettings = webView.getSettings();
@@ -42,38 +108,20 @@ public class MainActivity extends AppCompatActivity {
         webSettings.setSupportZoom(true);
         webSettings.setDefaultTextEncodingName("utf-8");
         webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webSettings.setAllowFileAccess(true);
 
-        webView.loadUrl("https://ekapp.sde.dk");
+        if (Build.VERSION.SDK_INT >= 21) {
+            webSettings.setMixedContentMode(0);
+            webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        } else if (Build.VERSION.SDK_INT >= 19) {
+            webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        } else if (Build.VERSION.SDK_INT < 19) {
+            webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
 
-    @Override
+        webView.setWebViewClient(new CustomWebViewClient());
-    public void onBackPressed() {
+        webView.setWebChromeClient(new WebChromeClient(){
-        if(webView.canGoBack())
+            Context myApp = getApplicationContext();
-            webView.goBack();
-        else
-            super.onBackPressed();
-    }
-
-    private class CustomWebViewClient extends WebViewClient {
-
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView wv, String url) {
-            if(url.startsWith(TEL_PREFIX)) {
-                Intent intent = new Intent(Intent.ACTION_DIAL);
-                intent.setData(Uri.parse(url));
-                startActivity(intent);
-                return true;
-            }
-            return false;
-        }
-    }
-
-    static final class CustomWebChromeClient extends WebChromeClient {
-        Context myApp;
-
-        CustomWebChromeClient(Context mContext){
-            myApp = mContext;
-        }
 
             @Override
             public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
@@ -101,5 +149,148 @@ public class MainActivity extends AppCompatActivity {
 
                 return true;
             }
+
+            //For Android 3.0+
+            public void openFileChooser(ValueCallback<Uri> uploadMsg) {
+
+                mUM = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                MainActivity.this.startActivityForResult(Intent.createChooser(i, "File Chooser"), FCR);
+            }
+
+            // For Android 3.0+, above method not supported in some android 3+ versions, in such case we use this
+            public void openFileChooser(ValueCallback uploadMsg, String acceptType) {
+
+                mUM = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                MainActivity.this.startActivityForResult(
+                        Intent.createChooser(i, "File Browser"),
+                        FCR);
+            }
+
+            //For Android 4.1+
+            public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
+                mUM = uploadMsg;
+                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                i.addCategory(Intent.CATEGORY_OPENABLE);
+                i.setType("*/*");
+                MainActivity.this.startActivityForResult(Intent.createChooser(i, "File Chooser"), MainActivity.FCR);
+            }
+
+            //For Android 5.0+
+            public boolean onShowFileChooser(
+                    WebView webView, ValueCallback<Uri[]> filePathCallback,
+                    WebChromeClient.FileChooserParams fileChooserParams) {
+
+                if (mUMA != null) {
+                    mUMA.onReceiveValue(null);
+                }
+
+                mUMA = filePathCallback;
+                Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                if (takePictureIntent.resolveActivity(MainActivity.this.getPackageManager()) != null) {
+
+                    File photoFile = null;
+
+                    try {
+                        photoFile = createImageFile();
+                        takePictureIntent.putExtra("PhotoPath", mCM);
+                    } catch (IOException ex) {
+                        Log.e(TAG, "Image file creation failed", ex);
+                    }
+                    if (photoFile != null) {
+                        mCM = "file:" + photoFile.getAbsolutePath();
+                        takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(photoFile));
+                    } else {
+                        takePictureIntent = null;
+                    }
+                }
+
+                Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
+                contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
+                contentSelectionIntent.setType("*/*");
+                Intent[] intentArray;
+
+                if (takePictureIntent != null) {
+                    intentArray = new Intent[]{takePictureIntent};
+                } else {
+                    intentArray = new Intent[0];
+                }
+
+                Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
+                chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
+                chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser");
+                chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
+                startActivityForResult(chooserIntent, FCR);
+
+                return true;
+            }
+        });
+
+        webView.loadUrl("https://ekapp.sde.dk");
+    }
+
+    // Create an image file
+    private File createImageFile() throws IOException {
+
+        @SuppressLint("SimpleDateFormat") String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+        String imageFileName = "img_" + timeStamp + "_";
+        File storageDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
+        return File.createTempFile(imageFileName, ".jpg", storageDir);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(webView.canGoBack())
+            webView.goBack();
+        else
+            super.onBackPressed();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) {
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_BACK:
+
+                    if (webView.canGoBack()) {
+                        webView.goBack();
+                    } else {
+                        finish();
+                    }
+
+                    return true;
+            }
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private class CustomWebViewClient extends WebViewClient {
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView wv, String url) {
+            if(url.startsWith(TEL_PREFIX)) {
+                Intent intent = new Intent(Intent.ACTION_DIAL);
+                intent.setData(Uri.parse(url));
+                startActivity(intent);
+                return true;
+            }
+            return false;
+        }
+
+        public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+            Toast.makeText(getApplicationContext(), "Failed loading app!", Toast.LENGTH_SHORT).show();
+        }
     }
 }

mobileapp/android/build/intermediates/lint-cache/maven.google/androidx/appcompat/group-index.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <androidx.appcompat>
-  <appcompat versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-beta01,1.1.0-rc01,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-beta01,1.2.0-rc01,1.2.0-rc02,1.3.0-alpha01"/>
+  <appcompat versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-beta01,1.1.0-rc01,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-beta01,1.2.0-rc01,1.2.0-rc02,1.2.0,1.3.0-alpha01"/>
-  <appcompat-resources versions="1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-beta01,1.1.0-rc01,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-beta01,1.2.0-rc01,1.2.0-rc02,1.3.0-alpha01"/>
+  <appcompat-resources versions="1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-beta01,1.1.0-rc01,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-beta01,1.2.0-rc01,1.2.0-rc02,1.2.0,1.3.0-alpha01"/>
 </androidx.appcompat>

mobileapp/android/build/intermediates/lint-cache/maven.google/androidx/test/espresso/group-index.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <androidx.test.espresso>
-  <espresso-accessibility versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-accessibility versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-contrib versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-contrib versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-core versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-core versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-idling-resource versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-idling-resource versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-intents versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-intents versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-remote versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-remote versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
-  <espresso-web versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02"/>
+  <espresso-web versions="3.1.0-alpha1,3.1.0-alpha2,3.1.0-alpha3,3.1.0-alpha4,3.1.0-beta01,3.1.0-beta02,3.1.0,3.1.1-alpha01,3.1.1-beta01,3.1.1,3.1.2-alpha01,3.2.0-alpha02,3.2.0-alpha03,3.2.0-alpha04,3.2.0-alpha05,3.2.0-beta01,3.2.0,3.3.0-alpha01,3.3.0-alpha02,3.3.0-alpha03,3.3.0-alpha04,3.3.0-alpha05,3.3.0-beta01,3.3.0-beta02,3.3.0-rc01,3.3.0-rc02,3.3.0-rc03"/>
 </androidx.test.espresso>

mobileapp/android/build/intermediates/lint-cache/maven.google/androidx/test/ext/group-index.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <androidx.test.ext>
-  <junit versions="1.0.0-beta01,1.0.0-beta02,1.0.0,1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.1.1-alpha02,1.1.1-alpha03,1.1.1-alpha04,1.1.1-alpha05,1.1.1-beta01,1.1.1,1.1.2-alpha01,1.1.2-alpha02,1.1.2-alpha03,1.1.2-alpha04,1.1.2-alpha05,1.1.2-beta01,1.1.2-beta02,1.1.2-rc01,1.1.2-rc02"/>
+  <junit versions="1.0.0-beta01,1.0.0-beta02,1.0.0,1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.1.1-alpha02,1.1.1-alpha03,1.1.1-alpha04,1.1.1-alpha05,1.1.1-beta01,1.1.1,1.1.2-alpha01,1.1.2-alpha02,1.1.2-alpha03,1.1.2-alpha04,1.1.2-alpha05,1.1.2-beta01,1.1.2-beta02,1.1.2-rc01,1.1.2-rc02,1.1.2-rc03"/>
-  <junit-ktx versions="1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.1.1-alpha02,1.1.1-alpha03,1.1.1-alpha04,1.1.1-alpha05,1.1.1-beta01,1.1.1,1.1.2-alpha01,1.1.2-alpha02,1.1.2-alpha03,1.1.2-alpha04,1.1.2-alpha05,1.1.2-beta01,1.1.2-beta02,1.1.2-rc01,1.1.2-rc02"/>
+  <junit-ktx versions="1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.1.1-alpha02,1.1.1-alpha03,1.1.1-alpha04,1.1.1-alpha05,1.1.1-beta01,1.1.1,1.1.2-alpha01,1.1.2-alpha02,1.1.2-alpha03,1.1.2-alpha04,1.1.2-alpha05,1.1.2-beta01,1.1.2-beta02,1.1.2-rc01,1.1.2-rc02,1.1.2-rc03"/>
-  <truth versions="1.0.0-alpha2,1.0.0-alpha3,1.0.0-alpha4,1.0.0-beta01,1.0.0-beta02,1.0.0,1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-beta01,1.2.0,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-alpha05,1.3.0-beta01,1.3.0-beta02,1.3.0-rc01,1.3.0-rc02"/>
+  <truth versions="1.0.0-alpha2,1.0.0-alpha3,1.0.0-alpha4,1.0.0-beta01,1.0.0-beta02,1.0.0,1.1.0-alpha01,1.1.0-beta01,1.1.0,1.1.1-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-beta01,1.2.0,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-alpha05,1.3.0-beta01,1.3.0-beta02,1.3.0-rc01,1.3.0-rc02,1.3.0-rc03"/>
 </androidx.test.ext>

mobileapp/android/build/intermediates/lint-cache/maven.google/master-index.xml

@@ -42,6 +42,7 @@
   <androidx.enterprise/>
   <androidx.exifinterface/>
   <androidx.fragment/>
+  <androidx.games/>
   <androidx.gaming/>
   <androidx.gridlayout/>
   <androidx.heifwriter/>

mobileapp/ios/skolehjem/skolehjem.xcodeproj/project.pbxproj

@@ -0,0 +1,338 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		63D90CA924EFD14600E5833A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D90CA824EFD14600E5833A /* AppDelegate.swift */; };
+		63D90CAB24EFD14600E5833A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D90CAA24EFD14600E5833A /* ViewController.swift */; };
+		63D90CAE24EFD14600E5833A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63D90CAC24EFD14600E5833A /* Main.storyboard */; };
+		63D90CB024EFD16000E5833A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63D90CAF24EFD16000E5833A /* Assets.xcassets */; };
+		63D90CB324EFD16100E5833A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63D90CB124EFD16100E5833A /* LaunchScreen.storyboard */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		63D90CA524EFD14600E5833A /* skolehjem.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = skolehjem.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		63D90CA824EFD14600E5833A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		63D90CAA24EFD14600E5833A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		63D90CAD24EFD14600E5833A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		63D90CAF24EFD16000E5833A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		63D90CB224EFD16100E5833A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		63D90CB424EFD16300E5833A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		63D90CA224EFD14600E5833A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		63D90C9C24EFD14600E5833A = {
+			isa = PBXGroup;
+			children = (
+				63D90CA724EFD14600E5833A /* skolehjem */,
+				63D90CA624EFD14600E5833A /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		63D90CA624EFD14600E5833A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				63D90CA524EFD14600E5833A /* skolehjem.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		63D90CA724EFD14600E5833A /* skolehjem */ = {
+			isa = PBXGroup;
+			children = (
+				63D90CA824EFD14600E5833A /* AppDelegate.swift */,
+				63D90CAA24EFD14600E5833A /* ViewController.swift */,
+				63D90CAC24EFD14600E5833A /* Main.storyboard */,
+				63D90CAF24EFD16000E5833A /* Assets.xcassets */,
+				63D90CB124EFD16100E5833A /* LaunchScreen.storyboard */,
+				63D90CB424EFD16300E5833A /* Info.plist */,
+			);
+			path = skolehjem;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		63D90CA424EFD14600E5833A /* skolehjem */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 63D90CB724EFD16400E5833A /* Build configuration list for PBXNativeTarget "skolehjem" */;
+			buildPhases = (
+				63D90CA124EFD14600E5833A /* Sources */,
+				63D90CA224EFD14600E5833A /* Frameworks */,
+				63D90CA324EFD14600E5833A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = skolehjem;
+			productName = skolehjem;
+			productReference = 63D90CA524EFD14600E5833A /* skolehjem.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		63D90C9D24EFD14600E5833A /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1010;
+				LastUpgradeCheck = 1010;
+				TargetAttributes = {
+					63D90CA424EFD14600E5833A = {
+						CreatedOnToolsVersion = 10.1;
+					};
+				};
+			};
+			buildConfigurationList = 63D90CA024EFD14600E5833A /* Build configuration list for PBXProject "skolehjem" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 63D90C9C24EFD14600E5833A;
+			productRefGroup = 63D90CA624EFD14600E5833A /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				63D90CA424EFD14600E5833A /* skolehjem */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		63D90CA324EFD14600E5833A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				63D90CB324EFD16100E5833A /* LaunchScreen.storyboard in Resources */,
+				63D90CB024EFD16000E5833A /* Assets.xcassets in Resources */,
+				63D90CAE24EFD14600E5833A /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		63D90CA124EFD14600E5833A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				63D90CAB24EFD14600E5833A /* ViewController.swift in Sources */,
+				63D90CA924EFD14600E5833A /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		63D90CAC24EFD14600E5833A /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				63D90CAD24EFD14600E5833A /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		63D90CB124EFD16100E5833A /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				63D90CB224EFD16100E5833A /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		63D90CB524EFD16300E5833A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		63D90CB624EFD16300E5833A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		63D90CB824EFD16400E5833A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 3ZZXP29LWT;
+				INFOPLIST_FILE = skolehjem/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = sde.odense.skolehjem;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		63D90CB924EFD16400E5833A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 3ZZXP29LWT;
+				INFOPLIST_FILE = skolehjem/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = sde.odense.skolehjem;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		63D90CA024EFD14600E5833A /* Build configuration list for PBXProject "skolehjem" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				63D90CB524EFD16300E5833A /* Debug */,
+				63D90CB624EFD16300E5833A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		63D90CB724EFD16400E5833A /* Build configuration list for PBXNativeTarget "skolehjem" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				63D90CB824EFD16400E5833A /* Debug */,
+				63D90CB924EFD16400E5833A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 63D90C9D24EFD14600E5833A /* Project object */;
+}

mobileapp/ios/skolehjem/skolehjem.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:skolehjem.xcodeproj">
+   </FileRef>
+</Workspace>

mobileapp/ios/skolehjem/skolehjem.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

mobileapp/ios/skolehjem/skolehjem.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

mobileapp/ios/skolehjem/skolehjem.xcodeproj/project.xcworkspace/xcuserdata/macuser.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>EnabledFullIndexStoreVisibility</key>
+	<false/>
+	<key>IssueFilterStyle</key>
+	<string>ShowActiveSchemeOnly</string>
+	<key>LiveSourceIssuesEnabled</key>
+	<true/>
+</dict>
+</plist>

mobileapp/ios/skolehjem/skolehjem.xcodeproj/xcuserdata/macuser.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>skolehjem.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

mobileapp/ios/skolehjem/skolehjem/AppDelegate.swift

@@ -0,0 +1,45 @@
+//
+//  AppDelegate.swift
+//  skolehjem
+//
+//  Created by macuser on 21/08/2020.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+

mobileapp/ios/skolehjem/skolehjem/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-1.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-2.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-3.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-12.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-13.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-4.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-5.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-7.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-6.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-8.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-9.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-10.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-11.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-15.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-17.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "ic_launcher-14.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

mobileapp/ios/skolehjem/skolehjem/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

mobileapp/ios/skolehjem/skolehjem/Assets.xcassets/LaunchImage-2.launchimage/Contents.json

@@ -0,0 +1,55 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-4.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-1.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-5.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-2.png",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-3.png",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

mobileapp/ios/skolehjem/skolehjem/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,55 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-playstore-1.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-playstore-2.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-playstore.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "ic_launcher-playstore-3.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-playstore-4.png",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "ic_launcher-playstore-5.png",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

mobileapp/ios/skolehjem/skolehjem/Assets.xcassets/ic_launcher-playstore.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_launcher-playstore.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

mobileapp/ios/skolehjem/skolehjem/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>

mobileapp/ios/skolehjem/skolehjem/Base.lproj/Main.storyboard

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="skolehjem" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dOs-vr-ypo">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" id="Pfe-Cd-k86"/>
+                                    <constraint firstAttribute="height" id="hew-AW-sXK"/>
+                                </constraints>
+                                <wkWebViewConfiguration key="configuration">
+                                    <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
+                                    <wkPreferences key="preferences"/>
+                                </wkWebViewConfiguration>
+                            </wkWebView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="dOs-vr-ypo" secondAttribute="trailing" id="Aoi-yr-vW8"/>
+                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="dOs-vr-ypo" secondAttribute="bottom" id="bNv-IA-yjS"/>
+                            <constraint firstItem="dOs-vr-ypo" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="gQ6-h0-DTj"/>
+                            <constraint firstItem="dOs-vr-ypo" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="vWk-bF-fhF"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                    <connections>
+                        <outlet property="webview" destination="dOs-vr-ypo" id="ORa-um-VSy"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="133.59999999999999" y="133.5832083958021"/>
+        </scene>
+    </scenes>
+</document>

mobileapp/ios/skolehjem/skolehjem/Info.plist

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>SDE Skolehjem</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>Main</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

mobileapp/ios/skolehjem/skolehjem/ViewController.swift

@@ -0,0 +1,27 @@
+//
+//  ViewController.swift
+//  skolehjem
+//
+//  Created by macuser on 21/08/2020.
+//
+
+import UIKit
+import WebKit
+
+
+class ViewController: UIViewController {
+    @IBOutlet weak var webview: WKWebView!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad();
+        
+        let url = URL(string: "https://ekapp.sde.dk");
+        let request = URLRequest(url: url!);
+        
+        webview.scrollView.isMultipleTouchEnabled = false;
+        webview.load(request);
+    }
+
+
+}
+

package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

skolehjem/.env.example

@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=
+APP_KEY=base64:xxOWN1DEzzMxOUEi981cuqkLQs68/dnw2vmv4JtNXjA=
 APP_DEBUG=true
 APP_URL=http://localhost
 
@@ -9,8 +9,8 @@ LOG_CHANNEL=stack
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravel
+DB_DATABASE=/home/user/Documents/PhpstormProjects/skolehjem-webapp/skolehjem/database/laravel.sqlite
-DB_USERNAME=root
+DB_USERNAME=
 DB_PASSWORD=
 
 BROADCAST_DRIVER=log
@@ -44,3 +44,16 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+LDAP_LOGGING=true
+LDAP_CONNECTION=default
+LDAP_HOST=127.0.0.1
+LDAP_USERNAME="cn=user,dc=local,dc=com"
+LDAP_PASSWORD=secret
+LDAP_PORT=389
+LDAP_BASE_DN="dc=local,dc=com"
+LDAP_TIMEOUT=5
+LDAP_SSL=false
+LDAP_TLS=false
+
+HTTPS_ONLY=false

skolehjem/.gitignore

@@ -12,3 +12,4 @@ npm-debug.log
 yarn-error.log
 /public/css/app.css
 /public/js/app.js
+/public/uploads/

skolehjem/.htaccess

@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteRule ^/((?!\.well-known)(/.*)?)$ [L]
+RewriteRule ^(.*)$ public/$1 [L]

skolehjem/app/AllowAction.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AllowAction extends Model
+{
+    protected $fillable = [
+        'action', 'allow'
+    ];
+}

skolehjem/app/Event.php

@@ -20,6 +20,6 @@ class Event extends Model
      */
     //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
-        "name", "description", "date"
+        "name", "accountable", "description", "date", "resource_id"
     ];
 }

skolehjem/app/Exceptions/Handler.php

@@ -50,6 +50,10 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
+        // Otherwise display internal error message
+        if(app()->environment() === 'production') {
+            return view('errors.500');
+        }
         return parent::render($request, $exception);
     }
 }

skolehjem/app/Guide.php

@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class Guide extends Model
 {
     protected $fillable = [
-        'name', 'guide_articles'
+        'name', 'guide_articles', 'guide_category_id', 'resource_id'
     ];
 }

skolehjem/app/GuidesCategory.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class GuidesCategory extends Model
+{
+    protected $fillable = [
+        'guidesCategoryName'
+    ];
+}

skolehjem/app/Helpers.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Collection;
+
+class Helpers
+{
+    public static function closetags($html) {
+        preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
+        $openedtags = $result[1];
+        preg_match_all('#</([a-z]+)>#iU', $html, $result);
+        $closedtags = $result[1];
+        $len_opened = count($openedtags);
+        if (count($closedtags) == $len_opened) {
+            return $html;
+        }
+        $openedtags = array_reverse($openedtags);
+        for ($i=0; $i < $len_opened; $i++) {
+            if (!in_array($openedtags[$i], $closedtags)) {
+                $html .= '</'.$openedtags[$i].'>';
+            } else {
+                unset($closedtags[array_search($openedtags[$i], $closedtags)]);
+            }
+        }
+        return $html;
+    }
+
+
+    public static function sendNewsNotification(News $news, Collection $users){
+        $headers = 'Content-Transfer-Encoding: 8bit'. "\r\n".
+                   'Content-Type: text/html; charset="UTF-8"';
+
+        foreach ($users as $user) {
+            $email = $user->email;
+
+            if($news->name !== "")
+                $subject = $news->name;
+            else
+                $subject = $news->subname;
+
+            $msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDer er kommet en ny nyhed i skolehjems appen! ";
+
+            //Hello, im here to help the future developer that has this problem,
+            //you have to open up you installed php version, find and
+            //open your php.ini and search for [mail function] and enter the
+            // right information and enable some stuff - Big Smoke
+            mail($email, $subject, $msg, $headers);
+        }
+    }
+}

skolehjem/app/Helpers/Detector.php

@@ -3,9 +3,7 @@
 
 namespace App\Helpers;
 
-
+use Illuminate\Support\Facades\Auth;
-
-
 use Jenssegers\Agent\Agent;
 
 class Detector
@@ -16,7 +14,13 @@ class Detector
 
         if($agent->isMobile()) {
             return view(config("detector.mobilePath") . "." . $viewName, $args);
-        }
+        } else if(Auth()->user() !== null) {
+            if (Auth()->user()->can('admin.panel.show') == true)
                 return view(config("detector.defaultPath") . "." . $viewName, $args);
         }
+        if($viewName == "users.login" || $viewName == "users.logout")
+            return view(config("detector.mobilePath") . "." . $viewName, $args);
+
+        return view("errors.403", $args);
+    }
 }

skolehjem/app/Http/Controllers/AboutController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class AboutController extends Controller
+{
+
+    //Check authentication and languages settings
+    public function __construct()
+    {
+        //The middleware is being run just before the pages is getting loaded
+        $this->middleware(["auth"]);
+        $this->middleware(["lang"]);
+    }
+
+    /*
+    Index controller, all backend work for the about index
+    pages is done here.
+    */
+    public function index(Request $request)
+    {
+        /*
+        Response::detect is a library that we use to
+        detect if you are on mobile or desktop.
+        If you are on mobile it sends you to the
+        /resources/views/app/about/index
+        and if you are on desktop it sends you to
+        /resources/views/admin/about/index (There is no "about" on desktop view).
+
+        Normally the index pages only contain the return of the index pages
+        but you are allowed to modify the index function to how may like.
+        */
+        return Response::detect("about.index");
+    }
+}

skolehjem/app/Http/Controllers/AllowActionController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\AllowAction;
+use Illuminate\Http\Request;
+
+class AllowActionController extends Controller
+{
+    /*We use $request to get the data from the HTMl pages*/
+    function AllowActionRegistering(Request $request) {
+        /*
+         Here we use our model AllowAction and the Laravel function "find",
+        in the "find" functions parameter we pass "$request->id" to find out what
+        number the it contains.
+        */
+        $action = AllowAction::find($request->id);
+
+        /*Call the Laravel "update" function to update number in the database
+
+        If the allow column in the database is equal to 1 there is open for registration
+        If the allow column is equal to 0 there is closed for registration
+        */
+        $action->update([ 'allow' => $request->allow ]);
+    }
+}

skolehjem/app/Http/Controllers/ContactController.php

@@ -12,10 +12,14 @@ class ContactController extends Controller
 {
     public function __construct()
     {
+        //Check authentication and languages settings
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
-        $this->middleware([ "check.auth:contact.list" ])->only("index");
+        //The middleware is being run just before the pages is getting loaded.
-        $this->middleware([ "check.auth:contact.show" ])->only("show");
+
+        //We use this middleware to chek if a user has the right permission/authentication to view the pages
+        $this->middleware([ "check.auth:contact.show" ])->only("show", "index");
         $this->middleware([ "check.auth:contact.create" ])->only("create", "store");
         $this->middleware([ "check.auth:contact.edit" ])->only("edit", "update");
         $this->middleware([ "check.auth:contact.delete" ])->only("delete");
@@ -26,11 +30,19 @@ class ContactController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
+
+    //Controller for the contact index pages, all backend work for the contact index pages is done here.
     public function index(Request $request)
     {
+        //We use the Contact model to query all information from the contact form in the database
+        $contact = Contact::query()->get();
 
-        $contact = Contact::query()->paginate($request->input("limit", 20));
+        /*
-
+         Here we return/pass the contact variable containing all the database information to the
+         contacts.index pages as a parameter. The "contacts" in green text is the name you have to use
+        on the index pages to get the data from the database, you can name it what ever you want, but its best
+        best practice to give it a describing name.
+        */
         return Response::detect("contacts.index", [ "contacts" => $contact]);
     }
 
@@ -39,10 +51,11 @@ class ContactController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
+
+    /*The create controller, all it has to do is redirect you to the contacts create pages*/
     public function create()
     {
         return Response::detect("contacts.create");
-
     }
 
     /**
@@ -51,23 +64,33 @@ class ContactController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
+
+    //The store controller is used to store user data.
     public function store(Request $request)
     {
+        //Validate that the user gave a contactname, title, email, phone and make sure its required and only contains max 255.
         $requestContact = $request->validate([
             "contactname" => "required|max:255",
             "title" => "required|max:255",
             "email" => "required|max:255",
-            "phone" => "required|max:255",
+            "phone" => "max:255",
         ]);
 
+        //Make a new instance of the contact modal and pass $requestContact to be saved in the database
         $contact = new Contact($requestContact);
+        //Set phonetimes to what the user entered, we dont validate thats why it has its on "save" function .
         $contact->phonetimes = $request->phonetimes;
+        //Call the save function.
         $saved = $contact->save();
 
+        //If it couldn't save redirect to the contacts.store view
         if(!$saved){
             return redirect()->route("contacts.store");
         }else{
-            $contact = Contact::query()->paginate($request->input("limit", 20));
+            /*If it did get saved query all information from the database and redirect to contacts.index with the parameter
+            contacts
+            */
+            $contact = Contact::query()->get();
             return redirect()->route("contacts.index", ['contacts' => $contact]);
         }
 
@@ -79,6 +102,8 @@ class ContactController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
+
+    //The show controller is used to show a single entity from the database based on the id its get
     public function show($id)
     {
         return Response::detect("contacts.show", [ "contacts" => $id]);
@@ -91,6 +116,10 @@ class ContactController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
+
+    /*Edit controller finds all the data on the specific id passed to it, finds that entity from the database and
+    that match with the id and redirect you to the edit pages.
+    */
     public function edit($id)
     {
         $contact = Contact::find($id);
@@ -104,18 +133,27 @@ class ContactController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
+
+    //Update controller
     public function update(Request $request, $id)
     {
-
+        //request all the data from the database
         $data = $request->all();
+        //Find the entity in the database that match the id
         $contact = Contact::find($id);
+        //Call the update function
         $contact->update($data);
+        //Call the save function
         $saved = $contact->save();
 
+        //If it couldn't save redirect to the contacts.update view
         if(!$saved){
             return redirect()->route("contacts.update", [ "contacts" => $contact ]);
         }else{
-            $contact = Contact::query()->paginate($request->input("limit", 20));
+            /*If it did get saved query all information from the database and redirect to contacts.index with the parameter
+            contacts
+            */
+            $contact = Contact::query()->get();
             return redirect()->route("contacts.index", ['contacts' => $contact]);
         }
 
@@ -128,75 +166,11 @@ class ContactController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Exception
      */
+    //The destroy controller finds the id and calls a delete function, after that it redirects to contact index.
     public function destroy($id)
     {
         $contact = Contact::find($id);
         $contact->delete();
         return redirect()->route("contacts.index");
     }
-
-
-
-    public function search(Request $request){
-        if($request->ajax()){
-            $output = "<tr>".
-                "<th>Kontakt Navn</th>".
-                "<th>Titel</th>".
-                "<th>E-mail</th>".
-                "<th>Tlf</th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
-                "</tr>";
-
-
-
-            if($request->isCheck === "navn")
-                $users = Contact::query()->where('contactname', 'LIKE',$request->search.'%')->get();
-            elseif ($request->isCheck === "titel")
-                $users = Contact::query()->where('title', 'LIKE',$request->search.'%')->get();
-            elseif ($request->isCheck === "email")
-                $users = Contact::query()->where('email', 'LIKE',$request->search.'%')->get();
-            elseif ($request->isCheck === "tf")
-                $users = Contact::query()->where('phone', 'LIKE',$request->search.'%')->get();
-            else
-            $users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%')
-                ->orWhere('title','LIKE', $request->search.'%')
-                ->orWhere('phone','LIKE', $request->search.'%')
-                ->orWhere('email','LIKE',$request->search. '%')->get();
-
-            if(count($users) !== 0){
-                foreach ($users as $key => $user){
-                    $output.='<tr>'.
-                        '<td>' . $user->contactname . '</td>'.
-                        '<td>' . $user->title . '</td>'.
-                        '<td>' . $user->email . '</td>'.
-                        '<td>' . $user->phone .'</td>'.
-                        '<td><a href="'. route("contacts.edit", [ "contact" => $user->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
-                        '<td><form method="post" action="' .route("contacts.destroy", [ "contact" => $user->id ]). '" class="w-100 nostyle">'.
-                            csrf_field().
-                            method_field("delete").
-
-                            '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
-                            '</form>'.
-                        '</td>'.
-                        '</tr>';
-                }
-            }else{
-                $output.='<tr>'.
-                    '<td>Intet match</td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '</tr>';
-            }
-            return Response($output);
-        }
-    }
-
-
-
-
-
 }

skolehjem/app/Http/Controllers/EventController.php

@@ -3,21 +3,25 @@
 namespace App\Http\Controllers;
 
 use App\Event;
+use App\News;
+use App\Notification;
+use App\Resource;
 use App\UserEvent;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 
+date_default_timezone_set('Europe/Copenhagen');
 
 class EventController extends Controller
 {
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
-        $this->middleware([ "check.auth:event.list" ])->only("index");
+        $this->middleware([ "check.auth:event.show" ])->only("show", "index");
-        $this->middleware([ "check.auth:event.show" ])->only("show");
         $this->middleware([ "check.auth:event.create" ])->only("create", "store");
         $this->middleware([ "check.auth:event.edit" ])->only("edit", "update");
         $this->middleware([ "check.auth:event.delete" ])->only("delete");
@@ -30,9 +34,7 @@ class EventController extends Controller
      */
     public function index(Request $request)
     {
-
+        $events = Event::query()->orderBY('date' , 'asc')->get();
-        $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
-
         //returns the function with events index page and a parameter of events.
         //also Response::detect checks screen size to determine if user is on a computer or mobile.
         return Response::detect("events.index", [ "events" => $events]);
@@ -53,13 +55,14 @@ class EventController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
         $requestBody = $request->validate([
             "name" => "required|max:255",
-            "description" => "required|max:255",
+            "accountable" => "required|max:255",
+            "description" => "required",
             "date" => "required"
         ]);
 
@@ -68,14 +71,38 @@ class EventController extends Controller
 
         $allEvents = Event::query()->where('name', '=', $request->name)->get();
 
-        if(count($allEvents) > 0)
+        if(count($allEvents) > 0) {
-            return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
-        else {
-            $event->save();
-            $event = Event::query()->paginate($request->input("limit", 20));
             return redirect()->route("events.index", ['events' => $event]);
+        } else {
+            if($request->file("resource")) {
+                $event->resource_id = ResourceController::store($request)->id;
             }
 
+            $event->save();
+            $events = Event::query()->get();
+
+            //If the check on the create pages that is was a news and has to be displayed on the news pages
+            if($request->newsoption == true){
+                //Get all events from the database
+                $events = Event::query()->get();
+                //make a new object of the news calls
+                $news = new News();
+
+                //Get and save the data
+                $news->name = "Ny aktivitet";
+                $news->subname = $event->name;
+                $news->arrangement_id = $event->id;
+                $news->type_id = '3';
+                $news->content = $event->description;
+                $news->resource_id = $event->resource_id;
+                $news->news_expiration_date = $events[0]->date;
+
+                //Call the news controller function store and get, pass $news to be saved
+                NewsController::storeAndGet($news);
+            }
+
+            return redirect()->route('events.index', ['events' => $events]);
+        }
     }
 
     /**
@@ -84,9 +111,12 @@ class EventController extends Controller
      * @param Event $id
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function show(Event $id)
+    public function show($id)
     {
-        return Response::detect("events.show", [ "event" => $id ]);
+        //Get the entity that match with the passed id.
+        $event = Event::query()->where("id", "=", $id)->first();
+        //return the fetch data to the show pages
+        return Response::detect("events.show", [ "event" => $event ]);
     }
 
     /**
@@ -98,7 +128,7 @@ class EventController extends Controller
     public function signups(Request $request)
     {
         // Find every event you have clicked on. And find all users to that event, and the event name itself.
-        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get();
+        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get();
 
         if (count($events) == 0)
             $events = Event::where('id', $request->event)->get();
@@ -106,6 +136,20 @@ class EventController extends Controller
         return Response::detect("events.signups", [ "events" => $events ]);
     }
 
+    /**
+     * Display signups for event.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function accountsignups(Request $request)
+    {
+        // Find every event you have clicked on. And find all users to that event, and the event name itself. - This is only being showed on App
+        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get();
+
+        return Response::detect("events.signups", [ "events" => $events ]);
+    }
+
     /**
      * Show the form for editing the specified resource.-
      *
@@ -127,20 +171,46 @@ class EventController extends Controller
      */
     public function update(Request $request, $id)
     {
+        //Set $data to holde the value of request->all
         $data = $request->all();
 
+        //Get the event with matching id
         $event = Event::find($id);
 
+        //get all events that has a match with the passed id
         $allEvents = Event::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
 
+        //If the amount of $allevents is equal to 0 redirect to index
         if(count($allEvents) > 0){
-            return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
+            return redirect()->route("events.index", ['events' => $event]);
         }else{
+            //Call the update function
             $event->update($data);
+
+            //If the events has a images call the Resource Controllers store function
+            if($request->file("resource")) {
+                $event->resource_id = ResourceController::store($request)->id;
+            }
+
             $event->save();
 
-            $event = Event::query()->paginate($request->input("limit", 20));
+            $events = Event::query()->get();
-            return redirect()->route("events.index", ['events' => $event]);
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Aktivitet opdateret";
+                $news->subname = $event->name;
+                $news->arrangement_id = $event->id;
+                $news->type_id = '3';
+                $news->resource_id = $event->resource_id;
+                $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300));
+                $news->news_expiration_date = $event->date;
+
+                NewsController::storeAndGet($news);
+            }
+
+            return redirect()->route("events.index", ['events' => $events]);
         }
 
     }
@@ -155,66 +225,91 @@ class EventController extends Controller
     public function destroy(Request $request, $id)
     {
         if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event
-            $UserEvent = UserEvent::where('user_id', $request->signup)->where('event_id', $id);
+            $UserEvent = UserEvent::find($id);
-            $UserEvent->delete();
+
-            return redirect()->route("events.signups", [ "event" => $id ]);
-        } else { // Else if you are deleting an event. Then delete all the sign ups AND the event
-            $UserEvent = UserEvent::where('event_id', $id);
             $UserEvent->delete();
 
-            $event = Event::find($id);
+            return 1;
+        } else { // Else if you are deleting an event. Then delete all the sign ups AND the event
+            $userEvents = UserEvent::query()->where('event_id', "=", $id)->get();
+            $event = Event::query()->find($id);
+
+            foreach ($userEvents as $userEvent) {
+                $notification = new Notification();
+
+                $notification->user_id = $userEvent->user_id;
+                $notification->message = $event->name . " - ";
+                $notification->save();
+                $userEvent->delete();
+            }
+
+            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "Activity")->where("arrangement_id", "=", $id);
+            $news->delete();
+
             $event->delete();
+
             return redirect()->route("events.index");
         }
     }
 
+    //Fixes tags that have been substringed
+    //idk yoink this bitch from stackoverflow, you never going to use it, trust me.
+    public function closetags($html) {
+        preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
+        $openedtags = $result[1];
+        preg_match_all('#</([a-z]+)>#iU', $html, $result);
+        $closedtags = $result[1];
+        $len_opened = count($openedtags);
+        if (count($closedtags) == $len_opened) {
+            return $html;
+        }
+        $openedtags = array_reverse($openedtags);
+        for ($i=0; $i < $len_opened; $i++) {
+            if (!in_array($openedtags[$i], $closedtags)) {
+                $html .= '</'.$openedtags[$i].'>';
+            } else {
+                unset($closedtags[array_search($openedtags[$i], $closedtags)]);
+            }
+        }
+        return $html;
+    }
 
-    public function search(Request $request){
+    public function deleteNotifications(Request $request){
+        //If the request is equal to ajax, delete every notification where the user_id is = to the $request->user_id
         if($request->ajax()){
-            $output = "<tr>".
+            foreach (Notification::query()->where("user_id", "=", $request->user_id)->get() as $notification) {
-                "<th>Event Navn</th>".
+                $notification->delete();
-                "<th>Event Beskrivelse</th>".
-                "<th>Event Dato</th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/eye.svg\" alt=\"Update\"></th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
-                "</tr>";
-            $events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%')
-                ->orWhere('date','LIKE', $request->search.'%')
-                ->get();//Job is here dude :9
-
-            if(count($events) !== 0){
-                foreach ($events as $key => $event){
-                    $output.='<tr>'.
-                        '<td>' . $event->name . '</td>'.
-                        '<td>' . $event->description .'</td>'.
-                        '<td>' . $event->date .'</td>'.
-                        '<td><a href="'. route("events.signups", [ "event" => $event->id ]).'"><img class="w-100" src="'. asset('/images/icons/eye-dark.svg') .'" alt="Update"></a></td>'.
-                        '<td><a href="'. route("events.edit", [ "event" => $event->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
-                        '<td><form method="post" action="' .route("events.destroy", [ "event" => $event->id ]). '" class="w-100 nostyle">'.
-                        csrf_field().
-                        method_field("delete").
-
-                        '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
-                        '</form>'.
-                        '</td>'.
-                        '</tr>';
             }
-            }else{
+            return "Done";
-                $output.='<tr>'.
+        } else {
-                    '<td>Intet match</td>'.
+            return "ERROR";
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '</tr>';
-            }
-            return Response($output);
         }
     }
 
+    //Used for checking if the currently typed event name is unique. Create version
+    public function nameCheck(Request $request){
+        //Search the database to check that the name they are typing is uniq
+        $event = Event::query()->where('name', 'LIKE',$request->nameCheck)->get();
+        if(count($event) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
 
+    //Used for checking if the currently typed event name is unique. Edit version
+    public function nameCheckUpdate(Request $request){
+        $event = Event::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($event) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    public function previewPages(Request $request){
+        //get the data from the database that match the request and leftjoin the resources table
+        $event = Event::where('events.id', '=', $request->preview)->leftJoin('resources', 'resources.id', '=', 'events.resource_id')->first();
+        //convert dababy to a convertible
+        $convertToJsonArray = json_encode($event);
+        return $convertToJsonArray;
+    }
 
 }
 

skolehjem/app/Http/Controllers/FeedbackController.php

@@ -13,9 +13,9 @@ class FeedbackController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
-        $this->middleware([ "check.auth:feedback.list" ])->only("index");
+        $this->middleware([ "check.auth:feedback.show" ])->only("show", "index");
-        $this->middleware([ "check.auth:feedback.show" ])->only("show");
         $this->middleware([ "check.auth:feedback.create" ])->only("create", "store");
         $this->middleware([ "check.auth:feedback.edit" ])->only("edit", "update");
         $this->middleware([ "check.auth:feedback.delete" ])->only("delete");
@@ -29,7 +29,7 @@ class FeedbackController extends Controller
      */
     public function index(Request $request)
     {
-        $feedback = Feedbacks::query()->orderBy('created_at', 'desc')->paginate($request->input("limit", 20));
+        $feedback = Feedbacks::query()->orderBy('created_at', 'desc')->get();
 
         return Response::detect("feedbacks.index", [ "feedback" => $feedback ]);
     }
@@ -124,37 +124,16 @@ class FeedbackController extends Controller
         $feedback = Feedbacks::find($id);
         $feedback->delete();
 
-        return Response::detect("feedbacks.destroy");
+        return redirect()->route("feedbacks.index");
     }
 
+    public function storeajax(Request $request) {
+        $requestBody = $request->validate([
+            "message" => "required",
+            "suggestion_form" => "required|max:255"
+        ]);
 
-
+        $feedbacks = new Feedbacks($requestBody);
-    public function search(Request $request){
+        $feedbacks->save();
-        if($request->ajax()){
-            $output = "<tr>".
-                "<th>Feedback Besked</th>".
-                "<th>Ris el. Ros</th>".
-                "</tr>";
-
-            //$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump();
-            //$value = DB::table('feedbacks')->select('suggestion_form ')->dump();
-            if($request->option === "Ris" || $request->option === "Ros")
-                $feedbacks = Feedbacks::query()->orderBy('created_at', 'desc')->where('suggestion_form', '=', $request->option)
-                    ->get();
-            else
-                $feedbacks = Feedbacks::all();
-
-            if(count($feedbacks) !== 0){
-                foreach ($feedbacks as $key => $feedback){
-                    $output.='<tr>'.
-                        '<td>' . $feedback->message . '</td>'.
-                        '<td>' . $feedback->suggestion_form . '</td>'.
-                        '</tr>';
     }
-            }
-            return Response($output);
-        }
-    }
-
-
 }

skolehjem/app/Http/Controllers/GuideController.php

@@ -3,24 +3,25 @@
 namespace App\Http\Controllers;
 
 use App\Guide;
+use App\News;
+use App\Resource;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
+use tidy;
 
 class GuideController extends Controller
 {
-
-    /*
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
-        $this->middleware([ "check.auth:contact.list" ])->only("index");
+        $this->middleware([ "check.auth:guides.show" ])->only("show", "index");
-        $this->middleware([ "check.auth:contact.show" ])->only("show");
+        $this->middleware([ "check.auth:guides.create" ])->only("create", "store");
-        $this->middleware([ "check.auth:contact.create" ])->only("create", "store");
+        $this->middleware([ "check.auth:guides.edit" ])->only("edit", "update");
-        $this->middleware([ "check.auth:contact.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:guides.delete" ])->only("delete");
-        $this->middleware([ "check.auth:contact.delete" ])->only("delete");
     }
-    */
+
 
 
     /**
@@ -30,7 +31,7 @@ class GuideController extends Controller
      */
     public function index(Request $request)
     {
-        $guides = Guide::query()->paginate($request->input("limit", 20));
+        $guides = Guide::query()->orderBy("created_at", "desc")->get();
 
         return Response::detect("guides.index", [ "guides" => $guides]);
     }
@@ -53,21 +54,44 @@ class GuideController extends Controller
      */
     public function store(Request $request)
     {
-
-        //Me no sure what to store mester big smoke :)
         $requestGuide = $request->validate([
             "name" => "required|max:255",
             "guide_articles" => "required",
+            "guide_category_id" => "required",
         ]);
 
         $guide = new Guide($requestGuide);
+
+        //If an image has been uploaded, store the file
+        if($request->file("resource")) {
+            $guide->resource_id = ResourceController::store($request)->id;
+        }
+
         $saved = $guide->save();
 
-        if(!$saved){
+        if(!$saved) {
             return redirect()->route("guides.store");
-        }else{
+        } else {
-            $guide = Guide::query()->paginate($request->input("limit", 20));
+            $guides = Guide::query()->get();
-            return redirect()->route("guides.index", ['guides' => $guide]);
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Ny vejledning";
+                $news->subname = $guide->name;
+                $news->arrangement_id = $guide->id;
+                $news->type_id = '4';
+                $news->news_expiration_date = $request->input("news_expiration_date");
+
+                $news->content = $guide->guide_articles;
+
+                if($guide->resource_id !== null)
+                    $news->resource_id = $guide->resource_id;
+
+                NewsController::storeAndGet($news);
+            }
+
+            return redirect()->route("guides.index", ['guides' => $guides]);
         }
     }
 
@@ -103,33 +127,164 @@ class GuideController extends Controller
      */
     public function update(Request $request, Guide $guide)
     {
-        $data = $request->validate([
+        $data = $request->all();
-            "name" => "required|max:255",
-            "guide_articles" => "required",
-        ]);
 
         $guidee = Guide::query()->where("id", "=", $guide->id)->first();
         $guidee->update($data);
+
+        //If an image has been uploaded, store the file
+        if($request->file("resource")) {
+            $guidee->resource_id = ResourceController::store($request)->id;
+        }
+
         $saved = $guidee->save();
 
         if(!$saved){
             return redirect()->route("guides.update", [ "guide" => $guide ]);
         }else{
-            $guide = Guide::query()->paginate($request->input("limit", 20));
+            $guides = Guide::query()->get();
-            return redirect()->route("guides.index", ['guides' => $guide]);
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Vejledning opdateret";
+                $news->subname = $guidee->name;
+                $news->arrangement_id = $guide->id;
+                $news->type_id = '4';
+
+                if($guide->resource_id !== null)
+                    $news->resource_id = $guide->resource_id;
+
+
+                $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300));
+
+                NewsController::storeAndGet($news);
+            }
+
+            return redirect()->route("guides.index", ['guides' => $guides]);
         }
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Guide  $guide
+     * @param  Guide  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Guide $guide)
+    public function destroy($id)
     {
-        $guide = MenuPlan::find($guide);
+        // Find the guide you want to remove
+        $guide = Guide::find($id);
+        // Find the news the you made when creating the guide (if there is a news)
+        $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "Guide")->where("arrangement_id", "=", $id);
+
+        //Delete the news or/and guide
+        $news->delete();
         $guide->delete();
+
+
         return redirect()->route("guides.index");
     }
+
+    //Used to fix html, that have been substringed
+    public function closetags($html) {
+        preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
+        $openedtags = $result[1];
+        preg_match_all('#</([a-z]+)>#iU', $html, $result);
+        $closedtags = $result[1];
+        $len_opened = count($openedtags);
+        if (count($closedtags) == $len_opened) {
+            return $html;
+        }
+        $openedtags = array_reverse($openedtags);
+        for ($i=0; $i < $len_opened; $i++) {
+            if (!in_array($openedtags[$i], $closedtags)) {
+                $html .= '</'.$openedtags[$i].'>';
+            } else {
+                unset($closedtags[array_search($openedtags[$i], $closedtags)]);
+            }
+        }
+        return $html;
+    }
+
+    //Used for checking if the currently typed guide name is unique. Create version
+    public function nameCheck(Request $request) {
+        $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get();
+        if(count($guide) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    //Used for checking if the currently typed guide name is unique. Edit version
+    public function nameCheckUpdate(Request $request) {
+        $guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($guide) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    // Runs the ajax call when changing the select field in guides.index (app)
+    public function showCategory(Request $request){
+        if($request->ajax()) {
+            // Get all guides where the category is what you want
+            if ($request->category != 'All')
+                $guides = Guide::query()->orderBy("created_at", "desc")->where('guide_category_id', '=', $request->category)->get();
+            else
+                $guides = Guide::query()->orderBy("created_at", "desc")->get();
+
+            $output = '';
+
+            // Begin showing all guides with the given category
+            if(!$guides->isEmpty()) {
+                foreach ($guides as $guide) {
+                    $output .= '<div class="card">';
+                    if ($guide->resource_id !== null) {
+                        $output .= '<div class="header bs-cover bp-center" style="background-image: url(' . asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) . ');">' .
+                            '</div>';
+                    } else {
+                        $output .= '<div class="header d-flex justify-content-center">' .
+                            '<img alt="Image" src="'. asset('/images/icons/image.svg')  . '" style="width: calc(100% - 20px)">' .
+                            '</div>';
+                    }
+
+                    $output .= '<div class="container">' .
+                        '<div class="row justify-content-center">'.
+                            '<h4>'. $guide->name .'</h4>'.
+                        '</div>'.
+                        '<div class="row justify-content-center">';
+
+                    if (request()->cookie('languagesSetting') == "dk")
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
+                    elseif (request()->cookie('languagesSetting') == "en")
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Read more</a>';
+                    else
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
+
+                            $output .= '</div>'.
+                        '</div>'.
+                    '</div>';
+                }
+            } else { // If there are no guides with the given category, then display error message
+                if (request()->cookie('languagesSetting') == "dk")
+                    $output .= '<p class="mb-auto text-center">Der er ingen vejledninger af denne kategori</p>';
+                elseif (request()->cookie('languagesSetting') == "en")
+                    $output .= '<p class="mb-auto text-center">There are no guides of this category</p>';
+                else
+                    $output .= '<p class="mb-auto text-center">Der er ingen vejledninger af denne kategori</p>';
+            }
+
+                return Response($output);
+        }
+    }
+
+    public function previewPages(Request $request){
+        if(!Resource::find($request->preview)){
+            $event = Guide::find($request->preview);
+        }else{
+            $event = Guide::where('guides.id', '=', $request->preview)->join('resources', 'resources.id', '=', 'guides.resource_id')->first();
+        }
+        $convertToJsonArray = json_encode($event);
+        return $convertToJsonArray;
+    }
+
 }

skolehjem/app/Http/Controllers/GuidesCategoryController.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\GuidesCategory;
+use App\Guide;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class GuidesCategoryController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
+
+        $this->middleware([ "check.auth:guides.show" ])->only("show", "index");
+        $this->middleware([ "check.auth:guides.create" ])->only("create", "store");
+        $this->middleware([ "check.auth:guides.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:guides.delete" ])->only("delete");
+    }
+
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        $guideCate = GuidesCategory::query()->get();
+        return Response::detect("guides-category.index", [ "guidesCategory" => $guideCate]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return Response::detect("guides-category.create");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $requestGuideCategory = $request->validate([
+            "guidesCategoryName" => "required|max:255",
+        ]);
+
+        $guideCate = new GuidesCategory($requestGuideCategory);
+        $saved = $guideCate->save();
+
+        if(!$saved) {
+            return redirect()->route("guides-category.store");
+        } else {
+            $guides = Guide::query()->get();
+
+            return redirect()->route("guides.index", ['guides' => $guides]);
+        }
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int $id
+     */
+    public function show($id)
+    {
+        return Response::detect("guides-category.show", $id);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int $id
+     * @return Response
+     */
+    public function edit($id)
+    {
+        $guideCate = GuidesCategory::query()->where("id", "=", $id)->first();
+        return Response::detect("guides-category.edit", [ "guideCategory" => $guideCate]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $data = $request->validate([
+            "guidesCategoryName" => "required|max:255",
+        ]);
+
+        $guideCate = GuidesCategory::query()->where("id", "=", $id)->first();
+        $guideCate->update($data);
+        $saved = $guideCate->save();
+
+        if(!$saved){
+            return redirect()->route("guides-category.edit", $id);
+        }else{
+            $guides = Guide::query()->get();
+
+            return redirect()->route("guides.index", ['guides' => $guides]);
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $guideCategory = GuidesCategory::find($id);
+        $guides = Guide::query()->where('guide_category_id', '=', $id);
+
+        $guides->delete();
+        $guideCategory->delete();
+
+        return redirect()->route("guides.index");
+    }
+
+    //Used for checking if the currently typed Guide Category name is unique. Create version
+    public function nameCheck(Request $request) {
+        $guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->get();
+        if(count($guide) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    //Used for checking if the currently typed Guide Category name is unique. Edit version
+    public function nameCheckUpdate(Request $request) {
+        $guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($guide) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+
+    public function guideCategoryCreate(Request $request){
+        $data = $request->validate([
+            "guidesCategoryName" => "required",
+        ]);
+
+        $category = new GuidesCategory($data);
+
+        $categories = GuidesCategory::query()->where('guidesCategoryName', 'LIKE', $request->guidesCategoryName)->get();
+
+        if(count($categories) > 0 && $request->guidesCategoryName !== NULL){
+            return 1;
+        } else {
+            $category->save();
+        }
+    }
+}

skolehjem/app/Http/Controllers/LocationController.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Location;
+use App\WashingMachine;
+use App\WashingReservation;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use function GuzzleHttp\Promise\all;
+
+class LocationController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
+
+        $this->middleware([ "check.auth:locations.show" ])->only("show", "index");
+        $this->middleware([ "check.auth:locations.create" ])->only("create", "store");
+        $this->middleware([ "check.auth:locations.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:locations.delete" ])->only("delete");
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $locations = Location::query()->get();
+
+        return Response::detect("locations.index", [ "locations" => $locations ]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return Response::detect("locations.create");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $data = $request->validate([
+            "name" => "required",
+        ]);
+
+        $location = new Location($data);
+
+        $locations = Location::query()->where('name', '=', $request->name)->get();
+
+        // If there already is a washing machine with that name, then don't add it
+        if (count($locations) > 0)
+            return redirect()->route("washing-machines.index");
+        else { // Else - Add it
+            $location->save();
+            $locations = Location::query()->get();
+            return redirect()->route("washing-machines.index", ['locations' => $locations]);//washing-machines.index kan byttes ud med locations.index
+        }
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Location  $location
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show(Location $location)
+    {
+        return view("admin.locations.show", [ "location" => $location]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Location  $location
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Location $location)
+    {
+        return Response::detect("locations.edit", [ "location" => $location] );
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Location  $location
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $data = $request->validate([
+            "name" => "required",
+        ]);
+
+        $location = Location::find($id);
+
+
+        $allMachines = Location::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
+
+        // If there already is a washing machine with that name, then don't change it
+        if (count($allMachines) > 0)
+            return redirect()->route("washing-machines.index");
+        else { // Else - Change the name
+            $location->update($data);
+            $location->save();
+
+            $locations = Location::query()->get();
+            return redirect()->route("washing-machines.index", ["locations" => $locations]); //washing-machines.index kan byttes ud med locations.index
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $location = Location::find($id);
+        $washingMachines = WashingMachine::query()->where('location_id', '=', $id)->get();
+
+        foreach ($washingMachines as $machine) {
+            $washingReservations = WashingReservation::query()->where('machine_id', '=', $machine->id)->get();
+
+            foreach ($washingReservations as $reservation)
+            {
+                $reservation->delete();
+            }
+
+            $machine->delete();
+        }
+
+        $location->delete();
+
+        return redirect()->route("washing-machines.index");//washing-machines.index kan byttes ud med locations.index
+    }
+
+    public function nameCheck(Request $request){
+        $locations = Location::query()->where('name', 'LIKE',$request->nameCheck)->get();
+        if(count($locations) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    public function nameCheckUpdate(Request $request){
+        $locations = Location::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($locations) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+}

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -2,9 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\ExternalLink;
+use App;
 use App\MenuPlan;
+use App\News;
 use App\User;
+use Barryvdh\DomPDF\Facade as PDF;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
@@ -17,9 +20,9 @@ class MenuPlanController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
-        $this->middleware([ "check.auth:menuplan.list" ])->only("index");
+        $this->middleware([ "check.auth:menuplan.show" ])->only("show", "index");
-        $this->middleware([ "check.auth:menuplan.show" ])->only("show");
         $this->middleware([ "check.auth:menuplan.create" ])->only("create", "store");
         $this->middleware([ "check.auth:menuplan.edit" ])->only("edit", "update");
         $this->middleware([ "check.auth:menuplan.delete" ])->only("delete");
@@ -32,7 +35,7 @@ class MenuPlanController extends Controller
      */
     public function index(Request $request)
     {
-        $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+        $menuPlans = MenuPlan::query()->get();
 
         return Response::detect("menuplans.index", [ "menuPlans" => $menuPlans]);
     }
@@ -56,22 +59,50 @@ class MenuPlanController extends Controller
     public function store(Request $request)
     {
         $requestMenuPlanCreate = $request->validate([
-            "week" => "required|max:2",
+            "week" => "required",
-            "monday" => "required|max:255",
+            "monday" => "required",
-            "tuesday" => "required|max:255",
+            "tuesday" => "required",
-            "wednesday" => "required|max:255",
+            "wednesday" => "required",
-            "thursday" => "required|max:255"
+            "thursday" => "required",
         ]);
 
-        $menuPlans = new MenuPlan($requestMenuPlanCreate);
+        $menuPlan = new MenuPlan($requestMenuPlanCreate);
 
         $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get();
 
         if(count($allMenuPlans) > 0)
-            return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
+            return redirect()->route("menu-plans.index");
         else {
-            $menuPlans->save();
+            $menuPlan->save();
-            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            $menuPlans = MenuPlan::query()->get();
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Ny menuplan";
+                $news->subname = "Menuplan for uge " . $menuPlan->week;
+                $news->content =
+                    '<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuPlan->monday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuPlan->tuesday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuPlan->wednesday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuPlan->thursday.'</p>';
+                $news->type_id = '2';
+                $news->arrangement_id = $menuPlan->id;
+
+                if($request->file("resource")) {
+                    $news->resource_id = ResourceController::store($request)->id;
+                }
+
+                NewsController::storeAndGet($news);
+            }
+
             return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
         }
     }
@@ -116,12 +147,42 @@ class MenuPlanController extends Controller
         $allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get();
 
         if(count($allMenuPlans) > 0){
-            return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
+            return redirect()->route("menu-plans.index");
         }else{
             $menuplan->update($data);
             $menuplan->save();
 
-            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            $menuPlans = MenuPlan::query()->get();
+
+            //Create news
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Opdateret menuplan";
+                $news->subname = "Opdateret menuplan for uge " . $menuplan->week;
+                $news->arrangement_id = $menuplan->id;
+                $news->type_id = '2';
+                $news->content =
+                    '<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->monday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->tuesday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->wednesday.'</p><p class="ql-align-center"><br></p>'.
+
+                    '<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
+                    '<p class="ql-align-center">'.$menuplan->thursday.'</p>';
+
+                    $oldResourceID = News::query()->where('arrangement_id', '=', $menuplan->id)->first();
+
+                    if ($oldResourceID != null)
+                        $news->resource_id = $oldResourceID->resource_id;
+
+                NewsController::storeAndGet($news);
+            }
+
             return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
         }
 
@@ -131,60 +192,69 @@ class MenuPlanController extends Controller
      * Remove the specified resource from storage.
      * Test delete return index function.
      * @param  int  $id
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
      */
     public function destroy($id)
     {
+        // Find the menu you want to remove
         $menuplan = MenuPlan::find($id);
+        // Find the news the you made when creating the menu (if there is a news)
+        $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where('type', '=', 'Menu')->where('arrangement_id', '=', $id);
+
+        //Delete the news or/and menu
+        $news->delete();
         $menuplan->delete();
         return redirect()->route("menu-plans.index");
     }
 
+    /**
+     * Remove the specified resource from storage.
+     * Test delete return index function.
+     * @param $Id
+     * @return RedirectResponse
+     */
+    public function genPDF($Id){
+        //get the menuplan with the matching id
+        $menuPlan = MenuPlan::query()->where("id", "=", $Id)->first();
 
-    public function search(Request $request){
+        //Sub string cap
-        if($request->ajax()){
+        $var = 250;
-            $output = "<tr>".
-                "<th>Uge</th>".
-                "<th>Mandag</th>".
-                "<th>Tirsdag</th>".
-                "<th>Onsdag</th>".
-                "<th>Torsdag</th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
-                "</tr>";
-            $menuplans = DB::table('menu_plans')->where('week', 'LIKE',$request->search.'%')->get();
 
-            if(count($menuplans) !== 0){
+        //Substring the data
-                foreach ($menuplans as $key => $menuplan){
+        $menuPlan->monday = substr($menuPlan->monday, 0, $var);
-                    $output.='<tr>'.
+        $menuPlan->tuesday = substr($menuPlan->tuesday, 0, $var);
-                        '<td>' . $menuplan->week . '</td>'.
+        $menuPlan->wednesday = substr($menuPlan->wednesday, 0, $var);
-                        '<td>' . $menuplan->monday . '</td>'.
+        $menuPlan->thursday = substr($menuPlan->thursday, 0, $var);
-                        '<td>' . $menuplan->tuesday . '</td>'.
+
-                        '<td>' . $menuplan->wednesday .'</td>'.
+        //Pass the substring data to the genPDF pages
-                        '<td>' . $menuplan->thursday .'</td>'.
+        $pdf = PDF::loadView('pdf.menuplan', ["menuPlan" => $menuPlan]);
-                        '<td><a href="'. route("menu-plans.edit", [ "menu_plan" => $menuplan->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
+
-                        '<td><form method="post" action="' .route("menu-plans.destroy", [ "menu_plan" => $menuplan->id ]). '" class="w-100 nostyle">'.
+        //PDF config
-                        csrf_field().
+        $pdf->setPaper('A4', 'portrait');
-                        method_field("delete").
+
+        //return the pdf
+        return $pdf->stream("menuplan_uge_".$menuPlan->week.".pdf");
 
-                        '<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
-                        '</form>'.
-                        '</td>'.
-                        '</tr>';
     }
-            }else{
+
-                $output.='<tr>'.
+    public function nameCheck(Request $request){
-                    '<td>Intet match</td>'.
+        $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->get();
-                    '<td></td>'.
+        if(count($menuplan) > 0 && $request->nameCheck !== NULL){
-                    '<td></td>'.
+            return 1;
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '</tr>';
         }
-            return Response($output);
     }
+
+    public function nameCheckUpdate(Request $request){
+        $menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($menuplan) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    public function previewPages(Request $request){
+        $event = MenuPlan::find($request->preview);
+        $convertToJsonArray = json_encode($event);
+        return $convertToJsonArray;
     }
 
 

skolehjem/app/Http/Controllers/MultipleEventsController.php

@@ -0,0 +1,316 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\MultipleEvents;
+use App\MultipleEventsParent;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Barryvdh\DomPDF\Facade as PDF;
+//Not in use yet
+use App\Event;
+use App\News;
+use App\Notification;
+use App\Resource;
+use App\UserEvent;
+
+class MultipleEventsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
+
+        $this->middleware([ "check.auth:event.show" ])->only("show", "index");
+        $this->middleware([ "check.auth:event.create" ])->only("create", "store");
+        $this->middleware([ "check.auth:event.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:event.delete" ])->only("delete");
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events.multiple_events_parent_id', 'multiple_events_parent.id', 'multiple_events_parent.week', 'multiple_events_parent.resource_id', 'multiple_events_parent.created_at', 'multiple_events_parent.updated_at')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
+
+        /*
+        $multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
+            ->groupBy('multiple_events_parent_id')->orderBy('multiple_events.date', 'desc')
+            ->selectRaw('multiple_events_parent.*, max(date) as date')
+            ->get();
+        */
+        return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
+    }
+
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //returns create multiple events blade file from the view folder
+        return Response::detect("multiple-events.create");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $requestBody = $request->validate([
+            "week" => "required",
+            "name" => "array",
+            "description" => "array",
+            "accountable" => "array",
+            "date" => "array",
+        ]);
+
+        $multipleParent = new MultipleEventsParent();
+
+        $multipleParent->week = $request->week;
+        if($request->file("resource")) {
+            $multipleParent->resource_id = ResourceController::store($request)->id;
+        }
+        $multipleParent->save();
+
+
+
+
+        for ($i = 0; $i < count($requestBody["name"]); $i++) {
+            $multi_event = new MultipleEvents();
+
+            $multi_event->date = $requestBody['date'][$i];
+            $multi_event->description = $requestBody['description'][$i];
+            $multi_event->accountable = $requestBody['accountable'][$i];
+            $multi_event->name = $requestBody['name'][$i];
+            $multi_event->multiple_events_parent_id = $multipleParent->id;
+            $multi_event->save();
+        }
+
+        //creates a new Event model with the given parameter
+            $multiEventsGetEndDate = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
+                ->groupBy('multiple_events_parent_id')
+                ->orderBy('multiple_events.date', 'desc')
+                ->selectRaw('multiple_events_parent.*, max(date) as date')
+                ->get();
+
+            $multiEvents = MultipleEventsParent::query()->get();
+            if($request->newsoption == true){
+                $news = new News();
+                $news->name = "Ny ugentlig aktivitet";
+                $news->subname = $request->week;
+                $news->arrangement_id = $multipleParent->id;
+                $news->type_id = '5';
+                $news->content = "Den ugentlige aktivitets plan for uge ".$request->week." er her!";
+                $news->resource_id = $request->resource_id;
+                $news->news_expiration_date = $multiEventsGetEndDate[0]->date;
+                NewsController::storeAndGet($news);
+            }
+
+            return redirect()->route('events.index', ['multiEvents' => $multiEvents]);
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\MultipleEvents  $multipleeventsController
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->orderBy('date')->get();
+        $multiEventParent = MultipleEventsParent::find($id);
+
+        return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]);
+    }
+
+    /**
+     * Display signups for event.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function accountsignups(Request $request)
+    {
+        // Find every event you have clicked on. And find all users to that event, and the event name itself.
+        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->where('multiple_event_id', $request->multiEvent)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get();
+
+        if (count($events) == 0)
+            $events = Event::where('id', $request->event)->get();
+
+        return Response::detect("multiple-events.signups", [ "multiEvent" => $events ]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.-
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function edit($id)
+    {
+        $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get();
+        $parentEvent = MultipleEventsParent::find($id);
+        return Response::detect("multiple-events.edit", ["multiEvents" => $multiEvents, "parentEvent" => $parentEvent]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $requestBody = $request->validate([
+            "week" => "required",
+            "name" => "array",
+            "description" => "array",
+            "accountable" => "array",
+            "date" => "array",
+        ]);
+
+        $parentEvent = MultipleEventsParent::find($id);
+
+        if($request->file("resource")) {
+            $parentEvent->update(["week" => $request->week, "resource_id" => ResourceController::store($request)->id]) ;
+        } else
+            $parentEvent->update(["week" => $request->week]);
+
+        if (!empty($requestBody["name"])) {
+            foreach ($requestBody["name"] as $key => $singleEvent) {
+                if ($key == "new") {
+                    //dd(count($s));
+                    for ($i = 0; $i < count($singleEvent); $i++) {
+                        $multi_event = new MultipleEvents();
+                        $multi_event->name = $requestBody["name"]["new"][$i];
+                        $multi_event->description = $requestBody["description"]["new"][$i];
+                        $multi_event->accountable = $requestBody["accountable"]["new"][$i];
+                        $multi_event->date = $requestBody["date"]["new"][$i];
+                        $multi_event->multiple_events_parent_id = $id;
+                        $multi_event->save();
+                    }
+                } else {
+                    $event = MultipleEvents::find($key);
+                    $event->update(["name" => $requestBody["name"][$key][0], "description" => $requestBody["description"][$key][0], "accountable" => $requestBody["accountable"][$key][0], "date" => date("Y-m-d H:i:s", strtotime($requestBody["date"][$key][0]))]);
+                }
+            }
+
+
+            $multiEventsGetEndDate = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
+                ->groupBy('multiple_events_parent_id')
+                ->orderBy('multiple_events.date', 'desc')
+                ->selectRaw('multiple_events_parent.*, max(date) as date')
+                ->get();
+
+            if ($request->newsoption == true) {
+                $news = new News();
+                $news->name = "Opdateret ugentlig aktivitet";
+                $news->subname = $request->week;
+                $news->arrangement_id = $parentEvent->id;
+                $news->type_id = '5';
+                $news->content = "Den ugentlige aktivitets plan for uge " . $request->week . " er opdateret!";
+                $news->resource_id = $request->resource_id;
+                $news->news_expiration_date = $multiEventsGetEndDate[0]->date;
+
+                NewsController::storeAndGet($news);
+            }
+        }
+
+        $events = Event::query()->orderBY('date' , 'asc')->get();
+        return Response::detect("events.index", [ "events" => $events]);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\MultipleEvents  $multipleeventsController
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Request $request, $id)
+    {
+        if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the specific week event
+            $UserEvent = UserEvent::find($id);
+            $UserEvent->delete();
+
+            return 1;
+        } elseif ($request->onlyMultiEvent != null) { // Delete a single event from multiple events, and all its signups
+            $userEvents = UserEvent::where('multiple_event_id', '=', $id)->get();
+            $multiEvent = MultipleEvents::find($id);
+
+            foreach ($userEvents as $ue) {
+                $ue->delete();
+            }
+
+            $multiEvent->delete();
+
+            return 1;
+        } else { // Delete all multiple events and signups, from the parent/weekly event
+            $multiparent = MultipleEventsParent::find($id);
+            $multievent = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get();
+
+            foreach ($multievent as $me) {
+                foreach (UserEvent::where('multiple_event_id', '=', $me->id)->get() as $ue) {
+                    $ue->delete();
+                }
+                $me->delete();
+            }
+            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "MultipleEvent")->where("arrangement_id", "=", $id);
+            $news->delete();
+
+            $multiparent->delete();
+
+            return 1;
+        }
+    }
+
+    public function previewPages(Request $request){
+        /*if(!Resource::find($request->preview)){
+            $multipleEventsParent = MultipleEventsParent::find($request->preview);
+            $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get();
+        } else {*/
+            //$multipleEventsParent = MultipleEventsParent::find($request->preview);
+        $multipleEventsParent = MultipleEventsParent::leftJoin('resources', 'resources.id', '=', 'multiple_events_parent.resource_id')->where('multiple_events_parent.id', '=', $request->preview)->select('multiple_events_parent.*', 'resources.filename')->first();
+        $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get();
+        //}
+
+        return [$multipleEventsParent, $multipleEvents];
+    }
+
+
+    public function genPDF($Id){
+        $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("multiple_events_parent.id", "=", $Id)->orderBy('multiple_events.date', 'asc')->get();
+        $pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]);
+
+        $pdf->setPaper('A4', 'landscape');
+
+        return $pdf->stream("ugentligt_aktivitet_uge_".$multiEvent[0]->week.".pdf");
+
+    }
+
+    public function signups(Request $request)
+    {
+        // Find every event you have clicked on. And find all users to that event, and the event name itself.
+        //$multiEvents = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', '=', $request->multipleEvent)->get();
+
+        $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $request->multipleEvent)->get();
+        //if (count($multiEvents) == 0)
+        //    $multiEvents = MultipleEvents::where('id', '=', $request->multipleEvent)->get();
+
+        return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]);
+    }
+
+}
+

skolehjem/app/Http/Controllers/NewsController.php

@@ -0,0 +1,191 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Event;
+use App\Helpers;
+use App\News;
+use App\User;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+date_default_timezone_set('Europe/Copenhagen');
+
+class NewsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
+
+        $this->middleware([ "check.auth:news.show" ])->only("show", "index");
+        $this->middleware([ "check.auth:news.create" ])->only("create", "store");
+        $this->middleware([ "check.auth:news.edit" ])->only("edit", "update");
+        $this->middleware([ "check.auth:news.delete" ])->only("delete");
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        //joining news and news_types
+        $news = News::query()
+            ->join("news_types", "news.type_id", "=", "news_types.id")
+            ->orderBy('id', 'desc')
+            ->select('news.*', 'news_types.type')
+            ->get();
+        return Response::detect("news.index", [ "news" => $news ]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return Response::detect("news.create");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return RedirectResponse
+     */
+    public function store(Request $request)
+    {
+        $data = $request->validate([
+            "subname" => "required",
+            "content" => "required",
+            "news_expiration_date" => ""
+        ]);
+
+        $news = new News($data);
+        $news->name = "";
+        $news->type_id = '1';
+        $news->save();
+
+        Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());
+        PushNotificationController::push();
+        return redirect()->route("news.index");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return News
+     */
+    public static function storeAndGet(News $news)
+    {
+        $OldNews = News::query()->where('arrangement_id', "=", $news->arrangement_id)->where('type_id', '=', $news->type_id);
+
+        $OldNews->delete();
+
+        $news->save();
+
+        Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());
+        PushNotificationController::push();
+        return $news;
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function show(News $news)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(News $news)
+    {
+        return Response::detect("news.edit", [ "news" => $news ]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\News  $news
+     * @return RedirectResponse
+     */
+    public function update(Request $request, News $news)
+    {
+        $data = $request->validate([
+            "subname" => "required",
+            "content" => "required",
+            "news_expiration_date" => ""
+        ]);
+
+        $news->update($data);
+
+        Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());
+
+        return redirect()->route("news.index");
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\News  $news
+     * @return RedirectResponse
+     */
+    public static function updateAndGet(News $news)
+    {
+        $news->update();
+
+        Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());
+
+        return $news;
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param \App\News $news
+     * @return RedirectResponse
+     * @throws \Exception
+     */
+    public function destroy(News $news)
+    {
+        $news->delete();
+        return redirect()->route("news.index");
+    }
+
+    public function nameCheck(Request $request){
+        $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->get();
+        if(count($news) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+    public function nameCheckUpdate(Request $request){
+        $news = News::query()->where('subname', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
+        if(count($news) > 0 && $request->nameCheck !== NULL){
+            return 1;
+        }
+    }
+
+
+    public function previewPages(Request $request){
+        $event = News::find($request->preview);
+        $convertToJsonArray = json_encode($event);
+        return $convertToJsonArray;
+    }
+
+}

skolehjem/app/Http/Controllers/NewsTypeController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class NewsTypeController extends Controller
+{
+    public function index() {
+
+    }
+
+    public function store() {
+
+    }
+
+    public function update() {
+
+    }
+
+    public function show() {
+
+    }
+}