Skip to content

Commit

Permalink
Merge pull request #2 from nyaruka/master
Browse files Browse the repository at this point in the history
Up merge with base repository
  • Loading branch information
johncordeiro authored Dec 26, 2019
2 parents 9b5002d + 123968a commit 18341ac
Show file tree
Hide file tree
Showing 130 changed files with 6,171 additions and 4,097 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ jobs:
env:
CI: true
- name: Publish
uses: actions/npm@master
run: |
npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
npm publish
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
with:
args: publish
CI: true
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,56 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v1.7.9](https://github.com/nyaruka/floweditor/compare/v1.7.8...v1.7.9)

> 20 December 2019
- Add conditional validation for urls [`#773`](https://github.com/nyaruka/floweditor/pull/773)

#### [v1.7.8](https://github.com/nyaruka/floweditor/compare/v1.7.7...v1.7.8)

> 17 December 2019
- Add facebook topic selection [`#770`](https://github.com/nyaruka/floweditor/pull/770)
- Add pt translations [`#769`](https://github.com/nyaruka/floweditor/pull/769)

#### [v1.7.7](https://github.com/nyaruka/floweditor/compare/v1.7.6...v1.7.7)

> 4 December 2019
- Call npm directly for publish [`ce3d8f4`](https://github.com/nyaruka/floweditor/commit/ce3d8f44aeb55b80aa759a033711733baae33cfa)

#### [v1.7.6](https://github.com/nyaruka/floweditor/compare/v1.7.5...v1.7.6)

> 4 December 2019
- Tweak css for split by contact field [`#766`](https://github.com/nyaruka/floweditor/pull/766)
- Allow messages with only spaces [`#765`](https://github.com/nyaruka/floweditor/pull/765)
- Disambiguate simulator email i18n key [`#764`](https://github.com/nyaruka/floweditor/pull/764)
- Tweak email keys to be more universal [`c138bdf`](https://github.com/nyaruka/floweditor/commit/c138bdf13c3d851e4a995511c00f550cad07a0d7)

#### [v1.7.5](https://github.com/nyaruka/floweditor/compare/v1.7.4...v1.7.5)

> 2 December 2019
- Globals completion [`#760`](https://github.com/nyaruka/floweditor/pull/760)
- Render email_sent events in simulator [`#759`](https://github.com/nyaruka/floweditor/pull/759)
- Add globals to completion [`0125844`](https://github.com/nyaruka/floweditor/commit/0125844bff165ff959731a67117cace671abf2a8)
- Update tests [`924dc86`](https://github.com/nyaruka/floweditor/commit/924dc86604f05ed3dd9aac9040976f99b308edf7)

#### [v1.7.4](https://github.com/nyaruka/floweditor/compare/v1.7.3...v1.7.4)

> 20 November 2019
- Don't scroll canvas when dialog is open [`#754`](https://github.com/nyaruka/floweditor/pull/754)
- Exclude dynamic groups from remove from group action [`#753`](https://github.com/nyaruka/floweditor/pull/753)
- Package Audit [`#748`](https://github.com/nyaruka/floweditor/pull/748)
- Add twitter handle scheme back in [`#752`](https://github.com/nyaruka/floweditor/pull/752)
- Add localization [`#744`](https://github.com/nyaruka/floweditor/pull/744)
- Update react and react-redux as part of security audit [`23a6da6`](https://github.com/nyaruka/floweditor/commit/23a6da6c3a2f986f7e0a825d57d77136eb3129aa)
- Remove FlipMove, rewrite Webook test in RTL [`314f4a1`](https://github.com/nyaruka/floweditor/commit/314f4a1d2d979ffba2100c2c6548a11c4f608a4d)
- More updates for new react-select [`391035b`](https://github.com/nyaruka/floweditor/commit/391035b7f0453f575e37f0688e77792c9bf75638)

#### [v1.7.3](https://github.com/nyaruka/floweditor/compare/v1.7.2...v1.7.3)

> 28 October 2019
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Flow Editor

[![Build Status](https://github.com/nyaruka/floweditor/workflows/Build/badge.svg)](https://github.com/nyaruka/floweditor/actions?workflow=Build)
[![codecov](https://codecov.io/gh/nyaruka/floweditor/branch/master/graph/badge.svg)](https://codecov.io/gh/nyaruka/floweditor)
[![Maintainability](https://api.codeclimate.com/v1/badges/c2200da1ba5a0176836e/maintainability)](https://codeclimate.com/github/nyaruka/floweditor/maintainability)
Expand Down Expand Up @@ -46,6 +47,16 @@ Then you are ready to fire up the development server for the editor.
% yarn start
```

### Localization

The project is fully localized using `i18next` and leans on `react-i18next` to integrate it inside components. To generate new keys and defaults for localization, we use `i18next-scanner`. Use the yarn command `scan` to update localization keys.

```bash
% yarn scan
```

This file is then uploaded to Transifex for broad language translations. Once a language reaches full translation, it will be merged into the project.

### Running Tests

This project uses [Jest](https://facebook.github.io/jest/) for unit/snapshot testing and [react-testing-library](https://testing-library.com/docs/react-testing-library/intro) where we can. The project has some older more complex tests that use [Enzyme](https://github.com/airbnb/enzyme). Typescript and Jest are integrated via [ts-jest](https://github.com/kulshekhar/ts-jest).
Expand Down
Empty file modified fonts/floweditor/Read Me.txt
100755 → 100644
Empty file.
154 changes: 77 additions & 77 deletions fonts/floweditor/demo-files/demo.css
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,172 +1,172 @@
body {
padding: 0;
margin: 0;
font-family: sans-serif;
font-size: 1em;
line-height: 1.5;
color: #555;
background: #fff;
padding: 0;
margin: 0;
font-family: sans-serif;
font-size: 1em;
line-height: 1.5;
color: #555;
background: #fff;
}
h1 {
font-size: 1.5em;
font-weight: normal;
font-size: 1.5em;
font-weight: normal;
}
small {
font-size: 0.66666667em;
font-size: 0.66666667em;
}
a {
color: #e74c3c;
text-decoration: none;
color: #e74c3c;
text-decoration: none;
}
a:hover,
a:focus {
box-shadow: 0 1px #e74c3c;
box-shadow: 0 1px #e74c3c;
}
.bshadow0,
input {
box-shadow: inset 0 -2px #e7e7e7;
box-shadow: inset 0 -2px #e7e7e7;
}
input:hover {
box-shadow: inset 0 -2px #ccc;
box-shadow: inset 0 -2px #ccc;
}
input,
fieldset {
font-family: sans-serif;
font-size: 1em;
margin: 0;
padding: 0;
border: 0;
font-family: sans-serif;
font-size: 1em;
margin: 0;
padding: 0;
border: 0;
}
input {
color: inherit;
line-height: 1.5;
height: 1.5em;
padding: 0.25em 0;
color: inherit;
line-height: 1.5;
height: 1.5em;
padding: 0.25em 0;
}
input:focus {
outline: none;
box-shadow: inset 0 -2px #449fdb;
outline: none;
box-shadow: inset 0 -2px #449fdb;
}
.glyph {
font-size: 16px;
width: 15em;
padding-bottom: 1em;
margin-right: 4em;
margin-bottom: 1em;
float: left;
overflow: hidden;
font-size: 16px;
width: 15em;
padding-bottom: 1em;
margin-right: 4em;
margin-bottom: 1em;
float: left;
overflow: hidden;
}
.liga {
width: 80%;
width: calc(100% - 2.5em);
width: 80%;
width: calc(100% - 2.5em);
}
.talign-right {
text-align: right;
text-align: right;
}
.talign-center {
text-align: center;
text-align: center;
}
.bgc1 {
background: #f1f1f1;
background: #f1f1f1;
}
.fgc1 {
color: #999;
color: #999;
}
.fgc0 {
color: #000;
color: #000;
}
p {
margin-top: 1em;
margin-bottom: 1em;
margin-top: 1em;
margin-bottom: 1em;
}
.mvm {
margin-top: 0.75em;
margin-bottom: 0.75em;
margin-top: 0.75em;
margin-bottom: 0.75em;
}
.mtn {
margin-top: 0;
margin-top: 0;
}
.mtl,
.mal {
margin-top: 1.5em;
margin-top: 1.5em;
}
.mbl,
.mal {
margin-bottom: 1.5em;
margin-bottom: 1.5em;
}
.mal,
.mhl {
margin-left: 1.5em;
margin-right: 1.5em;
margin-left: 1.5em;
margin-right: 1.5em;
}
.mhmm {
margin-left: 1em;
margin-right: 1em;
margin-left: 1em;
margin-right: 1em;
}
.mls {
margin-left: 0.25em;
margin-left: 0.25em;
}
.ptl {
padding-top: 1.5em;
padding-top: 1.5em;
}
.pbs,
.pvs {
padding-bottom: 0.25em;
padding-bottom: 0.25em;
}
.pvs,
.pts {
padding-top: 0.25em;
padding-top: 0.25em;
}
.unit {
float: left;
float: left;
}
.unitRight {
float: right;
float: right;
}
.size1of2 {
width: 50%;
width: 50%;
}
.size1of1 {
width: 100%;
width: 100%;
}
.clearfix:before,
.clearfix:after {
content: ' ';
display: table;
content: ' ';
display: table;
}
.clearfix:after {
clear: both;
clear: both;
}
.hidden-true {
display: none;
display: none;
}
.textbox0 {
width: 3em;
background: #f1f1f1;
padding: 0.25em 0.5em;
line-height: 1.5;
height: 1.5em;
width: 3em;
background: #f1f1f1;
padding: 0.25em 0.5em;
line-height: 1.5;
height: 1.5em;
}
#testDrive {
display: block;
padding-top: 24px;
line-height: 1.5;
display: block;
padding-top: 24px;
line-height: 1.5;
}
.fs0 {
font-size: 16px;
font-size: 16px;
}
.fs1 {
font-size: 24px;
font-size: 16px;
}
.fs2 {
font-size: 32px;
font-size: 24px;
}
.fs3 {
font-size: 28px;
font-size: 32px;
}
.fs4 {
font-size: 16px;
font-size: 28px;
}
.fs5 {
font-size: 20px;
font-size: 20px;
}
40 changes: 20 additions & 20 deletions fonts/floweditor/demo-files/demo.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
if (!('boxShadow' in document.body.style)) {
document.body.setAttribute('class', 'noBoxShadow');
document.body.setAttribute('class', 'noBoxShadow');
}

document.body.addEventListener('click', function(e) {
var target = e.target;
if (target.tagName === 'INPUT' && target.getAttribute('class').indexOf('liga') === -1) {
target.select();
}
var target = e.target;
if (target.tagName === 'INPUT' && target.getAttribute('class').indexOf('liga') === -1) {
target.select();
}
});

(function() {
var fontSize = document.getElementById('fontSize'),
testDrive = document.getElementById('testDrive'),
testText = document.getElementById('testText');
function updateTest() {
testDrive.innerHTML = testText.value || String.fromCharCode(160);
if (window.icomoonLiga) {
window.icomoonLiga(testDrive);
}
}
function updateSize() {
testDrive.style.fontSize = fontSize.value + 'px';
var fontSize = document.getElementById('fontSize'),
testDrive = document.getElementById('testDrive'),
testText = document.getElementById('testText');
function updateTest() {
testDrive.innerHTML = testText.value || String.fromCharCode(160);
if (window.icomoonLiga) {
window.icomoonLiga(testDrive);
}
fontSize.addEventListener('change', updateSize, false);
testText.addEventListener('input', updateTest, false);
testText.addEventListener('change', updateTest, false);
updateSize();
}
function updateSize() {
testDrive.style.fontSize = fontSize.value + 'px';
}
fontSize.addEventListener('change', updateSize, false);
testText.addEventListener('input', updateTest, false);
testText.addEventListener('change', updateTest, false);
updateSize();
})();
Loading

0 comments on commit 18341ac

Please sign in to comment.