From caabdd1e21b647a322647f3d93197c872922299c Mon Sep 17 00:00:00 2001 From: ckt1031 <65409152+ckt1031@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:14:40 +0800 Subject: [PATCH] fix: run prettier --- web/README.md | 2 +- web/package-lock.json | 12 +- web/package.json | 2 +- web/public/index.html | 2 +- web/src/components/ChannelsTable.js | 103 ++++++-- web/src/components/Footer.js | 5 +- web/src/components/Header.js | 56 +++-- web/src/components/LoginForm.js | 71 +++--- web/src/components/LogsTable.js | 198 +++++++++++---- web/src/components/OperationSetting.js | 77 +++--- web/src/components/OtherSetting.js | 32 ++- web/src/components/PasswordResetConfirm.js | 9 +- web/src/components/PasswordResetForm.js | 2 +- web/src/components/PersonalSetting.js | 84 ++++--- web/src/components/PrivateRoute.js | 3 +- web/src/components/RedemptionsTable.js | 87 +++++-- web/src/components/RegisterForm.js | 4 +- web/src/components/SystemSetting.js | 18 +- web/src/components/TokensTable.js | 87 +++++-- web/src/components/UsersTable.js | 51 +++- web/src/constants/channel.constants.js | 4 +- web/src/constants/index.js | 2 +- web/src/constants/toast.constants.js | 2 +- web/src/constants/user.constants.js | 28 +-- web/src/context/Status/index.js | 2 +- web/src/context/User/index.js | 18 +- web/src/context/User/reducer.js | 8 +- web/src/helpers/api.js | 2 +- web/src/helpers/auth-header.js | 16 +- web/src/helpers/history.js | 2 +- web/src/helpers/index.js | 2 +- web/src/helpers/render.js | 24 +- web/src/helpers/utils.js | 16 +- web/src/index.css | 32 +-- web/src/index.js | 2 +- web/src/pages/About/index.js | 26 +- web/src/pages/Channel/EditChannel.js | 276 +++++++++++++-------- web/src/pages/Chat/index.js | 1 - web/src/pages/Home/index.js | 24 +- web/src/pages/NotFound/index.js | 14 +- web/src/pages/Redemption/EditRedemption.js | 23 +- web/src/pages/Redemption/index.js | 2 +- web/src/pages/Setting/index.js | 10 +- web/src/pages/Token/EditToken.js | 144 ++++++++--- web/src/pages/Token/index.js | 2 +- web/src/pages/TopUp/index.js | 22 +- web/src/pages/User/AddUser.js | 22 +- web/src/pages/User/EditUser.js | 36 ++- web/src/pages/User/index.js | 2 +- 49 files changed, 1087 insertions(+), 582 deletions(-) diff --git a/web/README.md b/web/README.md index 1b1031a3..07a1fd2a 100644 --- a/web/README.md +++ b/web/README.md @@ -18,4 +18,4 @@ Before you start editing, make sure your `Actions on Save` options have `Optimiz ## Reference 1. https://github.com/OIerDb-ng/OIerDb -2. https://github.com/cornflourblue/react-hooks-redux-registration-login-example \ No newline at end of file +2. https://github.com/cornflourblue/react-hooks-redux-registration-login-example diff --git a/web/package-lock.json b/web/package-lock.json index 9a213bec..54ebd28c 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "prettier": "^2.7.1", + "prettier": "3.0.0", "react-scripts": "^5.0.1" } }, @@ -14575,15 +14575,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz", + "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" diff --git a/web/package.json b/web/package.json index 19e76f63..1c9b190c 100644 --- a/web/package.json +++ b/web/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "prettier": "^2.7.1", + "prettier": "3.0.0", "react-scripts": "^5.0.1" }, "prettier": { diff --git a/web/public/index.html b/web/public/index.html index b8e324d2..113c8607 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -1,4 +1,4 @@ - + diff --git a/web/src/components/ChannelsTable.js b/web/src/components/ChannelsTable.js index 4ea6965d..90c00692 100644 --- a/web/src/components/ChannelsTable.js +++ b/web/src/components/ChannelsTable.js @@ -1,30 +1,43 @@ import React, { useEffect, useState } from 'react'; -import { Button, Form, Label, Pagination, Popup, Table } from 'semantic-ui-react'; +import { + Button, + Form, + Label, + Pagination, + Popup, + Table, +} from 'semantic-ui-react'; import { Link } from 'react-router-dom'; -import { API, showError, showInfo, showSuccess, timestamp2string } from '../helpers'; +import { + API, + showError, + showInfo, + showSuccess, + timestamp2string, +} from '../helpers'; import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants'; import { renderGroup, renderNumber } from '../helpers/render'; function renderTimestamp(timestamp) { - return ( - <> - {timestamp2string(timestamp)} - - ); + return <>{timestamp2string(timestamp)}; } let type2label = undefined; function renderType(type) { if (!type2label) { - type2label = new Map; + type2label = new Map(); for (let i = 0; i < CHANNEL_OPTIONS.length; i++) { type2label[CHANNEL_OPTIONS[i].value] = CHANNEL_OPTIONS[i]; } type2label[0] = { value: 0, text: '未知类型', color: 'grey' }; } - return ; + return ( + + ); } function renderBalance(type, balance) { @@ -132,7 +145,11 @@ const ChannelsTable = () => { const renderStatus = (status) => { switch (status) { case 1: - return ; + return ( + + ); case 2: return (