Merge pull request #138 from CodeDead/feature/remove-analytics

Feature/remove analytics

Author: CodeDead

.dockerignore

@@ -12,7 +12,6 @@ Dockerfile
 .eslintcache
 .eslintrc.json
 .prettierignore
-eslint.config.js
 .idea
 .vscode
 dist

Dockerfile

@@ -1,7 +1,7 @@
-FROM node:current-alpine as build
+FROM node:current-alpine AS build
 
 WORKDIR /app
-ENV PATH /app/node_modules/.bin:$PATH
+ENV PATH=/app/node_modules/.bin:$PATH
 
 COPY package.json ./
 

package.json

@@ -20,7 +20,6 @@
     "graphemer": "^1.4.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "react-ga4": "^2.1.0",
     "react-router-dom": "^7.5.3"
   },
   "scripts": {

src-tauri/Cargo.lock

@@ -78,15 +78,15 @@ async fn generate_passwords(
         }
     }
 
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let chars = graphemes.collect::<Vec<&str>>();
     for _n in 0..amount {
         let mut can_continue = false;
         while !can_continue {
             let mut password = String::from("");
-            let length = rng.gen_range(min_length..(max_length + 1));
+            let length = rng.random_range(min_length..(max_length + 1));
             for _j in 0..length {
-                let index = rng.gen_range(0..char_count);
+                let index = rng.random_range(0..char_count);
                 password.push_str(chars.clone()[index]);
             }
 

src-tauri/src/main.rs

@@ -8,13 +8,11 @@ import { createTheme, ThemeProvider } from '@mui/material/styles';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import { platform } from '@tauri-apps/plugin-os';
-import ReactGA from 'react-ga4';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import packageJson from '../../../package.json';
 import { MainContext } from '../../contexts/MainContextProvider';
 import {
   openWebSite,
-  setAllowCookies,
   setCheckedForUpdates,
   setError,
   setLoading,
@@ -47,11 +45,8 @@ const App = () => {
     error,
     loading,
     checkedForUpdates,
-    allowCookies,
-    hasSetCookies,
   } = state;
 
-  const [cookieBannerOpen, setCookieBannerOpen] = useState(!hasSetCookies);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [snackOpen, setSnackOpen] = useState(false);
   const language = state.languages[languageIndex];
@@ -105,29 +100,6 @@ const App = () => {
     setSnackOpen(false);
   };
 
-  /**
-   * Close the cookie snack bar
-   */
-  const closeCookieSnack = () => {
-    setCookieBannerOpen(false);
-  };
-
-  /**
-   * Accept cookies
-   */
-  const acceptCookies = () => {
-    d1(setAllowCookies(true));
-    setCookieBannerOpen(false);
-  };
-
-  /**
-   * Decline cookies
-   */
-  const declineCookies = () => {
-    d1(setAllowCookies(false));
-    setCookieBannerOpen(false);
-  };
-
   /**
    * Close the dialog that displays a message that no updates are available
    */
@@ -146,17 +118,6 @@ const App = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  useEffect(() => {
-    if (!window.__TAURI__) {
-      if (allowCookies) {
-        ReactGA.initialize('G-M3DEBWW06X');
-        window['ga-disable-G-M3DEBWW06X'] = false;
-      } else {
-        window['ga-disable-G-M3DEBWW06X'] = true;
-      }
-    }
-  }, [allowCookies]);
-
   return (
     <ThemeProvider theme={theme}>
       <BrowserRouter>
@@ -221,31 +182,7 @@ const App = () => {
             agreeLabel={language.ok}
           />
         ) : null}
-        {}
-        {!window.__TAURI__ && cookieBannerOpen ? (
-          <Alert
-            onClose={closeCookieSnack}
-            severity="info"
-            sx={{
-              width: '100%',
-              position: 'fixed',
-              bottom: 0,
-            }}
-          >
-            <Typography>{language.cookieNoticeText}</Typography>
-            <Button onClick={declineCookies} size="small" color="error">
-              {language.reject}
-            </Button>
-            <Button onClick={acceptCookies} size="small" color="primary">
-              {language.accept}
-            </Button>
-          </Alert>
-        ) : null}
-        <Snackbar
-          open={snackOpen}
-          onClose={closeSnack}
-          sx={{ mb: cookieBannerOpen ? 10 : null }}
-        >
+        <Snackbar open={snackOpen} onClose={closeSnack}>
           <Alert onClose={closeSnack} severity="info" sx={{ width: '100%' }}>
             <Typography>{language.downloadApp}</Typography>
             <Button

src/components/App/index.jsx

@@ -30,13 +30,6 @@ const tips = localStorage.tips ? localStorage.tips === 'true' : true;
 const sortByStrength = localStorage.sortByStrength
   ? localStorage.sortByStrength === 'true'
   : true;
-let hasSetCookies = false;
-let allowCookies = true;
-
-if (localStorage.allowCookies) {
-  allowCookies = localStorage.allowCookies === 'true';
-  hasSetCookies = true;
-}
 
 const initState = {
   autoUpdate,
@@ -52,8 +45,6 @@ const initState = {
   loading: false,
   colorOnDark,
   tips,
-  allowCookies,
-  hasSetCookies,
   sortByStrength,
 };
 

src/contexts/MainContextProvider/index.jsx

@@ -132,8 +132,5 @@
   "includeSymbols": "Symbole einschließen",
   "useEmojis": "Emojis verwenden",
   "exportSuccessful": "Export erfolgreich",
-  "cookieNoticeText": "Diese Website verwendet Cookies, um sicherzustellen, dass Sie die bestmögliche Erfahrung auf unserer Website haben.",
-  "accept": "Akzeptieren",
-  "reject": "Ablehnen",
   "sortByStrength": "Standardmäßig nach Stärke sortieren"
 }

src/languages/de_de.json

@@ -134,8 +134,5 @@
   "includeSymbols": "Include symbols",
   "useEmojis": "Use emojis",
   "exportSuccessful": "Export successful",
-  "cookieNoticeText": "This website uses cookies to ensure you get the best experience on our website.",
-  "accept": "Accept",
-  "reject": "Reject",
   "sortByStrength": "Sort by strength by default"
 }

src/languages/en_us.json

@@ -134,8 +134,5 @@
   "includeSymbols": "Incluir símbolos",
   "useEmojis": "Usar emojis",
   "exportSuccessful": "Exportación exitosa",
-  "cookieNoticeText": "Este sitio web utiliza cookies para garantizar que obtenga la mejor experiencia en nuestro sitio web.",
-  "accept": "Aceptar",
-  "reject": "Rechazar",
   "sortByStrength": "Ordenar por fuerza de forma predeterminada"
 }