Merge pull request #42 from CodeDead/feature/vault-fix

CodeDead · web-flow · commit a2105c79d0b8 · 2023-01-02T01:07:53.000+01:00
feature/vault-fix
diff --git a/src/components/VaultCard/index.jsx b/src/components/VaultCard/index.jsx
@@ -5,10 +5,13 @@ import CardActions from '@mui/material/CardActions';
 import Button from '@mui/material/Button';
 import Typography from '@mui/material/Typography';
 import CardActionArea from '@mui/material/CardActionArea';
+import CardMedia from '@mui/material/CardMedia';
+import LockIcon from '@mui/icons-material/Lock';
+import ThemeSelector from '../../utils/ThemeSelector';
 
 const VaultCard = ({
   id, title, description, url, openLabel, editLabel, copyLabel,
-  deleteLabel, onClick, onEdit, onDelete, onCopy,
+  deleteLabel, onClick, onEdit, onDelete, onCopy, themeIndex,
 }) => {
   /**
    * Open the URL
@@ -39,10 +42,23 @@ const VaultCard = ({
   };
 
   return (
-    <Card>
-      <CardActionArea
-        onClick={copy}
-      >
+    <Card style={{ height: '100%' }}>
+      <CardActionArea onClick={copy}>
+        <CardMedia
+          style={{
+            height: 120,
+            backgroundColor: ThemeSelector(themeIndex)['500'],
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+          }}
+          title={title}
+        >
+          <LockIcon
+            color="inherit"
+            fontSize="large"
+          />
+        </CardMedia>
         <CardContent>
           <Typography variant="h5" component="div">
             {title}
diff --git a/src/contexts/VaultContextProvider/index.jsx b/src/contexts/VaultContextProvider/index.jsx
@@ -3,6 +3,7 @@ import VaultReducer from '../../reducers/VaultReducer';
 
 const initState = {
   vault: null,
+  phrase: '',
 };
 
 export const VaultContext = createContext(initState);
diff --git a/src/languages/de_de.json b/src/languages/de_de.json
@@ -19,7 +19,7 @@
   "characterSet": "Zeichensatz",
   "generate": "Generieren",
   "useCustomCharacterSet": "Benutzerdefinierten Zeichensatz verwenden",
-  "aboutText": "Advanced PassGen wurde von DeadLine erstellt.\n\nThema: MUI\nLizenz: GPLv3\nÜbersetzung: uDEV2019\nVersion: {x}\n\nCopyright © 2023 CodeDead",
+  "aboutText": "Advanced PassGen wurde von DeadLine erstellt.\n\nThema: MUI\nLizenz: GPLv3\nÜbersetzung: uDEV2019\nVersion: {x}\n\nCopyright © {year} CodeDead",
   "website": "Webseite",
   "license": "Lizenz",
   "autoUpdate": "Automatisch auf Aktualisierungen prüfen",
diff --git a/src/languages/en_us.json b/src/languages/en_us.json
@@ -19,7 +19,7 @@
   "characterSet": "Character set",
   "generate": "Generate",
   "useCustomCharacterSet": "Use custom character set",
-  "aboutText": "Advanced PassGen was created by DeadLine.\n\nTheme: MUI\nLicense: GPLv3\nVersion: {x}\n\nCopyright © 2023 CodeDead",
+  "aboutText": "Advanced PassGen was created by DeadLine.\n\nTheme: MUI\nLicense: GPLv3\nVersion: {x}\n\nCopyright © {year} CodeDead",
   "website": "Website",
   "license": "License",
   "autoUpdate": "Automatically check for updates",
diff --git a/src/languages/fr_fr.json b/src/languages/fr_fr.json
@@ -19,7 +19,7 @@
   "characterSet": "Ensemble de caractères",
   "generate": "Générer",
   "useCustomCharacterSet": "Utiliser un ensemble de caractères personnalisé",
-  "aboutText": "Advanced PassGen a été créé par DeadLine\n\nThème : MUI\nLicence: GPLv3\nVersion: {x}\n\nCopyright © 2023 CodeDead",
+  "aboutText": "Advanced PassGen a été créé par DeadLine\n\nThème : MUI\nLicence: GPLv3\nVersion: {x}\n\nCopyright © {year} CodeDead",
   "website": "Site web",
   "license": "Licence",
   "autoUpdate": "Mise à jour automatique",
diff --git a/src/languages/jp_jp.json b/src/languages/jp_jp.json
@@ -19,7 +19,7 @@
   "characterSet": "キャラクターセット",
   "generate": "生成",
   "useCustomCharacterSet": "カスタム文字セットを使用する",
-  "aboutText": "Advanced PassGen は DeadLine によって作成されました。\n\nテーマ: MUI\nライセンス: GPLv3\nバージョン: {x}\n\n著作権 © 2023 CodeDead",
+  "aboutText": "Advanced PassGen は DeadLine によって作成されました。\n\nテーマ: MUI\nライセンス: GPLv3\nバージョン: {x}\n\n著作権 © {year} CodeDead",
   "website": "ウェブサイト",
   "license": "ライセンス",
   "autoUpdate": "アップデートを自動的に確認する",
diff --git a/src/languages/nl_nl.json b/src/languages/nl_nl.json
@@ -19,7 +19,7 @@
   "characterSet": "Karakter set",
   "generate": "Genereer",
   "useCustomCharacterSet": "Gebruik aangepaste karakter set",
-  "aboutText": "Advanced PassGen is gemaakt door DeadLine\n\nThema: MUI\nLicentie: GPLv3\nVersie: {x}\n\nCopyright © 2023 CodeDead",
+  "aboutText": "Advanced PassGen is gemaakt door DeadLine\n\nThema: MUI\nLicentie: GPLv3\nVersie: {x}\n\nCopyright © {year} CodeDead",
   "website": "Website",
   "license": "Licentie",
   "autoUpdate": "Automatisch updaten",
diff --git a/src/languages/ru_ru.json b/src/languages/ru_ru.json
@@ -19,7 +19,7 @@
   "characterSet": "Набор символов",
   "generate": "Создать",
   "useCustomCharacterSet": "Использовать пользовательский набор символов",
-  "aboutText": "Advanced PassGen был создан DeadLine.\n\nТема: МУИ\nЛицензия: GPLv3\nВерсия: {x}\n\nАвторское право © 2023 CodeDead",
+  "aboutText": "Advanced PassGen был создан DeadLine.\n\nТема: МУИ\nЛицензия: GPLv3\nВерсия: {x}\n\nАвторское право © {year} CodeDead",
   "website": "Веб-сайт",
   "license": "Лицензия",
   "autoUpdate": "Автоматически проверять наличие обновлений",
diff --git a/src/languages/zh_cn.json b/src/languages/zh_cn.json
@@ -19,7 +19,7 @@
   "characterSet": "字符集",
   "generate": "生成",
   "useCustomCharacterSet": "使用自定义字符集",
-  "aboutText": "Advanced PassGen 是由 DeadLine 开发的。\n\n主题：MUI\n许可证：GPLv3\n翻译：大眼仔~旭\n版本：{x}\n\n版权所有 © 2023 CodeDead",
+  "aboutText": "Advanced PassGen 是由 DeadLine 开发的。\n\n主题：MUI\n许可证：GPLv3\n翻译：大眼仔~旭\n版本：{x}\n\n版权所有 © {year} CodeDead",
   "website": "网站",
   "license": "许可证",
   "autoUpdate": "自动检查更新",
diff --git a/src/reducers/VaultReducer/Actions/actionTypes.js b/src/reducers/VaultReducer/Actions/actionTypes.js
@@ -1,2 +1,2 @@
-// eslint-disable-next-line import/prefer-default-export
 export const SET_VAULT = 'SET_VAULT';
+export const SET_PHRASE = 'SET_PHRASE';
diff --git a/src/reducers/VaultReducer/Actions/index.js b/src/reducers/VaultReducer/Actions/index.js
@@ -1,7 +1,14 @@
-import { SET_VAULT } from './actionTypes';
+import {
+  SET_PHRASE,
+  SET_VAULT,
+} from './actionTypes';
 
-// eslint-disable-next-line import/prefer-default-export
 export const setVault = (vault) => ({
   type: SET_VAULT,
   payload: vault,
 });
+
+export const setPhrase = (phrase) => ({
+  type: SET_PHRASE,
+  payload: phrase,
+});
diff --git a/src/reducers/VaultReducer/index.js b/src/reducers/VaultReducer/index.js
@@ -1,4 +1,4 @@
-import { SET_VAULT } from './Actions/actionTypes';
+import { SET_PHRASE, SET_VAULT } from './Actions/actionTypes';
 
 const VaultReducer = (state, action) => {
   if (!action || !action.type) {
@@ -10,6 +10,11 @@ const VaultReducer = (state, action) => {
         ...state,
         vault: action.payload,
       };
+    case SET_PHRASE:
+      return {
+        ...state,
+        phrase: action.payload,
+      };
     default:
       return state;
   }
diff --git a/src/routes/About/index.jsx b/src/routes/About/index.jsx
@@ -40,7 +40,7 @@ const About = () => {
       <Card>
         <CardContent>
           <Typography style={{ whiteSpace: 'pre-wrap' }}>
-            {language.aboutText.replace('{x}', packageJson.version)}
+            {language.aboutText.replace('{x}', packageJson.version).replace('{year}', new Date().getFullYear())}
           </Typography>
         </CardContent>
       </Card>
diff --git a/src/routes/Vault/index.jsx b/src/routes/Vault/index.jsx
@@ -20,7 +20,7 @@ import { writeText } from '@tauri-apps/api/clipboard';
 import { MainContext } from '../../contexts/MainContextProvider';
 import { openWebSite, setError, setPageIndex } from '../../reducers/MainReducer/Actions';
 import { VaultContext } from '../../contexts/VaultContextProvider';
-import { setVault } from '../../reducers/VaultReducer/Actions';
+import { setPhrase, setVault } from '../../reducers/VaultReducer/Actions';
 import VaultCard from '../../components/VaultCard';
 import CreatePasswordDialog from '../../components/CreatePasswordDialog';
 import EditPasswordDialog from '../../components/EditPasswordDialog';
@@ -32,9 +32,9 @@ const Vault = () => {
   const [vaultState, d3] = useContext(VaultContext);
 
   const language = state.languages[state.languageIndex];
-  const { vault } = vaultState;
+  const { themeIndex } = state;
+  const { vault, phrase } = vaultState;
 
-  const [phrase, setPhrase] = useState('');
   const [search, setSearch] = useState('');
   const [editPasswordId, setEditPasswordId] = useState(null);
   const [keyAction, setKeyAction] = useState(null);
@@ -223,7 +223,7 @@ const Vault = () => {
     if (!key || key.length === 0) {
       return;
     }
-    setPhrase(key);
+    d3(setPhrase(key));
 
     if (keyAction === 'create') {
       d3(setVault([]));
@@ -261,7 +261,7 @@ const Vault = () => {
    */
   const closeVault = () => {
     d3(setVault(null));
-    setPhrase('');
+    d3(setPhrase(''));
     setSearch('');
   };
 
@@ -308,6 +308,7 @@ const Vault = () => {
             onEdit={openEditPasswordDialog}
             onDelete={deletePassword}
             onCopy={copyToClipboard}
+            themeIndex={themeIndex}
           />
         </Grid>
       ));

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// eslint-disable-next-line import/prefer-default-export`
`2`	`1`	`export const SET_VAULT = 'SET_VAULT';`
	`2`	`+export const SET_PHRASE = 'SET_PHRASE';`