From 5d3b05bb44680ceedbc256b89dd368faf8e04665 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Fri, 28 Jan 2022 00:39:15 -0800 Subject: [PATCH] add login at same time --- backend/public/css/app.css | 4 - backend/public/js/index.js | 4600 ++--------------- backend/resources/js/child/profile/index.jsx | 3 +- .../js/component/alert_state_msg.jsx | 4 + .../js/component/page_change_handler.jsx | 35 - .../resources/js/layout/DashboardLayout.js | 2 - 6 files changed, 463 insertions(+), 4185 deletions(-) delete mode 100644 backend/resources/js/component/page_change_handler.jsx diff --git a/backend/public/css/app.css b/backend/public/css/app.css index dd0bb066..0dea5c6b 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -12897,11 +12897,7 @@ 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; } diff --git a/backend/public/js/index.js b/backend/public/js/index.js index 74494329..adf92bfa 100644 --- a/backend/public/js/index.js +++ b/backend/public/js/index.js @@ -2047,23 +2047,15 @@ var weakMemoize = function weakMemoize(func) { /***/ }), -<<<<<<< HEAD /***/ "./node_modules/@material-ui/core/ButtonBase/ButtonBase.js": /*!*****************************************************************!*\ !*** ./node_modules/@material-ui/core/ButtonBase/ButtonBase.js ***! \*****************************************************************/ -======= -/***/ "./node_modules/@material-ui/core/Button/Button.js": -/*!*********************************************************!*\ - !*** ./node_modules/@material-ui/core/Button/Button.js ***! - \*********************************************************/ ->>>>>>> 979b70820792a84b53d44fcdd70644d3690ce8d3 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export */ __webpack_require__.d(__webpack_exports__, { -<<<<<<< HEAD /* harmony export */ "ButtonBaseRoot": () => (/* binding */ ButtonBaseRoot), /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); @@ -2089,27 +2081,8 @@ __webpack_require__.r(__webpack_exports__); const _excluded = ["action", "centerRipple", "children", "className", "component", "disabled", "disableRipple", "disableTouchRipple", "focusRipple", "focusVisibleClassName", "LinkComponent", "onBlur", "onClick", "onContextMenu", "onDragLeave", "onFocus", "onFocusVisible", "onKeyDown", "onKeyUp", "onMouseDown", "onMouseLeave", "onMouseUp", "onTouchEnd", "onTouchMove", "onTouchStart", "tabIndex", "TouchRippleProps", "type"]; -======= -/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) -/* harmony export */ }); -/* harmony import */ var _babel_runtime_helpers_esm_objectWithoutPropertiesLoose__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/objectWithoutPropertiesLoose */ "./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js"); -/* harmony import */ var _babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/esm/extends */ "./node_modules/@babel/runtime/helpers/esm/extends.js"); -/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); -/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! prop-types */ "./node_modules/prop-types/index.js"); -/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_12__); -/* harmony import */ var clsx__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! clsx */ "./node_modules/clsx/dist/clsx.m.js"); -/* harmony import */ var _material_ui_unstyled__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/unstyled */ "./node_modules/@material-ui/unstyled/composeClasses/composeClasses.js"); -/* harmony import */ var _material_ui_system__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/system */ "./node_modules/@material-ui/system/esm/colorManipulator.js"); -/* harmony import */ var _styles_styled__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../styles/styled */ "./node_modules/@material-ui/core/styles/styled.js"); -/* harmony import */ var _styles_useThemeProps__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../styles/useThemeProps */ "./node_modules/@material-ui/core/styles/useThemeProps.js"); -/* harmony import */ var _ButtonBase__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../ButtonBase */ "./node_modules/@material-ui/core/ButtonBase/ButtonBase.js"); -/* harmony import */ var _utils_capitalize__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/capitalize */ "./node_modules/@material-ui/core/utils/capitalize.js"); -/* harmony import */ var _buttonClasses__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./buttonClasses */ "./node_modules/@material-ui/core/Button/buttonClasses.js"); -/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); -const _excluded = ["children", "color", "component", "disabled", "disableElevation", "disableFocusRipple", "endIcon", "focusVisibleClassName", "fullWidth", "size", "startIcon", "type", "variant"]; ->>>>>>> 979b70820792a84b53d44fcdd70644d3690ce8d3 @@ -2121,1432 +2094,6 @@ const _excluded = ["children", "color", "component", "disabled", "disableElevati - - -const useUtilityClasses = styleProps => { - const { -<<<<<<< HEAD - disabled, - focusVisible, - focusVisibleClassName, - classes - } = styleProps; - const slots = { - root: ['root', disabled && 'disabled', focusVisible && 'focusVisible'] - }; - const composedClasses = (0,_material_ui_unstyled__WEBPACK_IMPORTED_MODULE_5__["default"])(slots, _buttonBaseClasses__WEBPACK_IMPORTED_MODULE_6__.getButtonBaseUtilityClass, classes); - - if (focusVisible && focusVisibleClassName) { - composedClasses.root += ` ${focusVisibleClassName}`; - } - - return composedClasses; -}; - -const ButtonBaseRoot = (0,_styles_styled__WEBPACK_IMPORTED_MODULE_7__["default"])('button', { - name: 'MuiButtonBase', - slot: 'Root', - overridesResolver: (props, styles) => styles.root -})({ - display: 'inline-flex', - alignItems: 'center', - justifyContent: 'center', - position: 'relative', - boxSizing: 'border-box', - WebkitTapHighlightColor: 'transparent', - backgroundColor: 'transparent', - // Reset default value - // We disable the focus ring for mouse, touch and keyboard users. - outline: 0, - border: 0, - margin: 0, - // Remove the margin in Safari - borderRadius: 0, - padding: 0, - // Remove the padding in Firefox - cursor: 'pointer', - userSelect: 'none', - verticalAlign: 'middle', - MozAppearance: 'none', - // Reset - WebkitAppearance: 'none', - // Reset - textDecoration: 'none', - // So we take precedent over the style of a native element. - color: 'inherit', - '&::-moz-focus-inner': { - borderStyle: 'none' // Remove Firefox dotted outline. - - }, - [`&.${_buttonBaseClasses__WEBPACK_IMPORTED_MODULE_6__["default"].disabled}`]: { - pointerEvents: 'none', - // Disable link interactions - cursor: 'default' - }, - '@media print': { - colorAdjust: 'exact' - } -}); -/** - * `ButtonBase` contains as few styles as possible. - * It aims to be a simple building block for creating a button. - * It contains a load of style reset and some focus/ripple logic. - */ - -const ButtonBase = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__.forwardRef(function ButtonBase(inProps, ref) { - const props = (0,_styles_useThemeProps__WEBPACK_IMPORTED_MODULE_8__["default"])({ - props: inProps, - name: 'MuiButtonBase' - }); - - const { - action, - centerRipple = false, - children, - className, - component = 'button', - disabled = false, - disableRipple = false, - disableTouchRipple = false, - focusRipple = false, - LinkComponent = 'a', - onBlur, - onClick, - onContextMenu, - onDragLeave, - onFocus, - onFocusVisible, - onKeyDown, - onKeyUp, - onMouseDown, - onMouseLeave, - onMouseUp, - onTouchEnd, - onTouchMove, - onTouchStart, - tabIndex = 0, - TouchRippleProps, - type - } = props, - other = (0,_babel_runtime_helpers_esm_objectWithoutPropertiesLoose__WEBPACK_IMPORTED_MODULE_1__["default"])(props, _excluded); - - const buttonRef = react__WEBPACK_IMPORTED_MODULE_2__.useRef(null); - const rippleRef = react__WEBPACK_IMPORTED_MODULE_2__.useRef(null); - const { - isFocusVisibleRef, - onFocus: handleFocusVisible, - onBlur: handleBlurVisible, - ref: focusVisibleRef - } = (0,_utils_useIsFocusVisible__WEBPACK_IMPORTED_MODULE_9__["default"])(); - const [focusVisible, setFocusVisible] = react__WEBPACK_IMPORTED_MODULE_2__.useState(false); - - if (disabled && focusVisible) { - setFocusVisible(false); - } - - react__WEBPACK_IMPORTED_MODULE_2__.useEffect(() => { - isFocusVisibleRef.current = focusVisible; - }, [focusVisible, isFocusVisibleRef]); - react__WEBPACK_IMPORTED_MODULE_2__.useImperativeHandle(action, () => ({ - focusVisible: () => { - setFocusVisible(true); - buttonRef.current.focus(); - } - }), []); - react__WEBPACK_IMPORTED_MODULE_2__.useEffect(() => { - if (focusVisible && focusRipple && !disableRipple) { - rippleRef.current.pulsate(); - } - }, [disableRipple, focusRipple, focusVisible]); - - function useRippleHandler(rippleAction, eventCallback, skipRippleAction = disableTouchRipple) { - return (0,_utils_useEventCallback__WEBPACK_IMPORTED_MODULE_10__["default"])(event => { - if (eventCallback) { - eventCallback(event); - } - - const ignore = skipRippleAction; - - if (!ignore && rippleRef.current) { - rippleRef.current[rippleAction](event); - } - - return true; - }); - } - - const handleMouseDown = useRippleHandler('start', onMouseDown); - const handleContextMenu = useRippleHandler('stop', onContextMenu); - const handleDragLeave = useRippleHandler('stop', onDragLeave); - const handleMouseUp = useRippleHandler('stop', onMouseUp); - const handleMouseLeave = useRippleHandler('stop', event => { - if (focusVisible) { - event.preventDefault(); - } - - if (onMouseLeave) { - onMouseLeave(event); - } - }); - const handleTouchStart = useRippleHandler('start', onTouchStart); - const handleTouchEnd = useRippleHandler('stop', onTouchEnd); - const handleTouchMove = useRippleHandler('stop', onTouchMove); - const handleBlur = useRippleHandler('stop', event => { - handleBlurVisible(event); - - if (isFocusVisibleRef.current === false) { - setFocusVisible(false); - } - - if (onBlur) { - onBlur(event); - } - }, false); - const handleFocus = (0,_utils_useEventCallback__WEBPACK_IMPORTED_MODULE_10__["default"])(event => { - // Fix for https://github.com/facebook/react/issues/7769 - if (!buttonRef.current) { - buttonRef.current = event.currentTarget; - } - - handleFocusVisible(event); - - if (isFocusVisibleRef.current === true) { - setFocusVisible(true); - - if (onFocusVisible) { - onFocusVisible(event); - } - } - - if (onFocus) { - onFocus(event); - } - }); - - const isNonNativeButton = () => { - const button = buttonRef.current; - return component && component !== 'button' && !(button.tagName === 'A' && button.href); - }; - /** - * IE11 shim for https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat - */ - - - const keydownRef = react__WEBPACK_IMPORTED_MODULE_2__.useRef(false); - const handleKeyDown = (0,_utils_useEventCallback__WEBPACK_IMPORTED_MODULE_10__["default"])(event => { - // Check if key is already down to avoid repeats being counted as multiple activations - if (focusRipple && !keydownRef.current && focusVisible && rippleRef.current && event.key === ' ') { - keydownRef.current = true; - rippleRef.current.stop(event, () => { - rippleRef.current.start(event); - }); - } - - if (event.target === event.currentTarget && isNonNativeButton() && event.key === ' ') { - event.preventDefault(); - } - - if (onKeyDown) { - onKeyDown(event); - } // Keyboard accessibility for non interactive elements - - - if (event.target === event.currentTarget && isNonNativeButton() && event.key === 'Enter' && !disabled) { - event.preventDefault(); - - if (onClick) { - onClick(event); - } - } - }); - const handleKeyUp = (0,_utils_useEventCallback__WEBPACK_IMPORTED_MODULE_10__["default"])(event => { - // calling preventDefault in keyUp on a