.
このコミットが含まれているのは:
dragon1211
コミット
8373736665
バイナリファイルは表示されません。
|
|
@ -19,7 +19,7 @@ BROADCAST_DRIVER=log
|
|||
CACHE_DRIVER=file
|
||||
QUEUE_CONNECTION=sync
|
||||
SESSION_DRIVER=file
|
||||
SESSION_LIFETIME=120
|
||||
SESSION_LIFETIME=150
|
||||
|
||||
MEMCACHED_HOST=127.0.0.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
APP_NAME=KIKI
|
||||
APP_ENV=local
|
||||
APP_ENV=production
|
||||
APP_KEY=
|
||||
APP_DEBUG=false
|
||||
SITE_URL=https://kikikan.jp
|
||||
|
|
@ -19,7 +19,7 @@ BROADCAST_DRIVER=log
|
|||
CACHE_DRIVER=file
|
||||
QUEUE_CONNECTION=sync
|
||||
SESSION_DRIVER=file
|
||||
SESSION_LIFETIME=120
|
||||
SESSION_LIFETIME=150
|
||||
|
||||
MEMCACHED_HOST=127.0.0.1
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,9 @@ use Illuminate\Support\Facades\Log;
|
|||
|
||||
use App\Models\LoginLimits;
|
||||
|
||||
// use App\Models\LoginLimits;
|
||||
|
||||
trait AuthenticationTrait {
|
||||
private function makeSession ($guard, $db) {
|
||||
session()->regenerate();
|
||||
//session()->regenerate();
|
||||
|
||||
if (!session()->has($guard)) {
|
||||
// 認証されたデータのpasswordとremember_token以外を把握する
|
||||
|
|
@ -36,6 +34,15 @@ trait AuthenticationTrait {
|
|||
return ['status_code' => 200, 'params' => ['id' => $login_user_datum['id']]];
|
||||
}
|
||||
}
|
||||
if (session()->has($this->getGuard())) {
|
||||
if (null !== ($get = $this->getModel()->where('id', session()->get($this->getGuard())['id'])->first())) { // トークンがある場合
|
||||
// セッションを想像する
|
||||
$login_user_datum = $this->makeSession($this->getGuard(), $get->toArray());
|
||||
|
||||
return ['status_code' => 200, 'params' => ['id' => $login_user_datum['id']]];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return ['status_code' => 202];
|
||||
}
|
||||
|
|
@ -98,11 +105,11 @@ trait AuthenticationTrait {
|
|||
}
|
||||
|
||||
// 既にセッションがあれば、ログアウトします。
|
||||
if (Session::has('children')) Session::forget('children');
|
||||
if (Session::has('fathers')) Session::forget('fathers');
|
||||
if (Session::has('admins')) Session::forget('admins');
|
||||
unset($_COOKIE['remember_token']);
|
||||
setcookie('remember_token', '', time() - 3600, '/', $_SERVER['HTTP_HOST'], 0, 1);
|
||||
//if (Session::has('children')) Session::forget('children');
|
||||
//if (Session::has('fathers')) Session::forget('fathers');
|
||||
//if (Session::has('admins')) Session::forget('admins');
|
||||
//unset($_COOKIE['remember_token']);
|
||||
//setcookie('remember_token', '', time() - 3600, '/', $_SERVER['HTTP_HOST'], 0, 1);
|
||||
|
||||
if ($r->remember_token == 'true') {
|
||||
$token = bin2hex(random_bytes(24));
|
||||
|
|
|
|||
|
|
@ -117,14 +117,22 @@ class FathersController extends Controller {
|
|||
];
|
||||
|
||||
try {
|
||||
// DBの値の準備。
|
||||
DB::beginTransaction();
|
||||
|
||||
// DBに入ります。
|
||||
EmailActivation::create($create);
|
||||
$emac = new EmailActivation;
|
||||
$emac->fill($create);
|
||||
$emac->push();
|
||||
|
||||
// メールを送ります。
|
||||
Mail::to($r->email)->send(new FathersRegistrationTemporaryMail($token));
|
||||
|
||||
DB::commit();
|
||||
} catch (\Throwable $e) {
|
||||
// 失敗
|
||||
Log::critical($e->getMessage());
|
||||
DB::rollback();
|
||||
return ['status_code' => 400, 'error_messages' => '登録に失敗しました。'];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -694,7 +694,7 @@ class MeetingsController extends Controller {
|
|||
if (request()->route()->action['as'] != 'mdc') {
|
||||
$result->children = [];
|
||||
$rec = [];
|
||||
|
||||
|
||||
if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->get())) {
|
||||
foreach ($rel as $i => $re) {
|
||||
if (null !== ($rech = Child::select($all_child_select)->where('id', $re->child_id)->first())) {
|
||||
|
|
|
|||
|
|
@ -1275,16 +1275,16 @@
|
|||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v8.80.0",
|
||||
"version": "v8.81.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "8949a2e46b0f274f39c61eee8d5de1dc6a1f686b"
|
||||
"reference": "9cc0efd724ce67a190b1695ba31a27bbb1ae9177"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/8949a2e46b0f274f39c61eee8d5de1dc6a1f686b",
|
||||
"reference": "8949a2e46b0f274f39c61eee8d5de1dc6a1f686b",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/9cc0efd724ce67a190b1695ba31a27bbb1ae9177",
|
||||
"reference": "9cc0efd724ce67a190b1695ba31a27bbb1ae9177",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1317,7 +1317,7 @@
|
|||
"symfony/var-dumper": "^5.4",
|
||||
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
|
||||
"vlucas/phpdotenv": "^5.4.1",
|
||||
"voku/portable-ascii": "^1.4.8"
|
||||
"voku/portable-ascii": "^1.6.1"
|
||||
},
|
||||
"conflict": {
|
||||
"tightenco/collect": "<5.5.33"
|
||||
|
|
@ -1444,7 +1444,7 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2022-01-18T15:51:42+00:00"
|
||||
"time": "2022-01-25T16:41:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/nexmo-notification-channel",
|
||||
|
|
@ -1771,16 +1771,16 @@
|
|||
},
|
||||
{
|
||||
"name": "league/commonmark",
|
||||
"version": "2.1.1",
|
||||
"version": "2.2.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/commonmark.git",
|
||||
"reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d"
|
||||
"reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d",
|
||||
"reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d",
|
||||
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a",
|
||||
"reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1788,6 +1788,7 @@
|
|||
"league/config": "^1.1.1",
|
||||
"php": "^7.4 || ^8.0",
|
||||
"psr/event-dispatcher": "^1.0",
|
||||
"symfony/deprecation-contracts": "^2.1 || ^3.0",
|
||||
"symfony/polyfill-php80": "^1.15"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
@ -1813,7 +1814,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-main": "2.2-dev"
|
||||
"dev-main": "2.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -1870,7 +1871,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-01-02T18:25:06+00:00"
|
||||
"time": "2022-01-25T14:37:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/config",
|
||||
|
|
@ -2205,16 +2206,16 @@
|
|||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "2.55.2",
|
||||
"version": "2.56.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||
"reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2"
|
||||
"reference": "626ec8cbb724cd3c3400c3ed8f730545b744e3f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8c2a18ce3e67c34efc1b29f64fe61304368259a2",
|
||||
"reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/626ec8cbb724cd3c3400c3ed8f730545b744e3f4",
|
||||
"reference": "626ec8cbb724cd3c3400c3ed8f730545b744e3f4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2231,7 +2232,7 @@
|
|||
"kylekatarnls/multi-tester": "^2.0",
|
||||
"phpmd/phpmd": "^2.9",
|
||||
"phpstan/extension-installer": "^1.0",
|
||||
"phpstan/phpstan": "^0.12.54",
|
||||
"phpstan/phpstan": "^0.12.54 || ^1.0",
|
||||
"phpunit/phpunit": "^7.5.20 || ^8.5.14",
|
||||
"squizlabs/php_codesniffer": "^3.4"
|
||||
},
|
||||
|
|
@ -2297,7 +2298,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-12-03T14:59:52+00:00"
|
||||
"time": "2022-01-21T17:08:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nette/schema",
|
||||
|
|
@ -2363,16 +2364,16 @@
|
|||
},
|
||||
{
|
||||
"name": "nette/utils",
|
||||
"version": "v3.2.6",
|
||||
"version": "v3.2.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nette/utils.git",
|
||||
"reference": "2f261e55bd6a12057442045bf2c249806abc1d02"
|
||||
"reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/2f261e55bd6a12057442045bf2c249806abc1d02",
|
||||
"reference": "2f261e55bd6a12057442045bf2c249806abc1d02",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99",
|
||||
"reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2442,9 +2443,9 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/nette/utils/issues",
|
||||
"source": "https://github.com/nette/utils/tree/v3.2.6"
|
||||
"source": "https://github.com/nette/utils/tree/v3.2.7"
|
||||
},
|
||||
"time": "2021-11-24T15:47:23+00:00"
|
||||
"time": "2022-01-24T11:29:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nexmo/laravel",
|
||||
|
|
@ -5768,16 +5769,16 @@
|
|||
},
|
||||
{
|
||||
"name": "voku/portable-ascii",
|
||||
"version": "1.5.6",
|
||||
"version": "1.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/voku/portable-ascii.git",
|
||||
"reference": "80953678b19901e5165c56752d087fc11526017c"
|
||||
"reference": "87337c91b9dfacee02452244ee14ab3c43bc485a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c",
|
||||
"reference": "80953678b19901e5165c56752d087fc11526017c",
|
||||
"url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a",
|
||||
"reference": "87337c91b9dfacee02452244ee14ab3c43bc485a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -5814,7 +5815,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/voku/portable-ascii/issues",
|
||||
"source": "https://github.com/voku/portable-ascii/tree/1.5.6"
|
||||
"source": "https://github.com/voku/portable-ascii/tree/1.6.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5838,7 +5839,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-12T00:07:28+00:00"
|
||||
"time": "2022-01-24T18:55:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "vonage/client",
|
||||
|
|
@ -6337,16 +6338,16 @@
|
|||
},
|
||||
{
|
||||
"name": "fakerphp/faker",
|
||||
"version": "v1.17.0",
|
||||
"version": "v1.18.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/FakerPHP/Faker.git",
|
||||
"reference": "b85e9d44eae8c52cca7aa0939483611f7232b669"
|
||||
"reference": "2e77a868f6540695cf5ebf21e5ab472c65f47567"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/b85e9d44eae8c52cca7aa0939483611f7232b669",
|
||||
"reference": "b85e9d44eae8c52cca7aa0939483611f7232b669",
|
||||
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/2e77a868f6540695cf5ebf21e5ab472c65f47567",
|
||||
"reference": "2e77a868f6540695cf5ebf21e5ab472c65f47567",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6371,7 +6372,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-main": "v1.17-dev"
|
||||
"dev-main": "v1.18-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -6396,9 +6397,9 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/FakerPHP/Faker/issues",
|
||||
"source": "https://github.com/FakerPHP/Faker/tree/v1.17.0"
|
||||
"source": "https://github.com/FakerPHP/Faker/tree/v1.18.0"
|
||||
},
|
||||
"time": "2021-12-05T17:14:47+00:00"
|
||||
"time": "2022-01-23T17:56:23+00:00"
|
||||
},
|
||||
{
|
||||
"name": "filp/whoops",
|
||||
|
|
@ -6524,16 +6525,16 @@
|
|||
},
|
||||
{
|
||||
"name": "laravel/sail",
|
||||
"version": "v1.13.0",
|
||||
"version": "v1.13.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/sail.git",
|
||||
"reference": "a14125e71779c99e27979431a66ea2793aa6ae50"
|
||||
"reference": "b9749028732eca8080c26d01cd88a2f3549c2e3e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/sail/zipball/a14125e71779c99e27979431a66ea2793aa6ae50",
|
||||
"reference": "a14125e71779c99e27979431a66ea2793aa6ae50",
|
||||
"url": "https://api.github.com/repos/laravel/sail/zipball/b9749028732eca8080c26d01cd88a2f3549c2e3e",
|
||||
"reference": "b9749028732eca8080c26d01cd88a2f3549c2e3e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6580,20 +6581,20 @@
|
|||
"issues": "https://github.com/laravel/sail/issues",
|
||||
"source": "https://github.com/laravel/sail"
|
||||
},
|
||||
"time": "2022-01-18T18:06:55+00:00"
|
||||
"time": "2022-01-20T15:31:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mockery/mockery",
|
||||
"version": "1.4.4",
|
||||
"version": "1.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mockery/mockery.git",
|
||||
"reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346"
|
||||
"reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
|
||||
"reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
|
||||
"url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
|
||||
"reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6650,9 +6651,9 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/mockery/mockery/issues",
|
||||
"source": "https://github.com/mockery/mockery/tree/1.4.4"
|
||||
"source": "https://github.com/mockery/mockery/tree/1.5.0"
|
||||
},
|
||||
"time": "2021-09-13T15:28:59+00:00"
|
||||
"time": "2022-01-20T13:18:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "myclabs/deep-copy",
|
||||
|
|
@ -7457,16 +7458,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "9.5.11",
|
||||
"version": "9.5.13",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "2406855036db1102126125537adb1406f7242fdd"
|
||||
"reference": "597cb647654ede35e43b137926dfdfef0fb11743"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd",
|
||||
"reference": "2406855036db1102126125537adb1406f7242fdd",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743",
|
||||
"reference": "597cb647654ede35e43b137926dfdfef0fb11743",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -7544,7 +7545,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -7556,7 +7557,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-12-25T07:07:57+00:00"
|
||||
"time": "2022-01-24T07:33:35+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'lifetime' => env('SESSION_LIFETIME', 120),
|
||||
'lifetime' => env('SESSION_LIFETIME', 150),
|
||||
|
||||
'expire_on_close' => true,
|
||||
|
||||
|
|
|
|||
|
|
@ -12897,7 +12897,11 @@ categories: [project]
|
|||
@font-face {
|
||||
font-family: "iconfont";
|
||||
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2);
|
||||
<<<<<<< HEAD
|
||||
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg");
|
||||
=======
|
||||
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg");
|
||||
>>>>>>> 979b70820792a84b53d44fcdd70644d3690ce8d3
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
|
|||
ファイル差分が大きすぎるため省略します
差分を読み込み
|
|
@ -16,9 +16,9 @@ const ParentMeetingAdd = () => {
|
|||
const location = useLocation();
|
||||
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
||||
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
||||
|
||||
const [title, setTitle] = useState('');
|
||||
const [memo, setMemo] = useState('');
|
||||
const [text, setText] = useState('');
|
||||
|
|
@ -27,7 +27,7 @@ const ParentMeetingAdd = () => {
|
|||
const [meeting_image, setMeetingImages] = useState([]);
|
||||
const [approval_list, setApprovalList] = useState([]);
|
||||
const [children_list, setChildrenList] = useState([]);
|
||||
|
||||
|
||||
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
|
||||
const [_400error, set400Error] = useState('');
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ const ParentMeetingAdd = () => {
|
|||
useEffect(() => {
|
||||
isMountedRef.current = false;
|
||||
setLoaded(false);
|
||||
|
||||
|
||||
let clone = localStorage.getItem('cloneMeeting');
|
||||
if(clone){
|
||||
clone = JSON.parse(clone);
|
||||
|
|
@ -83,7 +83,7 @@ const ParentMeetingAdd = () => {
|
|||
for(var i in list)
|
||||
arr.push({...list[i], checked: false})
|
||||
setChildrenList(arr);
|
||||
if(list.length > 0)
|
||||
if(list.length > 0)
|
||||
setCheckRadio("all_send");
|
||||
else setCheckRadio('');
|
||||
}
|
||||
|
|
@ -111,7 +111,7 @@ const ParentMeetingAdd = () => {
|
|||
if(!loaded) return; //if dont load data
|
||||
var list = [...children_list];
|
||||
if(check_radio=="all_send"){ //send all children
|
||||
for(var i=0; i<list.length; i++)
|
||||
for(var i=0; i<list.length; i++)
|
||||
list[i].checked = true;
|
||||
}
|
||||
else if(check_radio=="pickup_send"){ //send pickup
|
||||
|
|
@ -131,11 +131,11 @@ const ParentMeetingAdd = () => {
|
|||
|
||||
const formdata = new FormData();
|
||||
formdata.append('father_id', father_id);
|
||||
formdata.append('title', title);
|
||||
formdata.append('text', text);
|
||||
formdata.append('memo', memo);
|
||||
formdata.append('title', title);
|
||||
formdata.append('text', text);
|
||||
formdata.append('memo', memo);
|
||||
formdata.append('pdf', pdf);
|
||||
formdata.append('image', JSON.stringify(meeting_image));
|
||||
formdata.append('image', JSON.stringify(meeting_image));
|
||||
let c_arr = [];
|
||||
for(let i in children_list){
|
||||
if(children_list[i].checked) c_arr.push(children_list[i].id);
|
||||
|
|
@ -184,7 +184,7 @@ const ParentMeetingAdd = () => {
|
|||
|
||||
Promise.all(promises).then(images => {
|
||||
setMeetingImages([...meeting_image, ...images]);
|
||||
},
|
||||
},
|
||||
error => { console.error(error); });
|
||||
};
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ const ParentMeetingAdd = () => {
|
|||
list[index].checked = e.target.checked;
|
||||
setChildrenList(list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<div className="l-content">
|
||||
|
|
@ -222,7 +222,7 @@ const ParentMeetingAdd = () => {
|
|||
</div>
|
||||
<Notification notice={notice}/>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="l-content-wrap">
|
||||
<div className="p-article">
|
||||
<div className="p-article-wrap position-relative" style={{ minHeight:'500px'}}>
|
||||
|
|
@ -230,9 +230,9 @@ const ParentMeetingAdd = () => {
|
|||
!loaded && <PageLoader />
|
||||
}
|
||||
{
|
||||
loaded &&
|
||||
loaded &&
|
||||
<article className="p-article__body">
|
||||
<div className="p-article__content">
|
||||
<div className="p-article__content">
|
||||
<div className="p-article__context">
|
||||
<form className="edit-form" onSubmit={handleSubmit}>
|
||||
<div className="edit-set">
|
||||
|
|
@ -242,7 +242,7 @@ const ParentMeetingAdd = () => {
|
|||
_422errors.title &&
|
||||
<span className="l-alert__text--error ft-16 ft-md-14">
|
||||
{_422errors.title}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
<div className="edit-set">
|
||||
|
|
@ -252,7 +252,7 @@ const ParentMeetingAdd = () => {
|
|||
_422errors.text &&
|
||||
<span className="l-alert__text--error ft-16 ft-md-14">
|
||||
{_422errors.text}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
<div className="edit-set">
|
||||
|
|
@ -262,22 +262,22 @@ const ParentMeetingAdd = () => {
|
|||
_422errors.memo &&
|
||||
<span className="l-alert__text--error ft-16 ft-md-14">
|
||||
{_422errors.memo}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
<div className="edit-set edit-set-mt15">
|
||||
<label className="edit-set-file-label" htmlFor="file_pdf">
|
||||
PDFアップロード
|
||||
<input type="file" name="file_pdf" accept=".pdf" id="file_pdf" onChange={handlePDFChange} />
|
||||
</label>
|
||||
</label>
|
||||
{
|
||||
pdf &&
|
||||
pdf &&
|
||||
<IconButton
|
||||
onClick={()=>{setPdf(''); setPDFURL('');}}
|
||||
style={{position: 'absolute',
|
||||
top: '-6px',
|
||||
right: '-6px'}}>
|
||||
<RemoveIcon
|
||||
<RemoveIcon
|
||||
style={{width:'22px', height:'22px',
|
||||
color: 'white',
|
||||
background: '#dd0000',
|
||||
|
|
@ -288,23 +288,23 @@ const ParentMeetingAdd = () => {
|
|||
_422errors.pdf &&
|
||||
<span className="l-alert__text--error ft-16 ft-md-14">
|
||||
{_422errors.pdf}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
<PreviewPDF pdf_url={pdf_url}></PreviewPDF>
|
||||
</div>
|
||||
<div className="edit-set edit-set-mt15">
|
||||
<label className="edit-set-file-label" htmlFor={meeting_image.length < 10 ? 'file_image': ''}>
|
||||
画像アップロード
|
||||
<input type="file" multiple="multiple" name="file_image[]" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
|
||||
<input type="file" multiple="multiple" name="file_image[]" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
|
||||
</label>
|
||||
{
|
||||
_422errors.image &&
|
||||
<span className="l-alert__text--error ft-16 ft-md-14">
|
||||
{_422errors.image}
|
||||
</span>
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
|
||||
<div className="p-file-image justify-content-start">
|
||||
{
|
||||
meeting_image?.map((x, k)=>
|
||||
|
|
@ -315,7 +315,7 @@ const ParentMeetingAdd = () => {
|
|||
style={{position: 'absolute',
|
||||
bottom: '-6px',
|
||||
right: '-6px'}}>
|
||||
<RemoveIcon
|
||||
<RemoveIcon
|
||||
style={{width:'22px', height:'22px',
|
||||
color: 'white',
|
||||
background: '#dd0000',
|
||||
|
|
@ -330,13 +330,13 @@ const ParentMeetingAdd = () => {
|
|||
)
|
||||
}
|
||||
</div>
|
||||
|
||||
|
||||
<div className="edit-set edit-set-send">
|
||||
<label htmlFor="all_send">
|
||||
<input className="boolean optional"
|
||||
<input className="boolean optional"
|
||||
type="radio"
|
||||
id="all_send"
|
||||
name="check_radio"
|
||||
name="check_radio"
|
||||
value={false}
|
||||
onChange={e=>setCheckRadio(e.target.id)}
|
||||
checked = {(check_radio == 'all_send')? true : false}
|
||||
|
|
@ -345,13 +345,13 @@ const ParentMeetingAdd = () => {
|
|||
<span className="lbl padding-16">全員に送信</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="edit-set-mt5 edit-set-send">
|
||||
<label htmlFor="pickup_send">
|
||||
<input className="boolean optional"
|
||||
<input className="boolean optional"
|
||||
type="radio"
|
||||
id="pickup_send"
|
||||
name="check_radio"
|
||||
name="check_radio"
|
||||
onChange={e=>setCheckRadio(e.target.id)}
|
||||
checked = {(check_radio == 'pickup_send') ? true : false}
|
||||
disabled = {children_list.length == 0 ? true:false}
|
||||
|
|
@ -359,15 +359,15 @@ const ParentMeetingAdd = () => {
|
|||
<span className="lbl padding-16">選んで送信</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
<div className={`checkbox-wrap edit-bg d-none ${(check_radio == "pickup_send") && 'd-block'}`}>
|
||||
{
|
||||
children_list.length > 0 ?
|
||||
children_list?.map((item, k)=>
|
||||
<div className="checkbox" key={k}>
|
||||
<label htmlFor={`user_name${k}`}>
|
||||
<input className="boolean optional"
|
||||
type="checkbox"
|
||||
<input className="boolean optional"
|
||||
type="checkbox"
|
||||
id={`user_name${k}`}
|
||||
checked = {item.checked}
|
||||
onChange={e=>handleCheck(e, k)}/>
|
||||
|
|
@ -380,18 +380,20 @@ const ParentMeetingAdd = () => {
|
|||
: <p className="text-center">子はありません。</p>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div className="edit-set edit-set-mt15">
|
||||
<p>PDFの容量/画像の容量が大きいと送信までに5分ほどかかる恐れがあります。容量を圧縮してからアップロードをお勧めします。</p>
|
||||
</div>
|
||||
<UploadingProgress show={submit}/>
|
||||
|
||||
<LoadingButton
|
||||
<LoadingButton
|
||||
type="submit" fullWidth
|
||||
loading={submit}
|
||||
className="btn-edit btn-default btn-h75 bg-yellow rounded-15">
|
||||
<span className={`ft-18 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>ミーティングを登録</span>
|
||||
</LoadingButton>
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
}
|
||||
|
|
@ -399,8 +401,8 @@ const ParentMeetingAdd = () => {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ParentMeetingAdd;
|
||||
export default ParentMeetingAdd;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ services:
|
|||
app:
|
||||
build: ./infra/php
|
||||
volumes:
|
||||
- ./infra/php/php.ini:/usr/local/etc/php/php.ini
|
||||
- ./backend:/work
|
||||
|
||||
web:
|
||||
|
|
|
|||
バイナリファイルは表示されません。
|
|
@ -27,6 +27,9 @@ server {
|
|||
charset utf-8;
|
||||
client_max_body_size 0;
|
||||
|
||||
# アップロードの許容制限アップ
|
||||
fastcgi_read_timeout 99999;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ server {
|
|||
charset utf-8;
|
||||
client_max_body_size 0;
|
||||
|
||||
# アップロードの許容制限アップ
|
||||
fastcgi_read_timeout 99999;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
zend.exception_ignore_args = off
|
||||
expose_php = on
|
||||
max_execution_time = 30
|
||||
max_execution_time=9999999
|
||||
max_input_vars = 1000
|
||||
upload_max_filesize = 64M
|
||||
post_max_size = 128M
|
||||
memory_limit = 256M
|
||||
upload_max_filesize = -1
|
||||
post_max_size = -1
|
||||
memory_limit = -1
|
||||
error_reporting = E_ALL
|
||||
display_errors = on
|
||||
display_startup_errors = on
|
||||
|
|
|
|||
新しいイシューから参照