Skip to content
This repository has been archived by the owner on Jan 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #42 from friendsofagape/dist
Browse files Browse the repository at this point in the history
Changes seem good to me.
  • Loading branch information
joelthe1 authored Aug 7, 2018
2 parents 146c07f + fdbe42b commit 768d1ed
Show file tree
Hide file tree
Showing 16 changed files with 173 additions and 155 deletions.
15 changes: 14 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"name": "Autographa",
"productName": "Autographa Lite",
"description": "A Bible translation editor for everyone.",
"version": "1.2.0",
"version": "1.2.1",
"main": "src/app.js",
"author": "Friends of Agape <[email protected]>",
"license": "MIT" ,
"build": {
"extends": null,
"appId": "oa.autographa.lite",
Expand All @@ -16,6 +18,17 @@
"directories": {
"buildResources": "resources"
},
"mac": {
"category": "public.app-category.Utilities",
"target": "dmg",
"icon": "resources/icon.icns",
"type": "distribution"
},
"linux": {
"target": [
"deb"
]
},
"publish": null
},
"keywords": [
Expand Down
Binary file added resources/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/icons/512X512.png
Binary file not shown.
Binary file added resources/icons/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var AboutUsModel = function(props) {
</div>
<div className="col-xs-6" style={{padding:"5px"}}>
<h3><FormattedMessage id="app-name-Autographa-Lite" /></h3>
<p><FormattedMessage id="label-version" /> <span>1.2.0</span></p>
<p><FormattedMessage id="label-version" /> <span>1.2.1</span></p>
<p><FormattedMessage id="label-hosted-url" /></p>
<p>https://github.com/friendsofagape/autographa-lite.git</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/AutographaStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class AutographaStore {
// @observable contentThree =''
@observable bookActive = 1;
@observable chapterActive = 1
@observable currentRef = 'eng_irv'
@observable currentRef = 'eng_ult'
@observable bookData = Constant.booksList
@observable bookName = ''
@observable translationContent = ''
Expand Down Expand Up @@ -52,7 +52,7 @@ export class AutographaStore {
@observable refList = []
@observable refListEdit = []
@observable refListExist = []
@observable activeRefs = {0: "eng_irv", 1: "eng_irv", 2: "eng_irv"}
@observable activeRefs = {0: "eng_ult", 1: "eng_ult", 2: "eng_ult"}
@observable transSaveTime = ""
@observable replaceOption = "chapter"
@observable toggle = false
Expand Down
6 changes: 3 additions & 3 deletions src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class Navbar extends React.Component {
data: Constant,
chapData: [],
bookNo:1,
defaultRef: 'eng_irv',
defaultRefOne: 'eng_irv',
defaultRef: 'eng_ult',
defaultRefOne: 'eng_ult',
refList: [],
searchVal: "",
replaceVal:"",
Expand Down Expand Up @@ -324,7 +324,7 @@ class Navbar extends React.Component {
AutographaStore.verses = doc.chapters[parseInt(AutographaStore.chapterId, 10) - 1].verses;
AutographaStore.chunks = chunkDoc.chunks[parseInt(AutographaStore.bookId, 10) - 1];
chapter = AutographaStore.chapterId;
that.getRefContents('eng_irv'+'_'+Constant.bookCodeList[parseInt(AutographaStore.bookId, 10) - 1],chapter.toString());
that.getRefContents('eng_ult'+'_'+Constant.bookCodeList[parseInt(AutographaStore.bookId, 10) - 1],chapter.toString());
});
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Reference.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Reference extends React.Component {

constructor(props){
super(props);
this.state = { verses: [], defaultRef: 'eng_irv', refList: [] } ;
this.state = { verses: [], defaultRef: 'eng_ult', refList: [] } ;
let existRef = [];
AutographaStore.refList = [];
let refLists = refDb.get('refs').then((doc) => {
Expand Down
132 changes: 66 additions & 66 deletions src/lib/eng_irv.json → src/lib/eng_ult.json

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions src/lib/eng_isv.json → src/lib/eng_ust.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/lib/refs_config.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"_id":"refs", "ref_ids":[{"ref_id":"eng_irv", "ref_lang_code": "eng", "ref_name":"English-IRV", "isDefault":true}, {"ref_id":"eng_isv", "ref_lang_code": "eng", "ref_name":"English-ISV", "isDefault":false}, {"ref_id":"hin_irv", "ref_lang_code": "hin", "ref_name":"Hindi-IRV", "isDefault":false}, {"ref_id":"arb_vdt", "ref_lang_code": "arb", "ref_name":"Arabic-VDT", "isDefault":false}]}, {"_id":"ref_history", "visit_history":[{"book":"Genesis", "chapter":"1", "bookId": "1"}]}, {"_id": "autoupdate", "enable": false, "updateDownload": false}, {"_id": "app_locale", "appLang": "en"}, {"_id": "appFirstRun", "isFirstRun": true }, {"_id": "activeRefs", "activeRefs": {"0": "eng_irv", "1": "eng_irv", "2": "eng_irv"}}, {"_id": "targetReferenceLayout", "layout": 1}]
[{"_id":"refs", "ref_ids":[{"ref_id":"eng_ult", "ref_lang_code": "eng", "ref_name":"English-ULT", "isDefault":true}, {"ref_id":"eng_ust", "ref_lang_code": "eng", "ref_name":"English-UST", "isDefault":false}, {"ref_id":"hin_irv", "ref_lang_code": "hin", "ref_name":"Hindi-IRV", "isDefault":false}, {"ref_id":"arb_vdt", "ref_lang_code": "arb", "ref_name":"Arabic-VDT", "isDefault":false}]}, {"_id":"ref_history", "visit_history":[{"book":"Genesis", "chapter":"1", "bookId": "1"}]}, {"_id": "autoupdate", "enable": false, "updateDownload": false}, {"_id": "app_locale", "appLang": "en"}, {"_id": "appFirstRun", "isFirstRun": true }, {"_id": "activeRefs", "activeRefs": {"0": "eng_ult", "1": "eng_ult", "2": "eng_ult"}}, {"_id": "targetReferenceLayout", "layout": 1}]
13 changes: 9 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ const session = require('electron').session;
const {app} = electron
// Module to create native browser window.
const {BrowserWindow} = electron;
import path from "path";
import url from "url";
import env from "env";
import path from 'path';
import url from 'url';
import env from 'env';

import {existsSync, mkdirSync} from 'fs'


// Keep a global reference of the window object, if you don't, the window will
Expand Down Expand Up @@ -68,7 +70,10 @@ function createWindow() {
}

var dbSetup = new Promise(
function (resolve, reject) {
function (resolve, reject) {
if ( !existsSync('db') ) {
mkdirSync( 'db' );
}
// Setup database.
var dbUtil = require(`${__dirname}/util/DbUtil.js`);
dbUtil.setupTargetDb
Expand Down
4 changes: 2 additions & 2 deletions src/util/DbUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ module.exports = {
resolve('ReferenceDB exists.');
})
.catch(function (err) {
const refEnUlbJson = require(`${__dirname}/../lib/eng_irv.json`),
refEnUdbJson = require(`${__dirname}/../lib/eng_isv.json`),
const refEnUlbJson = require(`${__dirname}/../lib/eng_ult.json`),
refEnUdbJson = require(`${__dirname}/../lib/eng_ust.json`),
refHiUlbJson = require(`${__dirname}/../lib/hin_irv.json`),
refArbVdtJson = require(`${__dirname}/../lib/arb_vdt.json`),
chunksJson = require(`${__dirname}/../lib/chunks.json`),
Expand Down
2 changes: 1 addition & 1 deletion src/util/constants.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions tests/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe('Autographa Test', () => {
it('should click the ref drop down', () => {
return app.client.waitUntilWindowLoaded()
.click(".ref-drop-down")
.getValue('.ref-drop-down').should.eventually.equal('eng_irv')
.getValue('.ref-drop-down').should.eventually.equal('eng_ult')
});

it('should check the verse in translation panel', ()=>{
Expand All @@ -115,7 +115,7 @@ describe('Autographa Test', () => {
return app.client.waitUntilWindowLoaded()
.click(".ref-drop-down")
.selectByIndex(".ref-drop-down", 1)
.getValue('.ref-drop-down').should.eventually.equal('eng_isv');
.getValue('.ref-drop-down').should.eventually.equal('eng_ust');
});


Expand All @@ -133,11 +133,11 @@ describe('Autographa Test', () => {
.getAttribute("div[data-verse='r1']", 'style').should.eventually.equal('background-color: rgba(11, 130, 255, 0.1); padding-left: 10px; padding-right: 10px; border-radius: 10px;')
});

it('should change the ref drop down text eng_irv', () => {
it('should change the ref drop down text eng_ult', () => {
return app.client.waitUntilWindowLoaded()
.click(".ref-drop-down")
.selectByIndex(".ref-drop-down", 0)
.getValue('.ref-drop-down').should.eventually.equal('eng_irv');
.getValue('.ref-drop-down').should.eventually.equal('eng_ult');
});

it('should open the settings popup and save setting', () => {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3921,9 +3921,9 @@ electron-winstaller@^2.5.1:
lodash.template "^4.2.2"
temp "^0.8.3"

[email protected].1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.1.tgz#d9defcc187862143b9027378be78490eddbfabf4"
[email protected].3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.3.tgz#8e591e820cae2ccdb0c3fd74c6d07834913fc133"
dependencies:
"@types/node" "^8.0.24"
electron-download "^3.0.1"
Expand Down

0 comments on commit 768d1ed

Please sign in to comment.