nitrobon
/
pipicar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nim_grid_restyle

pull/5/head
nimtaurel 2025-03-17 16:16:36 +05:00
parent 5bec8a07aa
commit 4e29a71c7b
11 changed files with 81 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/components/Show.php
View File

@ -16,7 +16,6 @@ class Show extends Component
public function __construct(array $params = []) public function __construct(array $params = [])
{ {
dd(123);
parent::__construct($params, ''); parent::__construct($params, '');
$this->template = "components.show"; $this->template = "components.show";
} }

80
composer.lock generated
View File

@ -8,17 +8,17 @@
"packages": [ "packages": [
{ {
"name": "a7kz/platform", "name": "a7kz/platform",
"version": "1.3.218", "version": "1.3.224",
"source": { "source": {
"type": "git", "type": "git",
"url": "ssh://git@git.a7.kz:22022/A7/package.platform.git", "url": "ssh://git@git.a7.kz:22022/A7/package.platform.git",
"reference": "6f45d0e90122fdd5462cac78b4315ab228d68a0a" "reference": "6568799d86f1f817e26169c91d0b03136ecd8a79"
}, },
"dist": { "dist": {
"type": "tar", "type": "tar",
"url": "https://packagist.a7.kz/dist/a7kz/platform/a7kz-platform-1.3.218-d7c1e2.tar", "url": "https://packagist.a7.kz/dist/a7kz/platform/a7kz-platform-1.3.224-015abb.tar",
"reference": "6f45d0e90122fdd5462cac78b4315ab228d68a0a", "reference": "6568799d86f1f817e26169c91d0b03136ecd8a79",
"shasum": "2e909f925c276feb68c0f56ba5e4744d10c26dbb" "shasum": "e245549e24305e73fa8552df633c84ba62e8cf39"
}, },
"require": { "require": {
"doctrine/dbal": "^3.5", "doctrine/dbal": "^3.5",
@ -47,7 +47,7 @@
} }
], ],
"description": "LowCode platform", "description": "LowCode platform",
"time": "2025-03-03T12:22:51+00:00" "time": "2025-03-14T13:36:53+00:00"
}, },
{ {
"name": "brick/math", "name": "brick/math",
@ -1641,16 +1641,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v10.48.28", "version": "v10.48.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "e714e7e0c1ae51bf747e3df5b10fa60c54e3e0e1" "reference": "8f7f9247cb8aad1a769d6b9815a6623d89b46b47"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/e714e7e0c1ae51bf747e3df5b10fa60c54e3e0e1", "url": "https://api.github.com/repos/laravel/framework/zipball/8f7f9247cb8aad1a769d6b9815a6623d89b46b47",
"reference": "e714e7e0c1ae51bf747e3df5b10fa60c54e3e0e1", "reference": "8f7f9247cb8aad1a769d6b9815a6623d89b46b47",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1844,7 +1844,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2025-01-31T10:04:17+00:00" "time": "2025-03-12T14:42:01+00:00"
}, },
{ {
"name": "laravel/prompts", "name": "laravel/prompts",
@ -4467,16 +4467,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.12.7", "version": "v0.12.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4540,9 +4540,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/bobthecow/psysh/issues", "issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.12.7" "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
}, },
"time": "2024-12-10T01:58:33+00:00" "time": "2025-03-16T03:05:19+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
@ -7389,16 +7389,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.17.0", "version": "2.18.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e" "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e", "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e", "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7448,7 +7448,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.17.0" "source": "https://github.com/filp/whoops/tree/2.18.0"
}, },
"funding": [ "funding": [
{ {
@ -7456,7 +7456,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-01-25T12:00:00+00:00" "time": "2025-03-15T12:00:00+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",
@ -7723,40 +7723,40 @@
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
"version": "v7.11.0", "version": "v7.12.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nunomaduro/collision.git", "url": "https://github.com/nunomaduro/collision.git",
"reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05" "reference": "995245421d3d7593a6960822063bdba4f5d7cf1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/994ea93df5d4132f69d3f1bd74730509df6e8a05", "url": "https://api.github.com/repos/nunomaduro/collision/zipball/995245421d3d7593a6960822063bdba4f5d7cf1a",
"reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05", "reference": "995245421d3d7593a6960822063bdba4f5d7cf1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"filp/whoops": "^2.16.0", "filp/whoops": "^2.17.0",
"nunomaduro/termwind": "^1.15.1", "nunomaduro/termwind": "^1.17.0",
"php": "^8.1.0", "php": "^8.1.0",
"symfony/console": "^6.4.12" "symfony/console": "^6.4.17"
}, },
"conflict": { "conflict": {
"laravel/framework": ">=11.0.0" "laravel/framework": ">=11.0.0"
}, },
"require-dev": { "require-dev": {
"brianium/paratest": "^7.3.1", "brianium/paratest": "^7.4.8",
"laravel/framework": "^10.48.22", "laravel/framework": "^10.48.29",
"laravel/pint": "^1.18.1", "laravel/pint": "^1.21.2",
"laravel/sail": "^1.36.0", "laravel/sail": "^1.41.0",
"laravel/sanctum": "^3.3.3", "laravel/sanctum": "^3.3.3",
"laravel/tinker": "^2.10.0", "laravel/tinker": "^2.10.1",
"nunomaduro/larastan": "^2.9.8", "nunomaduro/larastan": "^2.10.0",
"orchestra/testbench-core": "^8.28.3", "orchestra/testbench-core": "^8.35.0",
"pestphp/pest": "^2.35.1", "pestphp/pest": "^2.36.0",
"phpunit/phpunit": "^10.5.36", "phpunit/phpunit": "^10.5.36",
"sebastian/environment": "^6.1.0", "sebastian/environment": "^6.1.0",
"spatie/laravel-ignition": "^2.8.0" "spatie/laravel-ignition": "^2.9.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -7815,7 +7815,7 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2024-10-15T15:12:40+00:00" "time": "2025-03-14T22:35:49+00:00"
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",

4
public/css/app.css
View File

File diff suppressed because one or more lines are too long

2
public/css/app.css.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/sass/components/card.scss
View File

@ -37,3 +37,7 @@
justify-content: center; justify-content: center;
} }
} }
.bi.bi-caret-right-fill::before,
.bi.bi-caret-left-fill::before {
vertical-align: -0.2em;
}

