From e1b01624a67f02e055401b4897876338133bd75b Mon Sep 17 00:00:00 2001 From: uo287741 Date: Wed, 28 Feb 2024 20:52:49 +0100 Subject: [PATCH] Google Login functionality halted temporaly --- webapp/package-lock.json | 19 ------------------- webapp/package.json | 1 - webapp/src/App.tsx | 14 +++++++------- webapp/src/components/GLoginButton.tsx | 4 ++-- webapp/src/components/GoogleLoginMenu.tsx | 4 ++-- webapp/src/components/Init.tsx | 6 +++--- 6 files changed, 14 insertions(+), 34 deletions(-) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index d3b21a9..ab9e20c 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -19,7 +19,6 @@ "i18next": "^23.10.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-google-login": "^5.2.2", "react-i18next": "^14.0.5", "react-scripts": "^5.0.1", "web-vitals": "^3.5.1" @@ -11634,7 +11633,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==", - "dev": true, "optional": true }, "node_modules/gzip-size": { @@ -18985,7 +18983,6 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz", "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==", - "dev": true, "optional": true, "dependencies": { "growly": "^1.3.0", @@ -21532,20 +21529,6 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, - "node_modules/react-google-login": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/react-google-login/-/react-google-login-5.2.2.tgz", - "integrity": "sha512-JUngfvaSMcOuV0lFff7+SzJ2qviuNMQdqlsDJkUM145xkGPVIfqWXq9Ui+2Dr6jdJWH5KYdynz9+4CzKjI5u6g==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dependencies": { - "@types/react": "*", - "prop-types": "^15.6.0" - }, - "peerDependencies": { - "react": "^16 || ^17", - "react-dom": "^16 || ^17" - } - }, "node_modules/react-i18next": { "version": "11.18.6", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz", @@ -24196,7 +24179,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true, "optional": true }, "node_modules/side-channel": { @@ -25809,7 +25791,6 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/webapp/package.json b/webapp/package.json index 4287909..9b30e95 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -14,7 +14,6 @@ "i18next": "^23.10.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-google-login": "^5.2.2", "react-i18next": "^14.0.5", "react-scripts": "^5.0.1", "web-vitals": "^3.5.1" diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index dfc5299..6b6eecf 100644 --- a/webapp/src/App.tsx +++ b/webapp/src/App.tsx @@ -7,11 +7,11 @@ import Container from '@mui/material/Container'; import Typography from '@mui/material/Typography'; import Init from './components/Init'; import './i18n'; -import GoogleLoginMenu from './components/GoogleLoginMenu'; +/* import GoogleLoginMenu from './components/GoogleLoginMenu'; */ function App() { const { t } = useTranslation() - const [showGoogleLM, setShowGoogleLM] = useState(false); + // const [showGoogleLM, setShowGoogleLM] = useState(false); const [showLogin, setShowLogin] = useState(true); const [showInit, setShowInit] = useState(true); @@ -24,10 +24,10 @@ function App() { state? handleToggleView(state) : handleToggleView(false) }; - const handleGoogleViewChange = () => { + /* const handleGoogleViewChange = () => { setShowGoogleLM(!showGoogleLM); setShowInit(!showInit); - } + } */ return ( @@ -37,9 +37,9 @@ function App() { {showInit ? - - : showGoogleLM ? - + + /* : showGoogleLM ? + */ : showLogin ? : } diff --git a/webapp/src/components/GLoginButton.tsx b/webapp/src/components/GLoginButton.tsx index 4872e23..3242919 100644 --- a/webapp/src/components/GLoginButton.tsx +++ b/webapp/src/components/GLoginButton.tsx @@ -1,4 +1,4 @@ -import GoogleLogin from "react-google-login"; +/* import GoogleLogin from "react-google-login"; import { useTranslation } from 'react-i18next'; @@ -47,4 +47,4 @@ const GLoginButton = () => { ) } -export default GLoginButton; \ No newline at end of file +export default GLoginButton; */ \ No newline at end of file diff --git a/webapp/src/components/GoogleLoginMenu.tsx b/webapp/src/components/GoogleLoginMenu.tsx index 51bc7e6..145fab8 100644 --- a/webapp/src/components/GoogleLoginMenu.tsx +++ b/webapp/src/components/GoogleLoginMenu.tsx @@ -1,5 +1,5 @@ -import { Container} from '@mui/material'; +/* import { Container} from '@mui/material'; import { useTranslation } from 'react-i18next'; import GLoginButton from './GLoginButton'; @@ -35,4 +35,4 @@ const GoogleLogin = (props: ActionProps) => { } -export default GoogleLogin; \ No newline at end of file +export default GoogleLogin; */ \ No newline at end of file diff --git a/webapp/src/components/Init.tsx b/webapp/src/components/Init.tsx index c4f2579..e8a2c44 100644 --- a/webapp/src/components/Init.tsx +++ b/webapp/src/components/Init.tsx @@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'; type ActionProps = { changeView:(arg:boolean)=> void; - changeGoogleView:()=> void; + /* changeGoogleView:()=> void; */ } const Init = (props:ActionProps) =>{ @@ -17,10 +17,10 @@ const Init = (props:ActionProps) =>{ onClick={() => props.changeView(true)}> {t('login')} - + */} ); };