suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

Merge pull request #25 from nakazawakan/frontend 

bugfixed in IconButton
このコミットが含まれているのは:
chankan77 2021-10-06 11:39:21 +09:00 committed by GitHub
親 4902a53b5b ded94b2432
コミット b316365e82
この署名に対応する既知のキーがデータベースに存在しません
GPGキーID: 4AEE18F83AFDEB23
9個のファイルの変更、319行の追加、6270行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

369
backend/package-lock.json generated
ファイルの表示

@ -15,7 +15,6 @@
"@material-ui/lab": "^5.0.0-alpha.40",
"@material-ui/styles": "^5.0.0-beta.1",
"@material-ui/utils": "^5.0.0-beta.0",
"@mui/icons-material": "^5.0.1",
"@testing-library/jest-dom": "^5.14.1",
"apexcharts": "^3.27.3",
"change-case": "^4.1.2",
@ -3111,249 +3110,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
"node_modules/@mui/core": {
"version": "5.0.0-alpha.48",
"resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.48.tgz",
"integrity": "sha512-H/QQwKsr2EqPAnP35DGDpWihk5BOFYGhO52rIHb3XKOfoUjDCrCHBy2kvr3dLWJDmJXr/QzYj3AX10n5XzlaMg==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@emotion/is-prop-valid": "^1.1.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
},
"engines": {
"node": ">=12.0.0"
},
"peerDependencies": {
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/core/node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
},
"node_modules/@mui/icons-material": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.1.tgz",
"integrity": "sha512-AZehR/Uvi9VodsNPk9ae1lENKrf1evqx9suiP6VIqu7NxjZOlw/m/yA2gRAMmLEmIGr7EChfi/wcXuq6BpM9vw==",
"dependencies": {
"@babel/runtime": "^7.15.4"
},
"engines": {
"node": ">=12.0.0"
},
"peerDependencies": {
"@mui/material": "^5.0.0-rc.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/material": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.1.tgz",
"integrity": "sha512-+/JJzRcORUf5MiZnzuqsPFRgxm3/0CUi1wE97ZQ2y7r+EnDVsjJLcjAH9Q9GY3k9zkPIpYb9Hig/+HT6AGZRnQ==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@mui/core": "5.0.0-alpha.48",
"@mui/system": "^5.0.1",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"@popperjs/core": "^2.4.4",
"@types/react-transition-group": "^4.4.3",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"hoist-non-react-statics": "^3.3.2",
"prop-types": "^15.7.2",
"react-is": "^17.0.2",
"react-transition-group": "^4.4.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"peerDependenciesMeta": {
"@emotion/react": {
"optional": true
},
"@emotion/styled": {
"optional": true
},
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/material/node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
},
"node_modules/@mui/private-theming": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.0.1.tgz",
"integrity": "sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@mui/utils": "^5.0.1",
"prop-types": "^15.7.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/styled-engine": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz",
"integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@emotion/cache": "^11.4.0",
"prop-types": "^15.7.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"react": "^17.0.2"
},
"peerDependenciesMeta": {
"@emotion/react": {
"optional": true
},
"@emotion/styled": {
"optional": true
}
}
},
"node_modules/@mui/system": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.1.tgz",
"integrity": "sha512-pGNKUpjK5hm4apZAUZu7LugemBPoZnNvNNCI2miI/BXxqyx41mL9+iT9p6Qe9uDOh8Z6GUbLIzvOjSTP+ECRZw==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@mui/private-theming": "^5.0.1",
"@mui/styled-engine": "^5.0.1",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"prop-types": "^15.7.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2"
},
"peerDependenciesMeta": {
"@emotion/react": {
"optional": true
},
"@emotion/styled": {
"optional": true
},
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/types": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.0.0.tgz",
"integrity": "sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung==",
"peer": true,
"peerDependencies": {
"@types/react": "*"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@mui/utils": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.0.1.tgz",
"integrity": "sha512-GWO104N+o9KG5fKiTEYnAg7kONKEg3vLN+VROAU0f3it6lFGLCVPcQYex/1gJ4QAy96u6Ez8/Hmmhi1+3cX0tQ==",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.15.4",
"@types/prop-types": "^15.7.4",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
},
"engines": {
"node": ">=12.0.0"
},
"peerDependencies": {
"react": "^17.0.2"
}
},
"node_modules/@mui/utils/node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -28616,131 +28372,6 @@
}
}
},
"@mui/core": {
"version": "5.0.0-alpha.48",
"resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.48.tgz",
"integrity": "sha512-H/QQwKsr2EqPAnP35DGDpWihk5BOFYGhO52rIHb3XKOfoUjDCrCHBy2kvr3dLWJDmJXr/QzYj3AX10n5XzlaMg==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@emotion/is-prop-valid": "^1.1.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
},
"dependencies": {
"react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
}
}
},
"@mui/icons-material": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.1.tgz",
"integrity": "sha512-AZehR/Uvi9VodsNPk9ae1lENKrf1evqx9suiP6VIqu7NxjZOlw/m/yA2gRAMmLEmIGr7EChfi/wcXuq6BpM9vw==",
"requires": {
"@babel/runtime": "^7.15.4"
}
},
"@mui/material": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.1.tgz",
"integrity": "sha512-+/JJzRcORUf5MiZnzuqsPFRgxm3/0CUi1wE97ZQ2y7r+EnDVsjJLcjAH9Q9GY3k9zkPIpYb9Hig/+HT6AGZRnQ==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@mui/core": "5.0.0-alpha.48",
"@mui/system": "^5.0.1",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"@popperjs/core": "^2.4.4",
"@types/react-transition-group": "^4.4.3",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"hoist-non-react-statics": "^3.3.2",
"prop-types": "^15.7.2",
"react-is": "^17.0.2",
"react-transition-group": "^4.4.2"
},
"dependencies": {
"react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
}
}
},
"@mui/private-theming": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.0.1.tgz",
"integrity": "sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@mui/utils": "^5.0.1",
"prop-types": "^15.7.2"
}
},
"@mui/styled-engine": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz",
"integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@emotion/cache": "^11.4.0",
"prop-types": "^15.7.2"
}
},
"@mui/system": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.1.tgz",
"integrity": "sha512-pGNKUpjK5hm4apZAUZu7LugemBPoZnNvNNCI2miI/BXxqyx41mL9+iT9p6Qe9uDOh8Z6GUbLIzvOjSTP+ECRZw==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@mui/private-theming": "^5.0.1",
"@mui/styled-engine": "^5.0.1",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"prop-types": "^15.7.2"
}
},
"@mui/types": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.0.0.tgz",
"integrity": "sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung==",
"peer": true,
"requires": {}
},
"@mui/utils": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.0.1.tgz",
"integrity": "sha512-GWO104N+o9KG5fKiTEYnAg7kONKEg3vLN+VROAU0f3it6lFGLCVPcQYex/1gJ4QAy96u6Ez8/Hmmhi1+3cX0tQ==",
"peer": true,
"requires": {
"@babel/runtime": "^7.15.4",
"@types/prop-types": "^15.7.4",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
},
"dependencies": {
"react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"peer": true
}
}
},
"@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",

