keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Fixed syntax & linted

Browse Source
pull/682/head
Vincent 5 years ago
parent a6fb54233a
commit 533ec4eedc
6 changed files with 146 additions and 164 deletions
Show Stats Download Patch File Download Diff File

13
js/modules/loki_app_dot_net_api.js
Unescape Escape View File

@ -1308,11 +1308,16 @@ class LokiPublicChannelAPI {
// filter out invalid messages // filter out invalid messages
pendingMessages = pendingMessages.filter(messageData => !!messageData); pendingMessages = pendingMessages.filter(messageData => !!messageData);
// separate messages coming from primary and secondary devices // separate messages coming from primary and secondary devices
const [primaryMessages, slaveMessages] = _.partition(pendingMessages, message => !(message.source in slavePrimaryMap)); const [primaryMessages, slaveMessages] = _.partition(
pendingMessages,
message => !(message.source in slavePrimaryMap)
);
// process primary devices' message directly // process primary devices' message directly
primaryMessages.forEach(message => this.serverAPI.chatAPI.emit('publicMessage', { primaryMessages.forEach(message =>
message, this.serverAPI.chatAPI.emit('publicMessage', {
})); message,
})
);
pendingMessages = []; // allow memory to be freed pendingMessages = []; // allow memory to be freed

1
js/views/user_details_dialog_view.js
Unescape Escape View File

@ -1,4 +1,3 @@
/* global i18n, Whisper */ /* global i18n, Whisper */
// eslint-disable-next-line func-names // eslint-disable-next-line func-names

164
stylesheets/_session.scss
Unescape Escape View File

@ -1,107 +1,99 @@
$session-color-green: #00F782; $session-color-green: #00f782;
$session-color-white: #fff; $session-color-white: #fff;
$session-color-black: #000; $session-color-black: #000;
$session-font-family: Waza; $session-font-family: Waza;
$session-transition-duration: 0.25s; $session-transition-duration: 0.25s;
$session-icon-size-sm: 16px; $session-icon-size-sm: 16px;
$session-icon-size-md: 20px; $session-icon-size-md: 20px;
$session-icon-size-lg: 28px; $session-icon-size-lg: 28px;
.session-button {
min-width: 165px;
width: auto;
height: 45px;
line-height: 45px;
padding: 0 35px 0 35px;
font-size: 15px;
font-family: $session-font-family;
font-weight: 700;
cursor: pointer;
display: flex;
justify-content: center;
border-radius: 500px;
@mixin transparent-background($textAndBorderColor) {
background-color: Transparent;
background-repeat: no-repeat;
overflow: hidden;
outline: none;
color: $textAndBorderColor;
border: 2px solid $textAndBorderColor;
}
.content{ &.full-green {
background-color: $session-color-black !important; background-color: $session-color-green;
} color: $session-color-white;
}
.session-button { &.green {
min-width: 165px; @include transparent-background($session-color-green);
width: auto; }
height: 45px;
line-height: 45px; &.white {
padding: 0 35px 0 35px; @include transparent-background($session-color-white);
font-size: 15px;
font-family: $session-font-family;
font-weight: 700;
cursor: pointer;
display: flex;
justify-content: center;
border-radius: 500px;
@mixin transparent-background($textAndBorderColor) {
background-color: Transparent;
background-repeat:no-repeat;
overflow: hidden;
outline:none;
color: $textAndBorderColor;
border: 2px solid $textAndBorderColor;
}
&.full-green {
background-color: $session-color-green;
color: $session-color-white;
}
&.green {
@include transparent-background($session-color-green);
}
&.white {
@include transparent-background($session-color-white);
}
} }
}
.session-icon-button { .session-icon-button {
fill: $session-color-white; fill: $session-color-white;
opacity: 0.4; opacity: 0.4;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
transition: opacity $session-transition-duration; transition: opacity $session-transition-duration;
&.small { &.small {
line-height: $session-icon-size-sm; line-height: $session-icon-size-sm;
height: $session-icon-size-sm; height: $session-icon-size-sm;
width: $session-icon-size-sm; width: $session-icon-size-sm;
margin: $session-icon-size-sm / 3; margin: $session-icon-size-sm / 3;
img { img {
height: $session-icon-size-sm; height: $session-icon-size-sm;
width: $session-icon-size-sm; width: $session-icon-size-sm;
}
} }
}
&.medium { &.medium {
line-height: $session-icon-size-md; line-height: $session-icon-size-md;
height: $session-icon-size-md; height: $session-icon-size-md;
width: $session-icon-size-md; width: $session-icon-size-md;
margin: $session-icon-size-md / 3; margin: $session-icon-size-md / 3;
img { img {
height: $session-icon-size-md; height: $session-icon-size-md;
width: $session-icon-size-md; width: $session-icon-size-md;
}
}
&.large {
line-height: $session-icon-size-lg;
height: $session-icon-size-lg;
width: $session-icon-size-lg;
margin: $session-icon-size-lg / 3;
img {
height: $session-icon-size-lg;
width: $session-icon-size-lg;
}
} }
}
&:hover{ &.large {
opacity: 1; line-height: $session-icon-size-lg;
height: $session-icon-size-lg;
width: $session-icon-size-lg;
margin: $session-icon-size-lg / 3;
img {
height: $session-icon-size-lg;
width: $session-icon-size-lg;
} }
} }
&:hover {
opacity: 1;
}
}

1
stylesheets/manifest.scss
Unescape Escape View File

@ -26,6 +26,5 @@
@import 'modules'; @import 'modules';
@import 'session'; @import 'session';
// Installer // Installer
@import 'options'; @import 'options';

29
ts/components/session/SessionButton.tsx
Unescape Escape View File

@ -15,27 +15,22 @@ interface Props {
buttonType: SessionButtonTypes; buttonType: SessionButtonTypes;
} }
export class SessionButton extends React.PureComponent<Props> { export class SessionButton extends React.PureComponent<Props> {
public render() { public render() {
const { const { buttonType, text } = this.props;
buttonType,
text
} = this.props;
return ( return (
<div <div
className={classNames( className={classNames(
'session-button', 'session-button',
buttonType === SessionButtonTypes.green? 'green' : '', buttonType === SessionButtonTypes.green ? 'green' : '',
buttonType === SessionButtonTypes.fullGreen? 'full-green' : '', buttonType === SessionButtonTypes.fullGreen ? 'full-green' : '',
buttonType === SessionButtonTypes.white? 'white' : '', buttonType === SessionButtonTypes.white ? 'white' : ''
)} )}
role='button' role="button"
> >
{text} {text}
</div> </div>
); );
} }
} }

