Skip to content

Commit ee7f939

Browse files
author
Erika Perugachi
authored
Merge pull request #1102 from erikaperugachi/version
Version 0.22.0
2 parents 9cdb552 + 53746a1 commit ee7f939

File tree

6 files changed

+77
-52
lines changed

6 files changed

+77
-52
lines changed

‎electron_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "criptext",
3-
"version": "0.21.0",
3+
"version": "0.22.0",
44
"author": {
55
"name": "Criptext Inc",
66
"email": "[email protected]",

‎email_login/src/components/DeleteDeviceItem.js‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,32 @@ import string from '../lang';
44
import './deletedeviceitem.scss';
55

66
const DeleteDeviceItem = props => (
7-
<li className="checkbox-item" onClick={ev => props.onClick(ev, props.id)}>
8-
<div className="checkmark-container reverse">
9-
<span className={defineClassCheckbox(props.checked)} />
10-
</div>
11-
<div className="device-type-icon">
12-
<i className={defineDeviceType(props.deviceType)} />
13-
</div>
14-
<div className={'device-description'}>
15-
<strong>{props.name}</strong>
16-
<span>
17-
<b>{string.last_activity}</b>: {props.lastActivity}
18-
</span>
7+
<li
8+
className={defineClassComponent(props.checked)}
9+
onClick={ev => props.onClick(ev, props.id)}
10+
>
11+
<div>
12+
<div className="checkmark-container reverse">
13+
<span className={defineClassCheckbox(props.checked)} />
14+
</div>
15+
<div className="device-type-icon">
16+
<i className={defineDeviceType(props.deviceType)} />
17+
</div>
18+
<div className={'device-description'}>
19+
<strong>{props.name}</strong>
20+
<span>
21+
<b>{string.last_activity}</b>: {props.lastActivity}
22+
</span>
23+
</div>
1924
</div>
2025
</li>
2126
);
2227

28+
const defineClassComponent = checked => {
29+
const classChecked = 'checkbox-item-checked';
30+
return `checkbox-item ${checked ? classChecked : ''}`;
31+
};
32+
2333
const defineClassCheckbox = checked => {
2434
return checked ? `checkmark checkmark-checked` : `checkmark`;
2535
};

‎email_login/src/components/PanelWrapper.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,22 +409,26 @@ class PanelWrapper extends Component {
409409
switch (status) {
410410
case 200:
411411
return {
412-
errorMessage: errorMessages.USERNAME_NOT_EXISTS
412+
errorMessage: errorMessages.USERNAME_NOT_EXISTS,
413+
buttonSignInState: ButtonState.DISABLED
413414
};
414415
case 422:
415416
return {
416-
errorMessage: errorMessages.USERNAME_INVALID
417+
errorMessage: errorMessages.USERNAME_INVALID,
418+
buttonSignInState: ButtonState.DISABLED
417419
};
418420
case 400:
419-
return { errorMessage: '' };
421+
return { errorMessage: '', buttonSignInState: ButtonState.ENABLED };
420422
case 410: {
421423
return {
422-
errorMessage: errorMessages.USERNAME_NOT_AVAILABLE
424+
errorMessage: errorMessages.USERNAME_NOT_AVAILABLE,
425+
buttonSignInState: ButtonState.DISABLED
423426
};
424427
}
425428
default:
426429
return {
427-
errorMessage: errorMessages.STATUS_UNKNOWN + status
430+
errorMessage: errorMessages.STATUS_UNKNOWN + status,
431+
buttonSignInState: ButtonState.DISABLED
428432
};
429433
}
430434
});

‎email_login/src/components/deletedeviceitem.scss‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,61 @@
11
.checkbox-item {
2-
border-bottom: solid 1px #e6e5e5;
3-
display: flex;
4-
flex-direction: row;
52
list-style: none;
6-
margin: 0 20px;
7-
padding: 15px 0;
8-
width: calc(100% - 40px);
3+
width: 100%;
94

10-
&:last-child {
11-
border-bottom: none;
5+
&.checkbox-item-checked {
6+
background-color: #ddf0fe;
127
}
138

14-
.checkmark-container {
15-
margin-left: 3px;
16-
17-
.checkmark.checkmark-checked:after {
18-
left: 4px;
19-
top: 9px;
9+
&:last-child {
10+
div {
11+
border-bottom: none;
2012
}
2113
}
2214

23-
.device-type-icon {
24-
align-items: center;
15+
> div {
16+
border-bottom: solid 1px #e6e5e5;
2517
display: flex;
26-
margin: 0 8px;
18+
flex-direction: row;
19+
margin: 0 20px;
20+
padding: 15px 0;
21+
width: calc(100% - 40px);
2722

28-
i {
29-
color: #bfc5cb;
30-
font-size: 25px;
23+
.checkmark-container {
24+
margin-left: 3px;
25+
26+
.checkmark.checkmark-checked:after {
27+
left: 4px;
28+
top: 9px;
29+
}
3130
}
32-
}
3331

34-
.device-description {
35-
display: flex;
36-
flex-flow: column;
37-
text-align: left;
32+
.device-type-icon {
33+
align-items: center;
34+
display: flex;
35+
margin: 0 8px;
3836

39-
> strong {
40-
color: black;
37+
i {
38+
color: #bfc5cb;
39+
font-size: 25px;
40+
}
4141
}
4242

43-
> span {
44-
color: #98a3ad;
45-
font-weight: 300;
43+
.device-description {
44+
display: flex;
45+
flex-flow: column;
46+
text-align: left;
47+
48+
> strong {
49+
color: black;
50+
}
51+
52+
> span {
53+
color: #98a3ad;
54+
font-weight: 300;
4655

47-
> b {
48-
font-weight: 400;
56+
> b {
57+
font-weight: 400;
58+
}
4959
}
5060
}
5161
}

‎email_login/src/components/signin.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
}
6767

6868
.error-message {
69+
position: absolute;
6970
font-size: 12px;
7071
color: #000;
7172
left: 0px;
@@ -74,7 +75,7 @@
7475

7576
.buttons {
7677
bottom: 0;
77-
margin: 15% 0% 0% 0%;
78+
margin: 16% 0% 0% 0%;
7879
padding: 0px;
7980
width: 100%;
8081
}

‎email_mailbox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_mailbox",
3-
"version": "0.21.0",
3+
"version": "0.22.0",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.1.2-rc5",

0 commit comments

Comments
 (0)