27
resources/assets/sass/components/form-control.scss
View File

@ -1,6 +1,33 @@
.form-control{ .form-control{
height: 35px; height: 35px;
border-radius: 4px; border-radius: 4px;
&:focus {
background-color: var(--bs-body-bg);
border-color: $primary-color;
box-shadow: 0 0 0 .25rem #01b0e847;
color: var(--bs-body-color);
outline: 0;
}
&:not(:disabled):not([readonly]) {
cursor: pointer;
}
&[readonly] {
background-color: rgba(1, 176, 232, 0.1);
color: #888;
border: none;
cursor: not-allowed;
}
&[readonly]:focus {
background-color: rgba(1, 176, 232, 0.2); /* Сделаем фон чуть ярче */
}
}
.fkey {
background-color: #fff !important;
border: 1px solid #ced4da!important;
cursor: pointer!important;
color: $text-color!important;
} }
textarea.form-control, textarea{ textarea.form-control, textarea{

2
resources/assets/sass/components/global-actions.scss
View File

@ -1,6 +1,6 @@
.global-actions { .global-actions {
margin: 0 -20px; margin: 0 -20px;
padding: 10px 20px; padding: 10px 20px 20px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;

1
resources/assets/sass/components/global-alert.scss
View File

@ -12,6 +12,7 @@
align-items: start; align-items: start;
opacity: 0.8; opacity: 0.8;
transition: 0.35s all ease; transition: 0.35s all ease;
font-size: 1rem;
&:before{ &:before{
content: ''; content: '';
position: absolute; position: absolute;

7
resources/views/components/show.blade.php
View File

@ -30,15 +30,14 @@
@endif @endif
</div> </div>
</div> </div>
<hr class="global-line">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@if(!isset($form->getConfig()->form->hide_prev_next_pk)) @if(!isset($form->getConfig()->form->hide_prev_next_pk))
<div class="row"> <div class="row">
<div class="col text-center" style="flex-direction: row;display: flex;justify-content: center;column-gap: 1rem;"> <div class="col text-center" style="flex-direction: row;display: flex;justify-content: center;column-gap: 1rem; margin-bottom: 1rem;">
<?php $next = $app->data->getNextPkValue(); $prev = $app->data->getPrevPkValue(); ?> <?php $next = $app->data->getNextPkValue(); $prev = $app->data->getPrevPkValue(); ?>
@if($prev) <a class="btn btn-outline" href="{{$app->getPath()}}/{{$form->action()}}?pk={{$prev}}"><i class="bi bi-caret-left-fill">123</i></a> @endif @if($prev) <a class="btn btn-primary" style='font-size: 0.875rem;' href="{{$app->getPath()}}/{{$form->action()}}?pk={{$prev}}"><i class="bi bi-caret-left-fill" style="margin:0 7px 0 0; font-size: 0.6rem;"></i>Вперед</a> @endif
@if($next) <a class="btn btn-primary" href="{{$app->getPath()}}/{{$form->action()}}?pk={{$next}}"><i class="bi bi-caret-right-fill"></i></a> @endif @if($next) <a class="btn btn-primary" style='font-size: 0.875rem;' href="{{$app->getPath()}}/{{$form->action()}}?pk={{$next}}">Назад<i class="bi bi-caret-right-fill" style="margin:0 0 0 7px; font-size: 0.6rem;"></i></a> @endif
</div> </div>
</div> </div>
@endif @endif

2
resources/views/layouts/app.blade.php
View File

@ -7,7 +7,7 @@
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title> <title>{{ config('app.name', 'Qazqar') }}</title>
<!-- Scripts --> <!-- Scripts -->
<script src="{{ asset('js/app.js') }}?{{env("CSSJSVERSION")}}"></script> <script src="{{ asset('js/app.js') }}?{{env("CSSJSVERSION")}}"></script>

2
resources/views/welcome.blade.php
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Laravel</title> <title>Qazqar</title>
<!-- Fonts --> <!-- Fonts -->
<link rel="preconnect" href="https://fonts.bunny.net"> <link rel="preconnect" href="https://fonts.bunny.net">