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

Merge branch 'frontend' of https://github.com/nakazawakan/kikikanri into c_account

ソースを参照
このコミットが含まれているのは:
dragon1211 2021-10-26 10:16:30 +09:00
コミット e2d3507d67
11個のファイルの変更、101行の追加、93行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -28343,19 +28343,19 @@ var ChildDetail = function ChildDetail(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, {
onClick: closeModal,
size: "large",
style: {
fontSize: '20px'
},
children: "\u3044\u3044\u3048"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-20 text-black",
children: "\u3044\u3044\u3048"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, {
variant: "text",
onClick: handleAccept,
loading: submit,
size: "large",
style: {
fontSize: '20px'
},
children: "\u306F\u3044"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-20 ".concat(!submit && 'text-black'),
children: "\u306F\u3044"
})
})]
})]
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
@ -28704,9 +28704,9 @@ var ChildEdit = function ChildEdit(props) {
type: "submit",
fullWidth: true,
loading: submit,
className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60",
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-16",
className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0"
})
})
@ -29136,9 +29136,9 @@ var ChildPasswordEdit = function ChildPasswordEdit(props) {
type: "submit",
fullWidth: true,
loading: submit,
className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60",
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-16",
className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0"
})
})
@ -29351,17 +29351,17 @@ var AdminLogin = function AdminLogin() {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.password
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, {
type: "submit",
loading: submit,
fullWidth: true,
className: "rounded-15 p-4 mt-5 input-h60 bg-yellow",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h4", {
className: "mb-0 font-weight-bold",
style: {
fontSize: '18px'
},
children: "\u30ED\u30B0\u30A4\u30F3"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "mt-5",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, {
type: "submit",
loading: submit,
fullWidth: true,
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30ED\u30B0\u30A4\u30F3"
})
})
})]
})
@ -29844,19 +29844,19 @@ var MeetingDetail = function MeetingDetail(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, {
onClick: closeModal,
size: "large",
style: {
fontSize: '20px'
},
children: "\u3044\u3044\u3048"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("span", {
className: "ft-20 text-black",
children: "\u3044\u3044\u3048"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, {
variant: "text",
onClick: handleAccept,
loading: submit,
size: "large",
style: {
fontSize: '20px'
},
children: "\u306F\u3044"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("span", {
className: "ft-20 ".concat(!submit && 'text-black'),
children: "\u306F\u3044"
})
})]
})]
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
@ -30331,14 +30331,13 @@ var MeetingEdit = function MeetingEdit(props) {
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_7__.default, {
type: "submit",
fullWidth: true,
loading: submit,
className: "btn-edit btn-default btn-h70 btn-r14 btn-yellow rounded-20",
style: {
fontSize: '18px',
fontWeight: 'bold',
backgroundColor: '#ffed4a'
},
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3092\u66F4\u65B0"
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-20 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3092\u66F4\u65B0"
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "fail",
hide: function hide() {
@ -31108,19 +31107,19 @@ var ParentDetail = function ParentDetail(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, {
onClick: closeModal,
size: "large",
style: {
fontSize: '20px'
},
children: "\u3044\u3044\u3048"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-20 text-black",
children: "\u3044\u3044\u3048"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, {
variant: "text",
onClick: handleAccept,
loading: submit,
size: "large",
style: {
fontSize: '20px'
},
children: "\u306F\u3044"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-20 ".concat(!submit && 'text-black'),
children: "\u306F\u3044"
})
})]
})]
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
@ -31413,10 +31412,10 @@ var ParentEdit = function ParentEdit(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, {
type: "submit",
fullWidth: true,
className: "p-3 rounded-15 ft-15 font-weight-bold bg-yellow input-h60",
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
loading: submit,
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-16",
className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0"
})
})
@ -31846,9 +31845,9 @@ var ParentPasswordEdit = function ParentPasswordEdit(props) {
type: "submit",
fullWidth: true,
loading: submit,
className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60",
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-16",
className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0"
})
})
@ -32024,10 +32023,10 @@ var ParentRegister = function ParentRegister() {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, {
type: "submit",
fullWidth: true,
className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60",
className: "btn-edit btn-default btn-h60 bg-yellow rounded-15",
loading: submit,
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "ft-20",
className: "ft-20 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u89AA\u8FFD\u52A0"
})
})

10
backend/resources/js/admin/child/detail.jsx
ファイルの表示

