From 26660c85554af44e1d6aa246105fc26d10b064e1 Mon Sep 17 00:00:00 2001 From: Xziy Date: Sun, 2 Jul 2023 21:53:24 +0300 Subject: [PATCH] adapt to ci --- client/.env | 2 +- client/package.json | 2 +- client/src/components/Login/Login.jsx | 6 ++---- server/pm2-watch.config.js | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) create mode 120000 server/pm2-watch.config.js diff --git a/client/.env b/client/.env index 7b82308..89fad61 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -REACT_APP_VERSION=1.12.0 +REACT_APP_VERSION=1.12.0 \ No newline at end of file diff --git a/client/package.json b/client/package.json index d1dd8d6..f3eac91 100755 --- a/client/package.json +++ b/client/package.json @@ -5,7 +5,7 @@ "build": "react-app-rewired build", "eject": "react-scripts eject", "lint": "eslint --ext js,jsx src config-overrides.js", - "start": "react-app-rewired start", + "start": "DISABLE_ESLINT_PLUGIN=trues react-app-rewired start", "test": "react-app-rewired test" }, "browserslist": { diff --git a/client/src/components/Login/Login.jsx b/client/src/components/Login/Login.jsx index 7b49072..a7e67a1 100755 --- a/client/src/components/Login/Login.jsx +++ b/client/src/components/Login/Login.jsx @@ -135,9 +135,7 @@ const Login = React.memo( onDismiss={onMessageDismiss} /> )} -

42pub TeamBoard

-

Please use https://board.42.pub/enter

- {/*
+
{t('common.emailOrUsername')}
- */} +
diff --git a/server/pm2-watch.config.js b/server/pm2-watch.config.js new file mode 120000 index 0000000..d9f6a05 --- /dev/null +++ b/server/pm2-watch.config.js @@ -0,0 +1 @@ +./.ci/dev/pm2-watch.config.js \ No newline at end of file