mirror of
https://github.com/getbible/app.git
synced 2024-11-16 01:57:14 +00:00
solved conflicts
This commit is contained in:
Erastus Amunwe
commit
f472fd0530
@ -1,118 +1,127 @@
|
|||||||
<template>
|
<template>
|
||||||
<nav class="uk-navbar-container uk-navbar-transparent uk-margin" uk-navbar>
|
<div class="uk-margin uk-container">
|
||||||
<div class="uk-navbar-left">
|
<div class="uk-margin uk-align-right">
|
||||||
|
|
||||||
<a class="uk-navbar-item uk-logo" href="#">GetBible</a>
|
<a href="https://github.com/getbible" class="uk-icon-button uk-margin-small-left" uk-icon="github"></a>
|
||||||
|
<a href="https://www.facebook.com/TheHolyScriptures" class="uk-icon-button uk-margin-small-left" uk-icon="facebook"></a>
|
||||||
|
<a href="https://truechristian.church/whybible" class="uk-icon-button uk-margin-small-left" uk-icon="world"></a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<a href="#offcanvas-slide" class="uk-navbar-item uk-search uk-search-default" uk-toggle><span uk-icon="icon: search; ratio:2"></span></a>
|
<nav class="uk-navbar-container uk-navbar-transparent uk-margin" uk-navbar>
|
||||||
|
<div class="uk-navbar-left">
|
||||||
|
|
||||||
<div id="offcanvas-slide" uk-offcanvas>
|
<a class="uk-navbar-item uk-logo" href="#">GetBible</a>
|
||||||
<div class="uk-offcanvas-bar">
|
|
||||||
|
|
||||||
<div class="uk-nav uk-nav-default">
|
<a href="#offcanvas-slide" class="uk-navbar-item uk-search uk-search-default" uk-toggle><span uk-icon="icon: search; ratio:2"></span>Search</a>
|
||||||
<div class="uk-margin">
|
|
||||||
<form class="uk-search uk-search-default" action="javascript:void(0)">
|
|
||||||
<!-- <span uk-search-icon></span> -->
|
|
||||||
<input class="uk-search-input" v-model="search" type="search" placeholder="Search Words...">
|
|
||||||
<div class="uk-margin">
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Search</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div>
|
<div id="offcanvas-slide" uk-offcanvas>
|
||||||
|
<div class="uk-offcanvas-bar">
|
||||||
|
|
||||||
<div class="uk-margin">
|
<div class="uk-nav uk-nav-default">
|
||||||
|
<div class="uk-margin">
|
||||||
|
<form class="uk-search uk-search-default" action="javascript:void(0)">
|
||||||
|
<!-- <span uk-search-icon></span> -->
|
||||||
|
<input class="uk-search-input" v-model="search" type="search" placeholder="Search Words...">
|
||||||
|
<div class="uk-margin">
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">Search</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="uk-margin">
|
<div class="uk-margin">
|
||||||
<div class="uk-button-group">
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">All</button>
|
<div class="uk-margin">
|
||||||
<button class="uk-button uk-button-default uk-button-small">Any</button>
|
<div class="uk-button-group">
|
||||||
<button class="uk-button uk-button-default uk-button-small">Phrase</button>
|
<button class="uk-button uk-button-default uk-button-small uk-active">ALL WORDS</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">ANY WORDS</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">PHRASE</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<div class="uk-button-group">
|
||||||
|
<button class="uk-button uk-button-default uk-button-small uk-active">BIBLE</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">OT</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">NT</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">CHAPTER</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<div class="uk-button-group">
|
||||||
|
<button class="uk-button uk-button-default uk-button-small uk-active">EXACT MATCH</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">PARTIAL MATCH</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<div class="uk-button-group">
|
||||||
|
<button class="uk-button uk-button-default uk-button-small uk-active">CASE INSENSITIVE</button>
|
||||||
|
<button class="uk-button uk-button-default uk-button-small">CASE SENSITIVE</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-margin">
|
|
||||||
<div class="uk-button-group">
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<div class="uk-button-group">
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin">
|
|
||||||
<div class="uk-button-group">
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<button class="uk-button uk-button-default uk-button-small">Button</button>
|
|
||||||
<!-- <button class="uk-button uk-button-default">Button</button> -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- <span class="uk-label uk-label-primary"><span class="uk-badge uk-badge-danger">{{ num_of_tr}} </span>Translations Available</span> -->
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<a class="uk-navbar-item uk-position-center-right" href="#modal-sections" uk-toggle><span uk-icon="icon: cog; ratio:2"></span></a>
|
|
||||||
|
|
||||||
<div id="modal-sections" uk-modal>
|
|
||||||
<div class="uk-modal-dialog">
|
|
||||||
<button class="uk-modal-close-default" type="button" uk-close></button>
|
|
||||||
<div class="uk-modal-header">
|
|
||||||
<h2 class="uk-modal-title">Settings</h2>
|
|
||||||
</div>
|
|
||||||
<div class="uk-modal-body">
|
|
||||||
<div class="uk-margin">
|
|
||||||
<h3>Saved Translations</h3>
|
|
||||||
<div>
|
|
||||||
<ul class="uk-list uk-list-large uk-list-divider">
|
|
||||||
<li
|
|
||||||
v-for="(tr,i) in savedTranslations"
|
|
||||||
:key="i"
|
|
||||||
><div><span>{{tr["language"]?`(${tr["language"]})`:null}} {{tr['translation']}}</span>
|
|
||||||
{{" "}}<a @click="remove(tr.abbreviation)" class="uk-position-center-right uk-position-relative"><span uk-icon="icon: minus-circle;"></span></a>
|
|
||||||
</div> </li>
|
|
||||||
<li v-if="!savedTranslations.length">No saved translation</li>
|
|
||||||
|
|
||||||
<li>Add
|
|
||||||
<div uk-form-custom="target: > * > span:first-child">
|
|
||||||
<select v-model="translation">
|
|
||||||
<option selected value="Add Translation...">Add Translation...</option>
|
|
||||||
<option
|
|
||||||
v-for="(tr,i) in Object.keys(translations)"
|
|
||||||
:key="i"
|
|
||||||
:value="tr"
|
|
||||||
>{{translations[tr]["language"]?`(${translations[tr]["language"]})`:null}} {{translations[tr]['translation']}}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
<button class="uk-button uk-button-default" type="button" tabindex="-1">
|
|
||||||
<span></span>
|
|
||||||
<span uk-icon="icon: chevron-down"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<a @click="add(translations[translation])" :class="{disabled:!translations[translation]}"><span uk-icon="icon: plus-circle; ratio:2"></span></a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- <span class="uk-label uk-label-primary"><span class="uk-badge uk-badge-danger">{{ num_of_tr}} </span>Translations Available</span> -->
|
||||||
|
<a class="uk-navbar-item" href="#" uk-toggle><span uk-icon="icon: history; ratio:2"></span></a>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<a class="uk-navbar-item uk-position-center-right" href="#modal-sections" uk-toggle><span uk-icon="icon: cog; ratio:2"></span></a>
|
||||||
|
|
||||||
|
<div id="modal-sections" uk-modal>
|
||||||
|
<div class="uk-modal-dialog">
|
||||||
|
<button class="uk-modal-close-default" type="button" uk-close></button>
|
||||||
|
<div class="uk-modal-header">
|
||||||
|
<h2 class="uk-modal-title">Settings</h2>
|
||||||
|
</div>
|
||||||
|
<div class="uk-modal-body">
|
||||||
|
<div class="uk-margin">
|
||||||
|
<h3>Saved Translations</h3>
|
||||||
|
<div>
|
||||||
|
<ul class="uk-list uk-list-large uk-list-divider">
|
||||||
|
<li
|
||||||
|
v-for="(tr,i) in savedTranslations"
|
||||||
|
:key="i"
|
||||||
|
><div><span>{{tr["language"]?`(${tr["language"]})`:null}} {{tr['translation']}}</span>
|
||||||
|
{{" "}}<a @click="remove(tr.abbreviation)" class="uk-position-center-right uk-position-relative"><span class="uk-button uk-button-danger uk-button-small" uk-icon="icon: close;"></span></a>
|
||||||
|
</div> </li>
|
||||||
|
<li v-if="!savedTranslations.length">No saved translation</li>
|
||||||
|
|
||||||
|
<li><b>Add: </b>
|
||||||
|
<div uk-form-custom="target: > * > span:first-child">
|
||||||
|
<select v-model="translation">
|
||||||
|
<option selected value="Add Translation...">Add Translation...</option>
|
||||||
|
<option
|
||||||
|
v-for="(tr,i) in Object.keys(translations)"
|
||||||
|
:key="i"
|
||||||
|
:value="tr"
|
||||||
|
>{{translations[tr]["language"]?`(${translations[tr]["language"]})`:null}} {{translations[tr]['translation']}}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<button class="uk-button uk-button-default" type="button" tabindex="-1">
|
||||||
|
<span></span>
|
||||||
|
<span uk-icon="icon: chevron-down"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<a @click="add(translations[translation])" :class="{disabled:!translations[translation]}"><span class="uk-button uk-button-primary" uk-icon="icon: plus;"></span></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="uk-modal-footer uk-text-right">
|
||||||
|
<button class="uk-button uk-button-default uk-modal-close" type="button">Cancel</button>
|
||||||
|
<button class="uk-button uk-button-primary" @click="saveSettings()" type="button">Save</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-modal-footer uk-text-right">
|
|
||||||
<button class="uk-button uk-button-default uk-modal-close" type="button">Cancel</button>
|
|
||||||
<button class="uk-button uk-button-primary" @click="saveSettings()" type="button">Save</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
</nav>
|
</nav>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import UIkit from 'uikit';
|
import UIkit from 'uikit';
|
||||||
|
|||||||
@ -1,58 +1,65 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="uk-container">
|
||||||
<div class="uk-flex uk-flex-around">
|
<div class="uk-flex uk-flex-around">
|
||||||
<div class="input-group mb-3 cols-3">
|
<div class="input-group mb-3 cols-3">
|
||||||
<div class="input-group-prepend">
|
<div class="input-group-prepend">
|
||||||
<label class="input-group-text" for="inputGroupSelect01"><h3>Translation</h3> </label>
|
<label class="input-group-text" for="inputGroupSelect01"><h4>Translation</h4> </label>
|
||||||
</div>
|
</div>
|
||||||
<select @change="update_bk()" v-model="translation" class="uk-select" id="inputGroupSelect01">
|
<select @change="update_bk()" v-model="translation" class="uk-select" id="inputGroupSelect01">
|
||||||
<!-- <option selected value="1">Choose...</option> -->
|
<!-- <option selected value="1">Choose...</option> -->
|
||||||
<option
|
<option
|
||||||
class="uk-animation-slide-bottom uk-animation-15" v-for="(tr,i) in translations"
|
class="uk-animation-slide-bottom uk-animation-15" v-for="(tr,i) in translations"
|
||||||
:key="i"
|
:key="i"
|
||||||
:value="tr.abbreviation"
|
:value="tr.abbreviation"
|
||||||
>{{tr["language"]?`(${tr["language"]})`:null}} {{tr['translation']}}
|
>{{tr["language"]?`(${tr["language"]})`:null}} {{tr['translation']}}
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
<div class="input-group mb-3 cols-3">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<label class="input-group-text" for="inputGroupSelect01"><h3>Book of</h3> </label>
|
|
||||||
</div>
|
</div>
|
||||||
<select @change="update_ch()" v-model="book" class="uk-select" id="inputGroupSelect01">
|
<div class="input-group mb-3 cols-3">
|
||||||
<!-- <option selected value="1">Choose...</option> -->
|
<div class="input-group-prepend">
|
||||||
<option
|
<label class="input-group-text" for="inputGroupSelect01"><h4>Book</h4> </label>
|
||||||
v-for="(bk,i) in Object.keys(books)"
|
</div>
|
||||||
:key="i"
|
<select @change="update_ch()" v-model="book" class="uk-select" id="inputGroupSelect01">
|
||||||
:value="books[bk]['nr']"
|
<!-- <option selected value="1">Choose...</option> -->
|
||||||
>{{books[bk]['name']}}
|
<option
|
||||||
</option>
|
v-for="(bk,i) in Object.keys(books)"
|
||||||
</select>
|
:key="i"
|
||||||
</div>
|
:value="books[bk]['nr']"
|
||||||
<div class="input-group mb-3 cols-3">
|
>{{books[bk]['name']}}
|
||||||
<div class="input-group-prepend">
|
</option>
|
||||||
<label class="input-group-text" for="inputGroupSelect01"><h3>Chapter</h3></label>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<select @change="update_chapter()" v-model="chapter_num" class="uk-select" id="inputGroupSelect01">
|
<div class="input-group mb-3 cols-3">
|
||||||
<!-- <option selected value="1">Choose...</option> -->
|
<div class="input-group-prepend">
|
||||||
<option
|
<label class="input-group-text" for="inputGroupSelect01"><h4>Chapter</h4></label>
|
||||||
v-for="(ch,i) in Object.keys(chapters)"
|
</div>
|
||||||
:key="i"
|
<select @change="update_chapter()" v-model="chapter_num" class="uk-select" id="inputGroupSelect01">
|
||||||
:value="chapters[ch]['chapter']"
|
<!-- <option selected value="1">Choose...</option> -->
|
||||||
>{{chapters[ch]['chapter']}}
|
<option
|
||||||
</option>
|
v-for="(ch,i) in Object.keys(chapters)"
|
||||||
|
:key="i"
|
||||||
|
:value="chapters[ch]['chapter']"
|
||||||
|
>{{chapters[ch]['chapter']}}
|
||||||
|
</option>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<verses
|
||||||
<verses
|
v-if="translations.length && books[book]"
|
||||||
v-if="translations.length && books[book]"
|
:dir="t(translation).direction.toLowerCase()"
|
||||||
:dir="t(translation).direction.toLowerCase()"
|
:book_name="books[book].name"
|
||||||
:book_name="books[book].name"
|
:chapter="fchapters"
|
||||||
:chapter="fchapters"
|
/>
|
||||||
/>
|
|
||||||
</div>
|
<div class="uk-margin">
|
||||||
|
<ul class="uk-pagination">
|
||||||
|
<li><a href="#"><span class="uk-margin-small-right" uk-pagination-previous></span> Previous Chapter</a></li>
|
||||||
|
<li class="uk-margin-auto-left"><a href="#">Next Chapter<span class="uk-margin-small-left" uk-pagination-next></span></a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user