Skip to content

Commit

Permalink
Message ui (#196)
Browse files Browse the repository at this point in the history
* in progress

* alter ContactDisplay and DropdownSelect to fit requirement

* remove mock data

* fix codacy

* fix codacy
  • Loading branch information
alvita authored May 18, 2017
1 parent 62558c3 commit 74f9a39
Show file tree
Hide file tree
Showing 31 changed files with 330 additions and 229 deletions.
1 change: 1 addition & 0 deletions dev-server/containers/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export default function App({
onLogCall={async () => { await sleep(1000); }}
onViewContact={() => {}}
onCreateContact={() => {}}
rateLimiter={phone.rateLimiter}
/>
)} />
<Route
Expand Down
3 changes: 3 additions & 0 deletions src/components/ActionMenu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ export default class ActionMenu extends Component {
});
}
captureClick = (e) => {
e.captureClick = this.props.captureClick;
if (this.props.stopPropagation) {
e.stopPropagation();
}
Expand Down Expand Up @@ -297,6 +298,7 @@ ActionMenu.propTypes = {
disableLinks: PropTypes.bool,
disableClickToDial: PropTypes.bool,
stopPropagation: PropTypes.bool,
captureClick: PropTypes.bool,
};
ActionMenu.defaultProps = {
className: undefined,
Expand All @@ -313,4 +315,5 @@ ActionMenu.defaultProps = {
disableLinks: false,
disableClickToDial: false,
stopPropagation: false,
captureClick: false,
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/de-DE.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ export default {
logging: 'Protokollierung ...',
logCall: 'Anruf protokollieren',
editLog: 'Protokoll bearbeiten',
select: 'Übereinstimmenden Datensatz auswählen',
select: 'Übereinstimmenden datensatz auswählen',
OnHold: 'Wird gehalten',
Ringing: 'Es wird angerufen',
CallConnected: 'Anruf verbunden',
unknownUser: 'Unbekannter Benutzer',
unknownNumber: 'Anonym',
unavailable: 'Nicht verfügbar',
viewDetails: 'Details anzeigen',
'phoneSource.systemUser': '(Systembenutzer)',
'phoneSource.account': '(Konto)',
'phoneSource.contact': '(Kontakt)',
'phoneSource.lead': '(Lead)',
'phoneType.phone': '(Telefon)',
'phoneType.home': '(Telefon (privat))',
'phoneType.business': '(Telefon (geschäftlich))',
'phoneType.mobile': '(Mobiltelefon)',
'phoneType.unknown': '(Unbekannter Telefontyp)',
'phoneSource.systemUser': 'Systembenutzer',
'phoneSource.account': 'Konto',
'phoneSource.contact': 'Kontakt',
'phoneSource.lead': 'Lead',
'phoneType.phone': 'Telefon',
'phoneType.home': 'Telefon privat',
'phoneType.business': 'Telefon geschäftlich',
'phoneType.mobile': 'Mobiltelefon',
'phoneType.unknown': 'Unbekannter Telefontyp',
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/en-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ export default {
logging: 'Logging...',
logCall: 'Log Call',
editLog: 'Edit Log',
select: 'Select a Matching Record',
select: 'Select a matching record',
OnHold: 'On Hold',
Ringing: 'Ringing',
CallConnected: 'Call Connected',
unknownUser: 'Unknown User',
unknownNumber: 'Anonymous',
unavailable: 'Unavailable',
viewDetails: 'View Details',
'phoneSource.systemUser': '(System User)',
'phoneSource.account': '(Account)',
'phoneSource.contact': '(Contact)',
'phoneSource.lead': '(Lead)',
'phoneType.phone': '(Phone)',
'phoneType.home': '(Home Phone)',
'phoneType.business': '(Business Phone)',
'phoneType.mobile': '(Mobile Phone)',
'phoneType.unknown': '(Unknown Phone Type)',
'phoneSource.systemUser': 'System User',
'phoneSource.account': 'Account',
'phoneSource.contact': 'Contact',
'phoneSource.lead': 'Lead',
'phoneType.phone': 'Phone',
'phoneType.home': 'Home Phone',
'phoneType.business': 'Business Phone',
'phoneType.mobile': 'Mobile Phone',
'phoneType.unknown': 'Unknown Phone Type',
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/en-GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ export default {
logging: 'Logging...',
logCall: 'Log Call',
editLog: 'Edit Log',
select: 'Select a Matching Record',
select: 'Select a matching record',
OnHold: 'On Hold',
Ringing: 'Ringing',
CallConnected: 'Call Connected',
unknownUser: 'Unknown User',
unknownNumber: 'Anonymous',
unavailable: 'Unavailable',
viewDetails: 'View Details',
'phoneSource.systemUser': '(System User)',
'phoneSource.account': '(Account)',
'phoneSource.contact': '(Contact)',
'phoneSource.lead': '(Lead)',
'phoneType.phone': '(Phone)',
'phoneType.home': '(Home Phone)',
'phoneType.business': '(Business Phone)',
'phoneType.mobile': '(Mobile Phone)',
'phoneType.unknown': '(Unknown Phone Type)',
'phoneSource.systemUser': 'System User',
'phoneSource.account': 'Account',
'phoneSource.contact': 'Contact',
'phoneSource.lead': 'Lead',
'phoneType.phone': 'Phone',
'phoneType.home': 'Home Phone',
'phoneType.business': 'Business Phone',
'phoneType.mobile': 'Mobile Phone',
'phoneType.unknown': 'Unknown Phone Type',
};
22 changes: 11 additions & 11 deletions src/components/CallItem/i18n/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ export default {
logging: 'Logging...',
logCall: 'Log Call',
editLog: 'Edit Log',
select: 'Select a Matching Record',
select: 'Select a matching record',
OnHold: 'On Hold',
Ringing: 'Ringing',
CallConnected: 'Call Connected',
unknownUser: 'Unknown User',
unknownNumber: 'Anonymous',
unavailable: 'Unavailable',
viewDetails: 'View Details',
'phoneSource.systemUser': '(System User)',
'phoneSource.account': '(Account)',
'phoneSource.contact': '(Contact)',
'phoneSource.lead': '(Lead)',
'phoneSource.opportunity': '(Opportunity)',
'phoneType.phone': '(Phone)',
'phoneType.home': '(Home Phone)',
'phoneType.business': '(Business Phone)',
'phoneType.mobile': '(Mobile Phone)',
'phoneType.unknown': '(Unknown Phone Type)',
'phoneSource.systemUser': 'System User',
'phoneSource.account': 'Account',
'phoneSource.contact': 'Contact',
'phoneSource.lead': 'Lead',
'phoneSource.opportunity': 'Opportunity',
'phoneType.phone': 'Phone',
'phoneType.home': 'Home Phone',
'phoneType.business': 'Business Phone',
'phoneType.mobile': 'Mobile Phone',
'phoneType.unknown': 'Unknown Phone Type',
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/es-419.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export default {
unknownNumber: 'Anónimo',
unavailable: 'No disponible',
viewDetails: 'Ver detalles',
'phoneSource.systemUser': '(Usuario del sistema)',
'phoneSource.account': '(Cuenta)',
'phoneSource.contact': '(Contactos)',
'phoneSource.lead': '(Posible cliente)',
'phoneSource.opportunity': '(Candidato a posible cliente)',
'phoneType.phone': '(Teléfono)',
'phoneType.home': '(Teléfono fijo)',
'phoneType.business': '(Teléfono del trabajo)',
'phoneType.mobile': '(Teléfono celular)',
'phoneType.unknown': '(Tipo de teléfono desconocido)',
'phoneSource.systemUser': 'Usuario del sistema',
'phoneSource.account': 'Cuenta',
'phoneSource.contact': 'Contactos',
'phoneSource.lead': 'Posible cliente',
'phoneSource.opportunity': 'Candidato a posible cliente',
'phoneType.phone': 'Teléfono',
'phoneType.home': 'Teléfono fijo',
'phoneType.business': 'Teléfono del trabajo',
'phoneType.mobile': 'Teléfono celular',
'phoneType.unknown': 'Tipo de teléfono desconocido',
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/es-ES.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export default {
unknownNumber: 'Anónimo',
unavailable: 'No disponible',
viewDetails: 'Ver detalles',
'phoneSource.systemUser': '(Usuario del sistema)',
'phoneSource.account': '(Cuenta)',
'phoneSource.contact': '(Contactos)',
'phoneSource.lead': '(Posible cliente)',
'phoneSource.opportunity': '(Candidato a posible cliente)',
'phoneType.phone': '(Teléfono)',
'phoneType.home': '(Teléfono fijo)',
'phoneType.business': '(Teléfono del trabajo)',
'phoneType.mobile': '(Teléfono móvil)',
'phoneType.unknown': '(Tipo de teléfono desconocido)',
'phoneSource.systemUser': 'Usuario del sistema',
'phoneSource.account': 'Cuenta',
'phoneSource.contact': 'Contactos',
'phoneSource.lead': 'Posible cliente',
'phoneSource.opportunity': 'Candidato a posible cliente',
'phoneType.phone': 'Teléfono',
'phoneType.home': 'Teléfono fijo',
'phoneType.business': 'Teléfono del trabajo',
'phoneType.mobile': 'Teléfono móvil',
'phoneType.unknown': 'Tipo de teléfono desconocido',
};
18 changes: 9 additions & 9 deletions src/components/CallItem/i18n/fr-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export default {
unknownNumber: 'Anonyme',
unavailable: 'Non disponible',
viewDetails: 'Afficher les détails',
'phoneSource.systemUser': '(Utilisateur système)',
'phoneSource.account': '(Compte)',
'phoneSource.contact': '(Contact)',
'phoneSource.lead': '(Piste)',
'phoneType.phone': '(Téléphone)',
'phoneType.home': '(Téléphone domicile)',
'phoneType.business': '(Téléphone bureau)',
'phoneType.mobile': '(Téléphone mobile)',
'phoneType.unknown': '(Type de téléphone inconnu)',
'phoneSource.systemUser': 'Utilisateur système',
'phoneSource.account': 'Compte',
'phoneSource.contact': 'Contact',
'phoneSource.lead': 'Piste',
'phoneType.phone': 'Téléphone',
'phoneType.home': 'Téléphone domicile',
'phoneType.business': 'Téléphone bureau',
'phoneType.mobile': 'Téléphone mobile',
'phoneType.unknown': 'Type de téléphone inconnu',
};
18 changes: 9 additions & 9 deletions src/components/CallItem/i18n/fr-FR.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export default {
unknownNumber: 'Anonyme',
unavailable: 'Non disponible',
viewDetails: 'Afficher les détails',
'phoneSource.systemUser': '(Utilisateur système)',
'phoneSource.account': '(Compte)',
'phoneSource.contact': '(Contact)',
'phoneSource.lead': '(Piste)',
'phoneType.phone': '(Téléphone)',
'phoneType.home': '(Téléphone domicile)',
'phoneType.business': '(Téléphone bureau)',
'phoneType.mobile': '(Téléphone mobile)',
'phoneType.unknown': '(Type de téléphone inconnu)',
'phoneSource.systemUser': 'Utilisateur système',
'phoneSource.account': 'Compte',
'phoneSource.contact': 'Contact',
'phoneSource.lead': 'Piste',
'phoneType.phone': 'Téléphone',
'phoneType.home': 'Téléphone domicile',
'phoneType.business': 'Téléphone bureau',
'phoneType.mobile': 'Téléphone mobile',
'phoneType.unknown': 'Type de téléphone inconnu',
};
20 changes: 10 additions & 10 deletions src/components/CallItem/i18n/it-IT.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export default {
unknownNumber: 'Anonimo',
unavailable: 'Non disponibile',
viewDetails: 'Visualizza dettagli',
'phoneSource.systemUser': '(Utente di sistema)',
'phoneSource.account': '(Account)',
'phoneSource.contact': '(Contatto)',
'phoneSource.lead': '(Lead)',
'phoneSource.opportunity': '(Opportunità)',
'phoneType.phone': '(Telefono)',
'phoneType.home': '(Telefono abitazione)',
'phoneType.business': '(Telefono azienda)',
'phoneType.mobile': '(Telefono cellulare)',
'phoneType.unknown': '(Tipo di telefono sconosciuto)',
'phoneSource.systemUser': 'Utente di sistema',
'phoneSource.account': 'Account',
'phoneSource.contact': 'Contatto',
'phoneSource.lead': 'Lead',
'phoneSource.opportunity': 'Opportunità',
'phoneType.phone': 'Telefono',
'phoneType.home': 'Telefono abitazione',
'phoneType.business': 'Telefono azienda',
'phoneType.mobile': 'Telefono cellulare',
'phoneType.unknown': 'Tipo di telefono sconosciuto',
};
8 changes: 5 additions & 3 deletions src/components/CallItem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default class CallItem extends Component {
}

createSelectedContact = async (entityType) => {
console.log('click createSelectedContact!!', entityType);
// console.log('click createSelectedContact!!', entityType);
if (typeof this.props.onCreateContact === 'function' &&
this._mounted &&
!this.state.isCreating) {
Expand All @@ -173,7 +173,7 @@ export default class CallItem extends Component {
this.setState({
isCreating: false,
});
console.log('created: isCreating...', this.state.isCreating);
// console.log('created: isCreating...', this.state.isCreating);
}
}
}
Expand Down Expand Up @@ -270,6 +270,7 @@ export default class CallItem extends Component {
className={classnames(
styles.contactDisplay,
missed && styles.missed,
active && styles.active,
)}
contactMatches={contactMatches}
selected={this.state.selected}
Expand All @@ -280,7 +281,8 @@ export default class CallItem extends Component {
areaCode={areaCode}
countryCode={countryCode}
phoneNumber={phoneNumber}
currentLocale={currentLocale} />
currentLocale={currentLocale}
/>
<div className={styles.details} >
{durationEl} | {dateEl}{statusEl}
</div>
Expand Down
16 changes: 13 additions & 3 deletions src/components/CallItem/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
color: #666;
}
.activeCall {
color: #23B23D;
color: $active;
}

@keyframes ringing {
0% {
text-shadow: 0px 0px 1px #23B23D;
text-shadow: 0px 0px 1px $active;
}
100% {
color: #2ce44d;
Expand Down Expand Up @@ -62,5 +62,15 @@
}

.missed {
color: #D9282f;
color: $missed;
button {
color: $missed;
}
}

.active {
color: $active;
button {
color: $missed;
}
}
20 changes: 10 additions & 10 deletions src/components/ContactDisplay/i18n/de-DE.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ export default {
logging: 'Protokollierung ...',
logCall: 'Anruf protokollieren',
editLog: 'Protokoll bearbeiten',
select: 'Übereinstimmenden Datensatz auswählen',
select: 'Übereinstimmenden datensatz auswählen',
OnHold: 'Wird gehalten',
Ringing: 'Es wird angerufen',
CallConnected: 'Anruf verbunden',
unknownUser: 'Unbekannter Benutzer',
unknownNumber: 'Anonym',
unavailable: 'Nicht verfügbar',
viewDetails: 'Details anzeigen',
'phoneSource.systemUser': '(Systembenutzer)',
'phoneSource.account': '(Konto)',
'phoneSource.contact': '(Kontakt)',
'phoneSource.lead': '(Lead)',
'phoneType.phone': '(Telefon)',
'phoneType.home': '(Telefon (privat))',
'phoneType.business': '(Telefon (geschäftlich))',
'phoneType.mobile': '(Mobiltelefon)',
'phoneType.unknown': '(Unbekannter Telefontyp)',
'phoneSource.systemUser': 'Systembenutzer',
'phoneSource.account': 'Konto',
'phoneSource.contact': 'Kontakt',
'phoneSource.lead': 'Lead',
'phoneType.phone': 'Telefon',
'phoneType.home': 'Telefon privat',
'phoneType.business': 'Telefon geschäftlich',
'phoneType.mobile': 'Mobiltelefon',
'phoneType.unknown': 'Unbekannter Telefontyp',
};
Loading

0 comments on commit 74f9a39

Please sign in to comment.