@ -229,15 +229,17 @@ const ChildDetail = (props) => {
<DialogActions style={{justifyContent:'space-evenly', padding:'0 20px 20px 20px'}}>
<Button
onClick={closeModal}
size="large"
style={{fontSize:'20px'}}>いいえ</Button>
size="large">
<span className="ft-20 text-black">いいえ</span>
</Button>
<LoadingButton
variant="text"
onClick={handleAccept}
loading={submit}
size="large"
style={{fontSize:'20px'}}>はい</LoadingButton>
size="large">
<span className={`ft-20 ${!submit && 'text-black'}`}>はい</span>
</LoadingButton>
</DialogActions>
</Dialog>
{

4
backend/resources/js/admin/child/edit.jsx
ファイルの表示

@ -183,8 +183,8 @@ const ChildEdit = (props) => {
<div className="mt-5">
<LoadingButton type="submit" fullWidth
loading={submit}
className="p-3 rounded-15 font-weight-bold bg-yellow input-h60">
<span className="ft-16">プロフィールを更新</span>
className="btn-edit btn-default btn-h60 bg-yellow rounded-15">
<span className={`ft-18 font-weight-bold ${!submit && 'text-black'}`}>プロフィールを更新</span>
</LoadingButton>
</div>
{

4
backend/resources/js/admin/child/password_edit.jsx
ファイルの表示

@ -99,8 +99,8 @@ const ChildPasswordEdit = (props) => {
<div className="mt-5">
<LoadingButton type="submit" fullWidth
loading = {submit}
className="p-3 rounded-15 font-weight-bold bg-yellow input-h60">
<span className="ft-16">パスワードを更新</span>
className="btn-edit btn-default btn-h60 bg-yellow rounded-15">
<span className={`ft-18 font-weight-bold ${!submit && 'text-black'}`}>パスワードを更新</span>
</LoadingButton>
</div>
{

20
backend/resources/js/admin/login/index.jsx
ファイルの表示

@ -78,16 +78,18 @@ const AdminLogin = () => {
</span>
}
</div>
<div className="mt-5">
<LoadingButton type="submit"
loading={submit}
fullWidth
className="btn-edit btn-default btn-h60 bg-yellow rounded-15">
<span className={`ft-18 font-weight-bold ${!submit && 'text-black'}`}>
ログイン
</span>
</LoadingButton>
</div>
<LoadingButton type="submit"
loading={submit}
fullWidth
className="rounded-15 p-4 mt-5 input-h60 bg-yellow"
>
<h4 className="mb-0 font-weight-bold" style={{fontSize:'18px'}}>
ログイン
</h4>
</LoadingButton>
</form>
</div>
</div>

24
backend/resources/js/admin/meeting/detail.jsx
ファイルの表示

@ -228,17 +228,19 @@ const MeetingDetail = (props) => {
</DialogContentText>
</DialogContent>
<DialogActions style={{justifyContent:'space-evenly', padding:'0 20px 20px 20px'}}>
<Button
onClick={closeModal}
size="large"
style={{fontSize:'20px'}}>いいえ</Button>
<LoadingButton
variant="text"
onClick={handleAccept}
loading={submit}
size="large"
style={{fontSize:'20px'}}>はい</LoadingButton>
<Button
onClick={closeModal}
size="large">
<span className="ft-20 text-black">いいえ</span>
</Button>
<LoadingButton
variant="text"
onClick={handleAccept}
loading={submit}
size="large">
<span className={`ft-20 ${!submit && 'text-black'}`}>はい</span>
</LoadingButton>
</DialogActions>
</Dialog>
{

7
backend/resources/js/admin/meeting/edit.jsx
ファイルの表示

@ -233,10 +233,11 @@ const MeetingEdit = (props) => {
</div>
<LoadingButton
type="submit"
type="submit" fullWidth
loading={submit}
className="btn-edit btn-default btn-h70 btn-r14 btn-yellow rounded-20"
style={{fontSize:'18px',fontWeight:'bold', backgroundColor:'#ffed4a'}}>ミーティングを更新</LoadingButton>
className="btn-edit btn-default btn-h60 bg-yellow rounded-15">
<span className={`ft-20 font-weight-bold ${!submit && 'text-black'}`}>ミーティングを更新</span>
</LoadingButton>
{
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}

10
backend/resources/js/admin/parent/detail.jsx
ファイルの表示

@ -217,15 +217,17 @@ const ParentDetail = (props) => {
<DialogActions style={{justifyContent:'space-evenly', padding:'0 20px 20px 20px'}}>
<Button
onClick={closeModal}
size="large"
style={{fontSize:'20px'}}>いいえ</Button>
size="large">
<span className="ft-20 text-black">いいえ</span>
</Button>
<LoadingButton
variant="text"
onClick={handleAccept}
loading={submit}
size="large"
style={{fontSize:'20px'}}>はい</LoadingButton>
size="large">
<span className={`ft-20 ${!submit && 'text-black'}`}>はい</span>
</LoadingButton>
</DialogActions>
</Dialog>
{

4
backend/resources/js/admin/parent/edit.jsx
ファイルの表示

@ -152,9 +152,9 @@ const ParentEdit = (props) => {
<div className="mt-5">
<LoadingButton type="submit" fullWidth
className="p-3 rounded-15 ft-15 font-weight-bold bg-yellow input-h60"
className="btn-edit btn-default btn-h60 bg-yellow rounded-15"
loading={submit}>
<span className="ft-16">プロフィールを更新</span>
<span className={`ft-18 font-weight-bold ${!submit && 'text-black'}`}>プロフィールを更新</span>
</LoadingButton>
</div>
{

4
backend/resources/js/admin/parent/password_edit.jsx
ファイルの表示

@ -99,8 +99,8 @@ const ParentPasswordEdit = (props) => {
<div className="mt-5">
<LoadingButton type="submit" fullWidth
loading = {submit}
className="p-3 rounded-15 font-weight-bold bg-yellow input-h60">
<span className="ft-16">パスワードを更新</span>
className="btn-edit btn-default btn-h60 bg-yellow rounded-15">
<span className={`ft-18 font-weight-bold ${!submit && 'text-black'}`}>パスワードを更新</span>
</LoadingButton>
</div>
{

4
backend/resources/js/admin/parent/register.jsx
ファイルの表示

@ -68,9 +68,9 @@ const ParentRegister = () => {
<div className="mt-5">
<LoadingButton type="submit" fullWidth
className="p-3 rounded-15 font-weight-bold bg-yellow input-h60"
className="btn-edit btn-default btn-h60 bg-yellow rounded-15"
loading={submit}>
<span className="ft-20">親追加</span>
<span className={`ft-20 font-weight-bold ${!submit && 'text-black'}`}>親追加</span>
</LoadingButton>
</div>
{