1
backend/package.json
ファイルの表示

@ -20,7 +20,6 @@
"@material-ui/lab": "^5.0.0-alpha.40",
"@material-ui/styles": "^5.0.0-beta.1",
"@material-ui/utils": "^5.0.0-beta.0",
"@mui/icons-material": "^5.0.1",
"@testing-library/jest-dom": "^5.14.1",
"apexcharts": "^3.27.3",
"change-case": "^4.1.2",

2
backend/public/css/app.css vendored
ファイルの表示

@ -3780,7 +3780,7 @@ input[type=button].btn-block {
width: 1rem;
height: 1rem;
content: "";
background: 50% / 50% 50% no-repeat;
background: 50%/50% 50% no-repeat;
}
.custom-checkbox .custom-control-label::before {

6202
backend/public/js/app.js vendored
ファイルの表示

ファイル差分が大きすぎるため省略します 差分を読み込み

2
backend/resources/js/child/auth/register/index.jsx
ファイルの表示

@ -4,7 +4,7 @@ import { Button } from '@material-ui/core';
import { LoadingButton } from '@material-ui/lab';
import axios from 'axios';
import IconButton from '@mui/material/IconButton';
import IconButton from "@material-ui/core/IconButton";
const SignUp = () => {

2
backend/resources/js/child/profile/detail.jsx
ファイルの表示

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import ReactDOM from 'react-dom';
import IconButton from '@mui/material/IconButton';
import IconButton from "@material-ui/core/IconButton";
import axios from 'axios';
import Notification from '../../component/notification';

2
backend/resources/js/child/profile/index.jsx
ファイルの表示

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import ReactDOM from 'react-dom';
import IconButton from '@mui/material/IconButton';
import IconButton from "@material-ui/core/IconButton";
import axios from 'axios';
import Notification from '../../component/notification';

7
backend/resources/js/child/search/index.jsx
ファイルの表示

@ -1,11 +1,6 @@
import React, { useEffect, useState } from 'react';
import ReactDOM from 'react-dom';
import { Button } from '@material-ui/core';
import { LoadingButton } from '@material-ui/lab';
import axios from 'axios';
import IconButton from '@mui/material/IconButton';
import PhotoCamera from '@mui/icons-material/PhotoCamera';
import axios from 'axios';
import Notification from '../../component/notification';

2
backend/resources/views/c_account/auth/forgot_password/reset.blade.php
ファイルの表示

@ -1,6 +1,6 @@
@extends('c_account.auth.layout')
@section('title', 'パスワード再登録完了')
@section('title', 'パスワード再登録')
@section('content')
<div id="c-app"></div>