- {links.map((link, index) => (
+ {mainLinks.map((link, index) => (
diff --git a/src/components/Header/header.module.scss b/src/components/Header/header.module.scss
index ba542da..2e4f004 100644
--- a/src/components/Header/header.module.scss
+++ b/src/components/Header/header.module.scss
@@ -70,13 +70,13 @@ $header-height: $x20;
.logo {
position: relative;
- bottom: $x1;
+ // bottom: $x1;
height: $x8;
}
.text {
margin-left: $x3;
- height: 52px;
+ // height: 52px;
white-space: nowrap;
}
diff --git a/src/components/Tag/tag.module.scss b/src/components/Tag/tag.module.scss
index 8238793..416c77d 100644
--- a/src/components/Tag/tag.module.scss
+++ b/src/components/Tag/tag.module.scss
@@ -1,12 +1,14 @@
@import 'styles/_mods.scss';
.header-link {
- white-space: nowrap;
+ // white-space: nowrap;
border-radius: $x2;
padding: $x1;
box-shadow: $depth1;
+
+ display: inline-block;
}
.header-link-active {
diff --git a/src/config.ts b/src/config.ts
index 481fd3e..fc9d0f1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,10 +1,29 @@
-export const CIPHER_ALGORITHM = 'cipher_algorithm';
+export const CIPHER_METHOD = 'cipher_algorithm';
// export const ENCRYPTED_DATA_CODES = 'encrypted_data_codes';
export const ENCRYPTED_DATA = 'encrypted_data';
+export const ENCRYPTED_DATA_BASE64 = 'encrypted_data_base64';
+export const INITIALIZATION_VECTOR = 'initialization_vector';
-export const links = [
+export const CHECKSUM_METHOD = 'checksum_algorithm';
+export const CHECKSUM_TEXT = 'checksum_text';
+export const CHECKSUM_VALUE = 'checksum_value';
+
+export const HASH_METHOD = 'hash_method';
+export const HASH_VALUE = 'hash_value';
+export const HASH_VALUE_BASE64 = 'hash_value_base64';
+
+export const mainLinks = [
{ title: 'Зашифровать', href: '/encrypt/', isActive: true },
{ title: 'Расшифровать', href: '/decrypt/', isActive: true },
{ title: 'Посчитать контрольную сумму', href: '/checksum/', isActive: true },
- { title: 'Хешировать', href: '/hash/', isActive: false },
+ { title: 'Хешировать', href: '/hash/', isActive: true },
+];
+
+export const allLinks = [
+ { title: 'Простое шифрование', href: '/encrypt/basic/', isActive: true },
+ { title: 'Расшифрование простого', href: '/decrypt/basic/', isActive: true },
+ { title: 'Блочное шифрование', href: '/encrypt/block/', isActive: true },
+ { title: 'Расшифрование блочного', href: '/decrypt/block/', isActive: true },
+ { title: 'Контрольная сумма', href: '/checksum/', isActive: true },
+ { title: 'Хеширование', href: '/hash/', isActive: true },
];
diff --git a/src/containers/Checksum/Checksum.tsx b/src/containers/Checksum/Checksum.tsx
index 009b356..72341fc 100644
--- a/src/containers/Checksum/Checksum.tsx
+++ b/src/containers/Checksum/Checksum.tsx
@@ -3,6 +3,8 @@ import * as React from 'react';
import { ContentBox } from 'components/ContentBox';
import { Alarm } from 'components/Alarm';
+import { CHECKSUM_METHOD, CHECKSUM_TEXT, CHECKSUM_VALUE } from 'config';
+
import { checksumMethods } from 'libmethods';
import { countChecksum, TypesCheckSum } from 'libmethods/checksum';
@@ -24,6 +26,16 @@ export default function() {
setChecksum(countChecksum(method, text));
};
+ const getJSON = (method: TypesCheckSum, text: string) => {
+ const methodName = `${method.name}${'version' in method ? '/' + method.version : ''}`;
+ let json = {
+ [CHECKSUM_METHOD]: methodName,
+ [CHECKSUM_TEXT]: text,
+ [CHECKSUM_VALUE]: method.value,
+ };
+ return JSON.stringify(json, undefined, 2);
+ };
+
return (
<>
@@ -66,12 +78,17 @@ export default function() {
{checksum.map((item, index) => (
- | {item.name} |
+
+ {item.name}
+ {'version' in item ? '/' + item.version : ''}
+ |
{item.value} |
))}
+ 2) JSON для отправки на сервер контрольных сумм:
+