Merge branch 'master' of https://git.law/newroco/searchanddisplace-core

.env.example

@@ -1,8 +1,8 @@
-APP_NAME=Laravel
-APP_ENV=local
+APP_NAME="Search and Displace Core"
+APP_ENV=production
 APP_KEY=base64:R4JQ/hpbpPxTF++Kmcs530oqayc2OIKVslweftIPKiE=
-APP_DEBUG=true
-APP_URL=http://localhost
+APP_DEBUG=false
+APP_URL=http://localhost/core
 
 LOG_CHANNEL=daily
 
@@ -10,16 +10,16 @@ DB_CONNECTION=sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
+QUEUE_CONNECTION=redis
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
-REDIS_QUEUE=
+REDIS_QUEUE=sd_core
 
 SD_DUCKLING_URL=http://0.0.0.0:8000/parse
-SD_INGEST_URL=
+SD_INGEST_URL=http://localhost/ingest
 
-WEBHOOK_CLIENT_SECRET=
+WEBHOOK_CLIENT_SECRET=A5qayc2O53Vslw

.gitignore

@@ -5,6 +5,7 @@
 /public/css/app.css
 /storage/*.key
 /vendor
+composer.lock
 .env
 .env.backup
 .phpunit.result.cache

README.md

@@ -33,10 +33,6 @@ details about installing Facebook Duckling in a section below.
 
 `composer install`
 
-- Generate the app key by running the following command:
-
-`php artisan key:generate`
-
 - Install NodeJS and npm
 - Install npm dependencies
 
@@ -44,7 +40,7 @@ details about installing Facebook Duckling in a section below.
 
 - Compile frontend assets
 
-`npm run dev` or `npm run watch` if you want to run a watcher
+`npm run prod`
 
 - Generate the app key by running the following command:
 

composer.json

@@ -1,14 +1,14 @@
 {
-    "name": "laravel/laravel",
+    "name": "search-and-displace-core",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "Search and displace Core, web interface",
     "keywords": [
         "framework",
         "laravel"
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2.5|^8.0",
+        "php": "^7.4|^8.0",
         "fideloper/proxy": "^4.4",
         "guzzlehttp/guzzle": "^7.3",
         "laravel/framework": "^6.20",
@@ -37,10 +37,7 @@
         "psr-4": {
             "App\\": "app/"
         },
-        "classmap": [
-            "database/seeds",
-            "database/factories"
-        ]
+        "classmap": []
     },
     "autoload-dev": {
         "psr-4": {
@@ -50,10 +47,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
-        "post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
-        ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],

default.nix

@@ -1,13 +1,30 @@
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, noDev ? false}:
-
+  }, system ? builtins.currentSystem, noDev ? true}:
+with pkgs;
 let
   composerEnv = import ./composer-env.nix {
     inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages;
   };
+  phpPack = import ./php-packages.nix {
+        inherit composerEnv noDev;
+        inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+    };
 in
-import ./php-packages.nix {
-  inherit composerEnv noDev;
-  inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+stdenv.mkDerivation {
+  name = "searchanddisplace-core-source";
+  src = builtins.fetchGit {
+   url = "https://git.law/newroco/searchanddisplace-core.git";
+   ref = "master";
+  };
+
+  phases = [ "installPhase" ];
+  installPhase = ''
+    cp -r $src $out
+    cp $out/.env.example $out/.env
+    cd $out
+    npm run prod
+    php artisan key:generate
+    php artisan migrate
+  '';
 }

sandd-core.nix

@@ -0,0 +1,22 @@
+{ pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem
+}:
+let
+  name = "search-and-displace-core";
+  phpPackage = import ./default.nix {
+      inherit pkgs system;
+  };
+  nodePackage = import ./node.nix {
+      inherit pkgs system;
+  };
+in
+phpPackage.override {
+  buildInputs = [ pkgs.graphviz ];
+  removeComposerArtifacts = true; # Remove composer configuration files
+
+  # Add below all lines of post installation instructions e.g ''npm install'' ?
+  postInstall = ''
+    ll ./
+  '';
+}