From: Winfried Kappeler Date: Sat, 30 Mar 2024 06:39:47 +0000 (+0100) Subject: V0.0.5 autologin X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=6234284713ae976bed89315cee2e9e7d71784b4a;p=worxer.git V0.0.5 autologin - User: auto login - new *_modify_users_table.php - laraknife is linked by "local" (not git) - InitApp.sh: improvements --- diff --git a/CHANGELOG.md b/CHANGELOG.md index be39dfd..d2b4e91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# V0.0.5 autologin + +## Added +- User: auto login +- new *_modify_users_table.php + +## Changed +- laraknife is linked by "local" (not git) +- InitApp.sh: improvements + # V0.0.4 InitApp.sh improvements # Changed diff --git a/app/Models/User.php b/app/Models/User.php index 25f0dfd..ff40333 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -30,6 +30,8 @@ class User extends Authenticatable * @var array */ protected $hidden = [ + 'autologin', + 'endautologin', 'password', 'remember_token', ]; diff --git a/composer.lock b/composer.lock index a030148..c3f6c0f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "acecdffb1e1c04aaadd82226400ed03f", + "content-hash": "a49068b102429f4f731a4a54d2550486", "packages": [ { "name": "brick/math", @@ -1048,21 +1048,14 @@ { "name": "hamatoma/laraknife", "version": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/hamatoma/laraknife.git", - "reference": "7ed4b7846c8bf3547bdecdf1435a21976d6df6a8" - }, "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hamatoma/laraknife/zipball/7ed4b7846c8bf3547bdecdf1435a21976d6df6a8", - "reference": "7ed4b7846c8bf3547bdecdf1435a21976d6df6a8", - "shasum": "" + "type": "path", + "url": "../laraknife", + "reference": "7ed4b7846c8bf3547bdecdf1435a21976d6df6a8" }, "require-dev": { "phpunit/phpunit": "11.0.x-dev" }, - "default-branch": true, "bin": [ "scripts/laraknife-tool.sh" ], @@ -1082,24 +1075,23 @@ } ], "description": "Helpers for development with Laravel.", - "support": { - "source": "https://github.com/hamatoma/laraknife/tree/main", - "issues": "https://github.com/hamatoma/laraknife/issues" - }, - "time": "2024-03-26T20:10:02+00:00" + "transport-options": { + "symlink": true, + "relative": true + } }, { "name": "laravel/framework", - "version": "v11.1.0", + "version": "v11.1.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "4a9195f68b529b20fe01e24864f99991459c48d4" + "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/4a9195f68b529b20fe01e24864f99991459c48d4", - "reference": "4a9195f68b529b20fe01e24864f99991459c48d4", + "url": "https://api.github.com/repos/laravel/framework/zipball/1437cea6d2b04cbc83743fbb208e1a01efccd9ec", + "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec", "shasum": "" }, "require": { @@ -1291,7 +1283,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-26T15:17:39+00:00" + "time": "2024-03-28T15:07:18+00:00" }, { "name": "laravel/prompts", @@ -2035,16 +2027,16 @@ }, { "name": "nesbot/carbon", - "version": "3.2.0", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "6bfea14bb0792e85f2e1ff0919487c88419c5883" + "reference": "2d69b6de67e2a3c0652d0c9dfcfda8b4563c4cee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/6bfea14bb0792e85f2e1ff0919487c88419c5883", - "reference": "6bfea14bb0792e85f2e1ff0919487c88419c5883", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2d69b6de67e2a3c0652d0c9dfcfda8b4563c4cee", + "reference": "2d69b6de67e2a3c0652d0c9dfcfda8b4563c4cee", "shasum": "" }, "require": { @@ -2137,7 +2129,7 @@ "type": "tidelift" } ], - "time": "2024-03-27T18:14:36+00:00" + "time": "2024-03-28T12:59:49+00:00" }, { "name": "nette/schema", @@ -6867,16 +6859,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.15", + "version": "10.5.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b" + "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", + "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", "shasum": "" }, "require": { @@ -6948,7 +6940,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16" }, "funding": [ { @@ -6964,7 +6956,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T04:17:47+00:00" + "time": "2024-03-28T10:08:10+00:00" }, { "name": "sebastian/cli-parser", @@ -8015,16 +8007,16 @@ }, { "name": "spatie/ignition", - "version": "1.12.0", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d" + "reference": "889bf1dfa59e161590f677728b47bf4a6893983b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/5b6f801c605a593106b623e45ca41496a6e7d56d", - "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d", + "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b", + "reference": "889bf1dfa59e161590f677728b47bf4a6893983b", "shasum": "" }, "require": { @@ -8094,20 +8086,20 @@ "type": "github" } ], - "time": "2024-01-03T15:49:39+00:00" + "time": "2024-03-29T14:03:47+00:00" }, { "name": "spatie/laravel-ignition", - "version": "2.4.2", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e" + "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/351504f4570e32908839fc5a2dc53bf77d02f85e", - "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada", + "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada", "shasum": "" }, "require": { @@ -8117,7 +8109,7 @@ "illuminate/support": "^10.0|^11.0", "php": "^8.1", "spatie/flare-client-php": "^1.3.5", - "spatie/ignition": "^1.9", + "spatie/ignition": "^1.13", "symfony/console": "^6.2.3|^7.0", "symfony/var-dumper": "^6.2.3|^7.0" }, @@ -8186,7 +8178,7 @@ "type": "github" } ], - "time": "2024-02-09T16:08:40+00:00" + "time": "2024-03-29T14:14:55+00:00" }, { "name": "symfony/yaml", diff --git a/database/migrations/2024_03_29_084449_modify_users_table.php b/database/migrations/2024_03_29_084449_modify_users_table.php new file mode 100644 index 0000000..c98c66d --- /dev/null +++ b/database/migrations/2024_03_29_084449_modify_users_table.php @@ -0,0 +1,29 @@ +string('autologin', 129)->nullable(); + $table->timestamp('endautologin'); + $table->string('options')->nullable(); + $table->string('rights')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/lang/de_DE.json b/lang/de_DE.json index c5c6f81..436cdb0 100644 --- a/lang/de_DE.json +++ b/lang/de_DE.json @@ -47,6 +47,7 @@ "Documents": "Dokumente", "Documents of a Note": "Dokument zu einer Notiz", "Duration": "Dauer", + "Email": "Email", "English (Britisch)": "Englisch (GB)", "File": "Datei", "Filegroup": "Gruppe", @@ -81,11 +82,13 @@ "Overwrites the upload name (if not empty)": "\u00dcberschreibt den Hochladenamen (wenn nicht leer)", "Owner": "Besitzer", "Participle": "Partizip", + "Password": "Passwort", "Password forgotten?": "Passwort vergessen?", "Please use the following link and change your password:": "Bitte benutze den folgenden Verweis und \u00e4ndere dein Passwort", "Preposition": "Pr\u00e4position", "Privacy": "Datenschutz", "Properties": "Eigenschaften", + "Remain signed in": "Angemeldet bleiben", "Repetition": "Wiederholung", "Role": "Rolle", "Roles": "Rollen", diff --git a/scripts/InitApp.sh b/scripts/InitApp.sh index dce1e58..4bce64b 100755 --- a/scripts/InitApp.sh +++ b/scripts/InitApp.sh @@ -12,7 +12,7 @@ function SeedIt(){ done } function CreateStorage(){ - mkdir -p storage/log + mkdir -p storage/logs if [ ! -d storage/framework/cache ]; then mkdir -p storage/framework/cache storage/framework/views storage/framework/sessions fi @@ -37,7 +37,13 @@ function DoIt(){ egrep '"vite":' package.json && sudo -u $DEV_USER npm install vite Wait sudo -u $DEV_USER npm run build - echo "see .lrv.credential for first login" + cat <<'EOS' >ToDo += see .lrv.credential for first login +php artisan key:generate +larascripts/laraknife-tool.sh setup-nginx local worxer.test $(pwd) 8.2 +EOS + echo "=== contents of ToDo:" + cat ToDo } if [ ! -L vendor/hamatoma/laraknife ]; then LinkLaraknife @@ -51,6 +57,8 @@ elif [ ! -e .dev.user ]; then elif [ ! -f .env ]; then echo "+++ missing .env" echo "cp -a env.example .env" + echo "adapt: APP_URL DB_USERNAME..." + echo "run later: php artisan key:generate" elif [ ! -d /var/lib/mysql/lrvworxer ]; then echo "+++ missing db lrvworxer" echo "sudo mysqladmin create lrvworxer"