diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index dc5c6a71f8c19c4adf3f08c67d5b9f4f0092ea92..e34dab4e9f89c9ba61c89ca8f13cf5210c68e705 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -11,9 +11,9 @@ ipcRendererUpdateWeb.on('update', function(event, message) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade?'Update Available':(msgJSON.version!==''?'':'')); document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade?'A new release is available ('+msgJSON.version+').':(msgJSON.version!==''?'You are using latest version of Nynja.':'Encountered an error while updating, try again later.')); document.getElementById('update_current_version').innerHTML = 'version '+msgJSON.currentVersion; - // document.getElementById('update_version_electron').innerHTML = msgJSON.electron; - // document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; - // document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; + document.getElementById('update_version_electron').innerHTML = msgJSON.electron; + document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; + document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; //Handle event // // document.getElementById('update-info').removeEventListener('click'); diff --git a/lib/releaseNotes/releaseNotes.json b/lib/releaseNotes/releaseNotes.json index 5b29d409675dbf9755af4ca288e84bb1c8ede1c0..14054f8ab847ffd9ef805a6b4ed740255fab5c24 100644 --- a/lib/releaseNotes/releaseNotes.json +++ b/lib/releaseNotes/releaseNotes.json @@ -17,6 +17,11 @@ "Much improved download/preview file UX" ] }, + "0.11.4": { + "content": [ + "Updated the 'Next' button label on the home page" + ] + }, "0.11.3": { "content": [ "P2P calls connectivity improvements" diff --git a/src/assets/css/desktop-style.css b/src/assets/css/desktop-style.css new file mode 100644 index 0000000000000000000000000000000000000000..84f29bd02e772c5b667c92f2cdf23f841536eb9d --- /dev/null +++ b/src/assets/css/desktop-style.css @@ -0,0 +1,86 @@ +*{ + margin: 0px; + padding: 0px; +} +html , body{ + height: 100%; + font-family:sans-serif; + color: #666; +} + + +.btn{ + border-radius: 6px; + background-color: #e72630; + box-shadow: 0 2px 4px 0 rgba(231,38,48,0.6); + color: #fff; + height: 32px; + line-height: 32px; + padding: 0 15px; + font-weight: bold; + text-align: center; + text-transform: uppercase; + border: none; + +} + +.btn:focus , .btn:hover , .btn:active{outline: none; background-color: #cc2029;} +.btn-absolute{ + position: absolute; + top: 15px; right: 150px; + z-index: 999; +} + +.wrapper{ + display: flex; + align-items: center; + justify-content: center; + height: 100%; + z-index: 50; + position: fixed; + z-index: 1000; + width: 100%; +} +.modalContainer ul{list-style: none; margin: 0px; padding: 0px;} +.modalContainer ul li + li{margin-top: 8px;} +.modalContainer ul li.title{font-size: 18px;} +.modalContainer ul li span{display: inline-block;} +.modalContainer ul li span + span{margin-left: 5px;} +.modalContainer ul li span:first-child{font-weight: 600;} +.modalContainer ul li span:last-child{color:#f2f2f2;} +.modalContainer{ + padding: 25px; + background: #fff; + background: #3c3c3c; + position: relative; + color: #fff; + border-radius: 10px; + overflow: hidden; + min-width: 500px; + padding-left: 0px; +} +.modalFooter{ + background: #4e4e4e; + text-align: right; + padding: 15px; + margin: 0 -25px -25px; + margin-top: 15px; +} +.btnClose{ position: absolute; right: 15px; top: 15px;} +.btnClose img{ width:25px; height: 25px; filter: brightness(0) invert(1); } +.footerBtn{ + background-color: transparent; + color: #fff; + height: 32px; + line-height: 32px; + padding: 0 15px; + font-weight: bold; + text-align: center; + text-transform: uppercase; + border: none; + z-index: 1; + border-radius: 4px; +} +.footerBtn:hover{ + background: #3c3c3c; +} \ No newline at end of file diff --git a/src/assets/languages/Modals/ShareModal.en.json b/src/assets/languages/Modals/ShareModal.en.json index 126924e0943898e7920609a2878d0447a7fbc24c..ff3c6ec47896d84bb542054284c5b19e71130c33 100644 --- a/src/assets/languages/Modals/ShareModal.en.json +++ b/src/assets/languages/Modals/ShareModal.en.json @@ -1,4 +1,6 @@ { "close": "Close", - "share": "Share" + "share": "Share", + "mailSubject": "Share media from NYNJA Web client", + "mailBody": "" } \ No newline at end of file diff --git a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js index 0c08bae22e8bcd008590b527b2e94998c13ad10d..11a446abe7b642bc44bd14e87f06c2f738c538b0 100644 --- a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js +++ b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js @@ -14,7 +14,8 @@ class ChatFeaturesMenu extends Component { super(props); this.state = { isRightSlideExpand: false, - openContactsDialog: false + openContactsDialog: false, + storageType: null, }; } @@ -39,29 +40,33 @@ class ChatFeaturesMenu extends Component { this.setState({ openContactsDialog: true }); } - // isExtensionValid(filename) { - // const partials = filename.split('.'); - // const extension = partials.pop(); + handleStorageClick = (type) => { + const { onStorageItemClick } = this.props; - // } + this.setState({ storageType: type }); + onStorageItemClick(type); + } - render() { - // add localization - const { - classes, router, isGroup, data, expandChatFeature, onStorageItemClick, translate, isBanned - } = this.props; + handleActive = (name) => { + const { classes } = this.props; + const { storageType } = this.state; - const { openContactsDialog } = this.state; + if (storageType && storageType === name) { + return classes.activeLi; + } - const { activeDialogId } = data; + return ''; + } + render() { + const { classes, isGroup, data, expandChatFeature, translate, isBanned } = this.props; + const { openContactsDialog } = this.state; - console.log('[TEMP] data', data) - const { isRightSlideExpand } = this.state; + const { activeDialogId } = data; + const storageItemsStyle = `${classes.rightMenuItem} right-menu-btn ${expandChatFeature ? 'expanded' : ''}`; const groupCallDisabled = data && data.callData && !!data.callData.conferenceId || (!isGroup && (!this.props.data.activeDialogId || (this.props.data.activeDialogId === data.phoneId))); - return (
@@ -88,10 +93,6 @@ class ChatFeaturesMenu extends Component { {translate('shareContact')} - {/* */}
@@ -107,61 +108,60 @@ class ChatFeaturesMenu extends Component {
- {/* ----------------------- */}
diff --git a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js index 6757919252a7f632ba4e3679ea89f6b4d9151c1b..870219c33bb5177afb26949ca9a8f30ecabaf1af 100644 --- a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js +++ b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js @@ -194,5 +194,8 @@ export default theme => ({ '&.show': { transform: 'translateX(-388px)' } - } + }, + activeLi: { + background: '#D00000', + }, }); diff --git a/src/componets/Modals/ShareModal/ShareModal.js b/src/componets/Modals/ShareModal/ShareModal.js index 71056f53e7945b50dc48b463cb0bce0c1520180f..64727d1ee038443065cbd3393afa0a6c01e8feeb 100644 --- a/src/componets/Modals/ShareModal/ShareModal.js +++ b/src/componets/Modals/ShareModal/ShareModal.js @@ -6,8 +6,8 @@ import stylesFunc from './ShareModal.styles'; import { addTranslationForLanguage, getTranslate } from 'react-localize-redux'; import * as Translation from '../../../assets/languages/Modals/ShareModal.en.json'; import { - FacebookShareButton, FacebookIcon, TwitterShareButton, - TwitterIcon, LinkedinShareButton, LinkedinIcon + FacebookShareButton, FacebookIcon, TwitterShareButton, EmailShareButton, + TwitterIcon, LinkedinShareButton, LinkedinIcon, EmailIcon, } from 'react-share'; const styles = theme => (stylesFunc(theme)); @@ -47,6 +47,9 @@ class ShareModal extends Component { + + +