From: Hamatoma Date: Thu, 29 Feb 2024 21:20:59 +0000 (+0100) Subject: V0.1.0: Notes works X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=HEAD;p=taskx.git V0.1.0: Notes works - ViewHelperLocal: change to module_id and reference_id --- diff --git a/.gitignore b/.gitignore index ce9d616..07db0cc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ yarn-error.log .lrv.credentials project.env resources/lang/de_DE.json +.dev.user +resources/lang/de_DE.json diff --git a/Own b/Own deleted file mode 100755 index 52bfcec..0000000 --- a/Own +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash -if [ -z "$1" ]; then - echo "+++ missing user" -else - sudo chown -R $1 bootstrap/cache storage/logs -fi diff --git a/Own.sh b/Own.sh new file mode 120000 index 0000000..7530a95 --- /dev/null +++ b/Own.sh @@ -0,0 +1 @@ +larascripts/Own.sh \ No newline at end of file diff --git a/SwitchRepo b/SwitchRepo deleted file mode 100755 index 9cb8cfb..0000000 --- a/SwitchRepo +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/bash -MODE=$1 -if [ "$MODE" != 'git' -a "$MODE" != 'local' ]; then - echo "+++ unknown MODE, expecting 'git' or 'local'" - echo "Example: SwitchRepo git" -fi -function Switch(){ - composer config --unset repositories.vendor/laraknife - grep -i "repository" composer.json - if [ "$MODE" = git ]; then - composer config repositories.laraknife vcs https://github.com/hamatoma/laraknife - else - composer config repositories.laraknife '{"type": "path", "url": "../laraknife", "options": {"symlink": true}}' - fi -} -Switch - diff --git a/SwitchRepo.sh b/SwitchRepo.sh new file mode 120000 index 0000000..3b4834b --- /dev/null +++ b/SwitchRepo.sh @@ -0,0 +1 @@ +larascripts/SwitchRepo.sh \ No newline at end of file diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 4db00ca..6f80c0b 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log for TaskX +## V0.1.0: Notes works +- ViewHelperLocal: change to module_id and reference_id + ## V0.0.1: forgotten password - new: EmailHelper.php ForgottenPassword.php - new: forgotten-answer.blade.php diff --git a/app/Helpers/ViewHelperLocal.php b/app/Helpers/ViewHelperLocal.php index 6c4f9a4..7cb0b50 100644 --- a/app/Helpers/ViewHelperLocal.php +++ b/app/Helpers/ViewHelperLocal.php @@ -11,14 +11,14 @@ use App\Helpers\NavigationTabs; */ class ViewHelperLocal { - public static function getNavigationTabInfo(int $noteId, string $name, int $indexActive = 0): ?NavigationTabs + public static function getNavigationTabInfo(string $name, int $indexActive, int $referenceId): ?NavigationTabs { $rc = null; switch ($name) { case 'note-edit': $rc = new NavigationTabs([ - "Properties;/note-edit/$noteId", - "Documents;/note-edit_documents/$noteId" + "Properties;/note-edit/$referenceId", + "Documents;/note-index_documents/$referenceId" ], $indexActive); break; default: diff --git a/app/Models/Module.php b/app/Models/Module.php new file mode 120000 index 0000000..5283335 --- /dev/null +++ b/app/Models/Module.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/Models/Module.php \ No newline at end of file diff --git a/app/Models/User.php b/app/Models/User.php index 223a41b..f8b7ce4 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -20,7 +20,6 @@ class User extends Authenticatable */ protected $fillable = [ 'role_id', - 'name', 'email', 'password', diff --git a/composer.lock b/composer.lock index 527d7db..427e0bd 100644 --- a/composer.lock +++ b/composer.lock @@ -1051,7 +1051,7 @@ "dist": { "type": "path", "url": "../laraknife", - "reference": "5e96a68fe2ec5581770b19a85caeb148e495b7e4" + "reference": "ff55e26aaafc674dbc60a384060b3922b1a33a00" }, "require-dev": { "phpunit/phpunit": "11.0.x-dev" @@ -1082,16 +1082,16 @@ }, { "name": "laravel/framework", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd" + "reference": "5e95946a8283a8d5c015035793f9c61c297e937f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/dcf5d1d722b84ad38a5e053289130b6962f830bd", - "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd", + "url": "https://api.github.com/repos/laravel/framework/zipball/5e95946a8283a8d5c015035793f9c61c297e937f", + "reference": "5e95946a8283a8d5c015035793f9c61c297e937f", "shasum": "" }, "require": { @@ -1284,20 +1284,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-21T14:07:36+00:00" + "time": "2024-02-27T16:46:54+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.15", + "version": "v0.1.16", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "d814a27514d99b03c85aa42b22cfd946568636c1" + "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/d814a27514d99b03c85aa42b22cfd946568636c1", - "reference": "d814a27514d99b03c85aa42b22cfd946568636c1", + "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781", + "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781", "shasum": "" }, "require": { @@ -1339,9 +1339,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.15" + "source": "https://github.com/laravel/prompts/tree/v0.1.16" }, - "time": "2023-12-29T22:37:42+00:00" + "time": "2024-02-21T19:25:27+00:00" }, { "name": "laravel/sanctum", @@ -3284,16 +3284,16 @@ }, { "name": "spatie/laravel-permission", - "version": "6.3.0", + "version": "6.4.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "4d119986c862ac0168b77338c85d8236bb559a88" + "reference": "05cce017fe3ac78f60a3fce78c07fe6e8e6e6e52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/4d119986c862ac0168b77338c85d8236bb559a88", - "reference": "4d119986c862ac0168b77338c85d8236bb559a88", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/05cce017fe3ac78f60a3fce78c07fe6e8e6e6e52", + "reference": "05cce017fe3ac78f60a3fce78c07fe6e8e6e6e52", "shasum": "" }, "require": { @@ -3304,7 +3304,7 @@ "php": "^8.0" }, "require-dev": { - "laravel/passport": "^11.0", + "laravel/passport": "^11.0|^12.0", "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0", "phpunit/phpunit": "^9.4|^10.1" }, @@ -3354,7 +3354,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/6.3.0" + "source": "https://github.com/spatie/laravel-permission/tree/6.4.0" }, "funding": [ { @@ -3362,20 +3362,20 @@ "type": "github" } ], - "time": "2023-12-24T06:58:02+00:00" + "time": "2024-02-28T08:11:20+00:00" }, { "name": "symfony/console", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -3440,7 +3440,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.3" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -3456,7 +3456,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/css-selector", @@ -3592,16 +3592,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6" + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/6dc3c76a278b77f01d864a6005d640822c6f26a6", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a", + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a", "shasum": "" }, "require": { @@ -3647,7 +3647,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.3" + "source": "https://github.com/symfony/error-handler/tree/v6.4.4" }, "funding": [ { @@ -3663,7 +3663,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:40:36+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/event-dispatcher", @@ -3887,16 +3887,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9" + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5677bdf7cade4619cb17fc9e1e7b31ec392244a9", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304", + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304", "shasum": "" }, "require": { @@ -3944,7 +3944,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.3" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.4" }, "funding": [ { @@ -3960,20 +3960,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-08T15:01:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2" + "reference": "7a186f64a7f02787c04e8476538624d6aa888e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c6ec4e543044f7568a53a76ab1484ecd30637a2", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7a186f64a7f02787c04e8476538624d6aa888e42", + "reference": "7a186f64a7f02787c04e8476538624d6aa888e42", "shasum": "" }, "require": { @@ -4022,7 +4022,7 @@ "symfony/process": "^5.4|^6.0|^7.0", "symfony/property-access": "^5.4.5|^6.0.5|^7.0", "symfony/routing": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3|^7.0", + "symfony/serializer": "^6.4.4|^7.0.4", "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/translation": "^5.4|^6.0|^7.0", "symfony/translation-contracts": "^2.5|^3", @@ -4057,7 +4057,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.3" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.4" }, "funding": [ { @@ -4073,20 +4073,20 @@ "type": "tidelift" } ], - "time": "2024-01-31T07:21:29+00:00" + "time": "2024-02-27T06:32:13+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee" + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/74412c62f88a85a41b61f0b71ab0afcaad6f03ee", - "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee", + "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b", + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b", "shasum": "" }, "require": { @@ -4137,7 +4137,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.3" + "source": "https://github.com/symfony/mailer/tree/v6.4.4" }, "funding": [ { @@ -4153,7 +4153,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:01:07+00:00" + "time": "2024-02-03T21:33:47+00:00" }, { "name": "symfony/mime", @@ -4952,16 +4952,16 @@ }, { "name": "symfony/process", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { @@ -4993,7 +4993,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.3" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -5009,7 +5009,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/routing", @@ -5178,16 +5178,16 @@ }, { "name": "symfony/string", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac" + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac", + "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", "shasum": "" }, "require": { @@ -5244,7 +5244,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.3" + "source": "https://github.com/symfony/string/tree/v7.0.4" }, "funding": [ { @@ -5260,20 +5260,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:41:16+00:00" + "time": "2024-02-01T13:17:36+00:00" }, { "name": "symfony/translation", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "637c51191b6b184184bbf98937702bcf554f7d04" + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/637c51191b6b184184bbf98937702bcf554f7d04", - "reference": "637c51191b6b184184bbf98937702bcf554f7d04", + "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", "shasum": "" }, "require": { @@ -5339,7 +5339,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.3" + "source": "https://github.com/symfony/translation/tree/v6.4.4" }, "funding": [ { @@ -5355,7 +5355,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T13:11:52+00:00" + "time": "2024-02-20T13:16:58+00:00" }, { "name": "symfony/translation-contracts", @@ -5511,16 +5511,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", "shasum": "" }, "require": { @@ -5576,7 +5576,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" }, "funding": [ { @@ -5592,7 +5592,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -6118,16 +6118,16 @@ }, { "name": "laravel/sail", - "version": "v1.28.0", + "version": "v1.28.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c" + "reference": "f84e444a3dbc1811803cd2a050bdd54ff6f5eef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/a05861ca9b04558b1ec1f36cff521a271a259b6c", - "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c", + "url": "https://api.github.com/repos/laravel/sail/zipball/f84e444a3dbc1811803cd2a050bdd54ff6f5eef8", + "reference": "f84e444a3dbc1811803cd2a050bdd54ff6f5eef8", "shasum": "" }, "require": { @@ -6176,7 +6176,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-02-20T15:11:00+00:00" + "time": "2024-02-23T00:24:47+00:00" }, { "name": "mockery/mockery", diff --git a/database/migrations/2024_01_03_053217_create_modules_table.php b/database/migrations/2024_01_03_053217_create_modules_table.php new file mode 120000 index 0000000..f32f724 --- /dev/null +++ b/database/migrations/2024_01_03_053217_create_modules_table.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/database/migrations/2024_01_03_053217_create_modules_table.php \ No newline at end of file diff --git a/database/seeders/ModuleSeeder.php b/database/seeders/ModuleSeeder.php new file mode 100644 index 0000000..8760662 --- /dev/null +++ b/database/seeders/ModuleSeeder.php @@ -0,0 +1,45 @@ +insert([ + 'name' => 'SProperty', + 'tablename' => 'sproperties' + ]); + DB::table('modules')->insert([ + 'name' => 'Role', + 'tablename' => 'roles' + ]); + DB::table('modules')->insert([ + 'name' => 'User', + 'tablename' => 'users' + ]); + DB::table('modules')->insert([ + 'name' => 'Note', + 'tablename' => 'notes' + ]); + DB::table('modules')->insert([ + 'name' => 'Menuitem', + 'tablename' => 'menuitems' + ]); + DB::table('modules')->insert([ + 'name' => 'File', + 'tablename' => 'files' + ]); + DB::table('modules')->insert([ + 'name' => 'Module', + 'tablename' => 'modules' + ]); + } +} diff --git a/database/seeders/NoteSeeder.php b/database/seeders/NoteSeeder.php new file mode 120000 index 0000000..7e09383 --- /dev/null +++ b/database/seeders/NoteSeeder.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/database/seeders/NoteSeeder.php \ No newline at end of file diff --git a/missing.seeders b/missing.seeders new file mode 100644 index 0000000..72ed8fa --- /dev/null +++ b/missing.seeders @@ -0,0 +1,3 @@ +# Enter the module names separated by " ". +# Example: MISSING="User Role Menuitem" +MISSING="Module Note"