102
ts/components/session/SessionIconButton.tsx
Unescape Escape View File

@ -1,72 +1,64 @@
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
export enum SessionIconButtonTypes { export enum SessionIconButtonTypes {
'exit' = 'exit', 'exit' = 'exit',
'search' = 'search', 'search' = 'search',
'back' = 'back', 'back' = 'back',
'attachment' = 'attachment', 'attachment' = 'attachment',
'emoji' = 'emoji', 'emoji' = 'emoji',
'favorite' = 'favorite', 'favorite' = 'favorite',
'group' = 'group', 'group' = 'group',
'menu' = 'menu', 'menu' = 'menu',
'message' = 'message', 'message' = 'message',
'microphone' = 'microphone', 'microphone' = 'microphone',
'network' = 'network', 'network' = 'network',
'options' = 'options', 'options' = 'options',
'theme' = 'theme', 'theme' = 'theme',
} }
export enum SessionIconButtonSizes { export enum SessionIconButtonSizes {
'small' = 'small', 'small' = 'small',
'medium' = 'medium', 'medium' = 'medium',
'large' = 'large', 'large' = 'large',
} }
interface Props { interface Props {
iconType: SessionIconButtonTypes; iconType: SessionIconButtonTypes;
iconSize: SessionIconButtonSizes; iconSize: SessionIconButtonSizes;
} }
export class SessionIconButton extends React.PureComponent<Props> { export class SessionIconButton extends React.PureComponent<Props> {
constructor(props: any){ constructor(props: any) {
super(props); super(props);
this.clickHandler = this.clickHandler.bind(this); this.clickHandler = this.clickHandler.bind(this);
} }
public render() { public render() {
const { const { iconType, iconSize } = this.props;
iconType,
iconSize,
} = this.props;
let iconPath = `./images/session/icon-${iconType}.svg`; let iconPath = `./images/session/icon-${iconType}.svg`;
return ( return (
<div <div
className={classNames( className={classNames(
'session-icon-button', 'session-icon-button',
iconType === SessionIconButtonTypes.exit ? 'exit' : '', iconType === SessionIconButtonTypes.exit ? 'exit' : '',
iconType === SessionIconButtonTypes.search ? 'search' : '', iconType === SessionIconButtonTypes.search ? 'search' : '',
iconType === SessionIconButtonTypes.back ? 'back' : '', iconType === SessionIconButtonTypes.back ? 'back' : '',
iconSize === SessionIconButtonSizes.small ? 'small' : '', iconSize === SessionIconButtonSizes.small ? 'small' : '',
iconSize === SessionIconButtonSizes.medium ? 'medium' : '', iconSize === SessionIconButtonSizes.medium ? 'medium' : '',
iconSize === SessionIconButtonSizes.large ? 'large' : '' iconSize === SessionIconButtonSizes.large ? 'large' : ''
)} )}
role='button' role="button"
onClick={this.clickHandler} onClick={this.clickHandler}
> >
<img src={iconPath}/> <img src={iconPath} />
</div> </div>
); );
} }
clickHandler(){ private clickHandler() {
return; return;
} }
}
}

Write Preview
Loading…
Cancel
Save