getBible/joomla-component
6
3
Fork 0
Code Issues Pull Requests Wiki Activity

Release of v3.1.1

Browse Source 
Add back to Bible button to Open AI page.
This commit is contained in:
Robot 2024-04-29 19:05:14 +02:00
parent d9ba1b687b
commit 157a45a946
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
12 changed files with 76 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# v3.1.1
- Add back to Bible button to Open AI page.
# v3.1.0 # v3.1.0
- Fix missing Joomla__aeb8e463_291f_4445_9ac4_34b637c12dbd__Power. - Fix missing Joomla__aeb8e463_291f_4445_9ac4_34b637c12dbd__Power.

12
README.md
View File

@ -1,4 +1,4 @@
# Get Bible (3.1.0) # Get Bible (3.1.1)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 29th April, 2024 + *Last Build*: 29th April, 2024
+ *Version*: 3.1.0 + *Version*: 3.1.1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,11 +31,11 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **207179** + *Line count*: **207225**
+ *File count*: **1739** + *File count*: **1740**
+ *Folder count*: **150** + *Folder count*: **150**
**381 Hours** or **48 Eight Hour Days** (the actual time the author spent) **382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
> (with the following break down: > (with the following break down:
> **debugging @145hours** = codingtime / 4; > **debugging @145hours** = codingtime / 4;
@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> **mapping @58hours** = codingtime / 10; > **mapping @58hours** = codingtime / 10;
> **office @96hours** = codingtime / 6;) > **office @96hours** = codingtime / 6;)
**959 Hours** or **120 Eight Hour Days** **960 Hours** or **120 Eight Hour Days**
(a total of the realistic time frame for this project) (a total of the realistic time frame for this project)
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,

12
admin/README.txt
View File

@ -1,4 +1,4 @@
# Get Bible (3.1.0) # Get Bible (3.1.1)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 29th April, 2024 + *Last Build*: 29th April, 2024
+ *Version*: 3.1.0 + *Version*: 3.1.1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,11 +31,11 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **207179** + *Line count*: **207225**
+ *File count*: **1739** + *File count*: **1740**
+ *Folder count*: **150** + *Folder count*: **150**
**381 Hours** or **48 Eight Hour Days** (the actual time the author spent) **382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
> (with the following break down: > (with the following break down:
> **debugging @145hours** = codingtime / 4; > **debugging @145hours** = codingtime / 4;
@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> **mapping @58hours** = codingtime / 10; > **mapping @58hours** = codingtime / 10;
> **office @96hours** = codingtime / 6;) > **office @96hours** = codingtime / 6;)
**959 Hours** or **120 Eight Hour Days** **960 Hours** or **120 Eight Hour Days**
(a total of the realistic time frame for this project) (a total of the realistic time frame for this project)
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,

1
admin/sql/updates/mysql/3.1.0.sql Normal file
View File

@ -0,0 +1 @@

4
getbible.xml
View File

@ -7,9 +7,9 @@
<authorUrl>https://getbible.net</authorUrl> <authorUrl>https://getbible.net</authorUrl>
<copyright>Copyright (C) 2015. All Rights Reserved</copyright> <copyright>Copyright (C) 2015. All Rights Reserved</copyright>
<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license> <license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
<version>3.1.0</version> <version>3.1.1</version>
<description><![CDATA[ <description><![CDATA[
<h1>Get Bible (v.3.1.0)</h1> <h1>Get Bible (v.3.1.1)</h1>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide. <p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.

2
script.php
View File

@ -1586,7 +1586,7 @@ class Com_GetbibleInstallerScript
echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://getbible.net" title="Get Bible"> echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://getbible.net" title="Get Bible">
<img src="components/com_getbible/assets/images/vdm-component.jpg"/> <img src="components/com_getbible/assets/images/vdm-component.jpg"/>
</a> </a>
<h3>Upgrade to Version 3.1.0 Was Successful! Let us know if anything is not working as expected.</h3></div>'; <h3>Upgrade to Version 3.1.1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
// Set db if not set already. // Set db if not set already.
if (!isset($db)) if (!isset($db))

1
site/language/en-GB/en-GB.com_getbible.ini
View File

@ -206,6 +206,7 @@ COM_GETBIBLE_THE_NAME_COULD_NOT_BE_UPDATED="The name could not be updated."
COM_GETBIBLE_THE_NAME_HAS_BEEN_UPDATED="The name has been updated." COM_GETBIBLE_THE_NAME_HAS_BEEN_UPDATED="The name has been updated."
COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_CREATED="The note was successfully created." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_CREATED="The note was successfully created."
COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_UPDATED="The note was successfully updated." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_UPDATED="The note was successfully updated."
COM_GETBIBLE_THE_OPEN_AI_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The Open AI feature has not been activated. Please contact the system administrator of this website to resolve this."
COM_GETBIBLE_THE_PERSISTENT_SESSION_KEY_ALLOWS_VIEWING_WHILE_EDITING_IS_ONLY_POSSIBLE_WHEN_THE_CORRECT_FAVOURITE_VERSE_IS_PROVIDED="The persistent session key allows viewing, while editing is only possible when the correct favourite verse is provided." COM_GETBIBLE_THE_PERSISTENT_SESSION_KEY_ALLOWS_VIEWING_WHILE_EDITING_IS_ONLY_POSSIBLE_WHEN_THE_CORRECT_FAVOURITE_VERSE_IS_PROVIDED="The persistent session key allows viewing, while editing is only possible when the correct favourite verse is provided."
COM_GETBIBLE_THE_SCRIPTURE_WAS_COPIED_TO_YOUR_CLIPBOARD="The scripture was copied to your clipboard!" COM_GETBIBLE_THE_SCRIPTURE_WAS_COPIED_TO_YOUR_CLIPBOARD="The scripture was copied to your clipboard!"
COM_GETBIBLE_THE_SEARCH_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The search feature has not been activated. Please contact the system administrator of this website to resolve this." COM_GETBIBLE_THE_SEARCH_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The search feature has not been activated. Please contact the system administrator of this website to resolve this."

10
site/models/ajax.php
View File

@ -490,11 +490,15 @@ class GetbibleModelAjax extends ListModel
{ {
if ($abbreviation === 'all' || $abbreviation === $translation) if ($abbreviation === 'all' || $abbreviation === $translation)
{ {
// set the return UR // set the return URL
$return = urlencode(base64_encode((string) Route::_('index.php?option=com_getbible&view=app&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&book=' . $book . '&chapter=' . $chapter))); $return = '';
if ($book > 0 && $chapter > 0)
{
$return = '&bibleurl=' . urlencode(base64_encode(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=app&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&book=' . $book . '&chapter=' . $chapter)));
}
// we return the AI url // we return the AI url
return ['url' => trim(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=openai&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&bibleurl=' . $return . '&guid=' . $guid . '&book=' . $book . '&chapter=' . $chapter . '&verse=' . $verse . '&words=' . $words))]; return ['url' => trim(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=openai&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . $return . '&guid=' . $guid . '&book=' . $book . '&chapter=' . $chapter . '&verse=' . $verse . '&words=' . $words))];
} }
return ['error' => 'There was an error please try again.']; return ['error' => 'There was an error please try again.'];

26
site/views/openai/tmpl/default.php
View File

@ -24,17 +24,23 @@ use Joomla\CMS\Router\Route;
use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\HTML\HTMLHelper as Html;
?> ?>
<?php if ($this->item): ?> <?php if ($this->params->get('enable_open_ai') == 1): ?>
<?php echo $this->loadTemplate('getbibleai'); ?> <?php if ($this->item): ?>
<?php if (count($this->item) > 1) : ?> <?php echo $this->loadTemplate('getbibleai'); ?>
<?php echo $this->loadTemplate('getbibleaifilter'); ?> <?php if (count($this->item) > 1) : ?>
<?php echo $this->loadTemplate('getbibleaifilter'); ?>
<?php endif; ?>
<?php else: ?>
<div uk-alert>
<h3><?php echo Text::_('COM_GETBIBLE_THERE_HAS_BEEN_AN_ERROR'); ?></h3>
<p><?php echo Text::_('COM_GETBIBLE_FOR_SOME_REASON_YOUR_REQUEST_COULD_NOT_BE_PROCESSED_AT_THIS_TIME'); ?></p>
</div>
<?php endif; ?>
<?php if ($this->params->get('debug') == 1): ?>
<?php echo $this->loadTemplate('getbibleaidebug'); ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<div uk-alert> <div class="uk-alert-danger" uk-alert>
<h3><?php echo Text::_('COM_GETBIBLE_THERE_HAS_BEEN_AN_ERROR'); ?></h3> <p><?php echo Text::_("COM_GETBIBLE_THE_OPEN_AI_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS"); ?></p>
<p><?php echo Text::_('COM_GETBIBLE_FOR_SOME_REASON_YOUR_REQUEST_COULD_NOT_BE_PROCESSED_AT_THIS_TIME'); ?></p>
</div> </div>
<?php endif; ?>
<?php if ($this->params->get('debug') == 1): ?>
<?php echo $this->loadTemplate('getbibleaidebug'); ?>
<?php endif; ?> <?php endif; ?>

1
site/views/openai/tmpl/default_getbibleai.php
View File

@ -27,6 +27,7 @@ use Joomla\CMS\Layout\LayoutHelper;
<div class="uk-container"> <div class="uk-container">
<div class="tm-grid-expand uk-child-width-1-1 uk-grid-margin uk-grid uk-grid-stack" uk-grid> <div class="tm-grid-expand uk-child-width-1-1 uk-grid-margin uk-grid uk-grid-stack" uk-grid>
<div class="uk-first-column"> <div class="uk-first-column">
<a class="uk-button uk-button-small uk-width-1-1" href="<?php echo $this->getBibleUrl(); ?>"><?php echo Text::_('COM_GETBIBLE_BIBLE'); ?></a>
<h2 class="uk-heading-small uk-heading-line uk-text-center"><?php echo Text::_('COM_GETBIBLE_OPEN_AI_RESPONSE'); ?></h2> <h2 class="uk-heading-small uk-heading-line uk-text-center"><?php echo Text::_('COM_GETBIBLE_OPEN_AI_RESPONSE'); ?></h2>
<div class="uk-margin"> <div class="uk-margin">
<?php if ($this->params->get('show_top_menu') == 1): ?> <?php if ($this->params->get('show_top_menu') == 1): ?>

15
site/views/openai/view.html.php
View File

@ -28,6 +28,7 @@ use Joomla\CMS\MVC\View\HtmlView;
use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\CMS\Session\Session; use Joomla\CMS\Session\Session;
use Joomla\CMS\Router\Router;
use Joomla\CMS\Router\Route; use Joomla\CMS\Router\Route;
use Joomla\CMS\Uri\Uri; use Joomla\CMS\Uri\Uri;
use Joomla\CMS\Helper\ModuleHelper; use Joomla\CMS\Helper\ModuleHelper;
@ -54,8 +55,18 @@ class GetbibleViewOpenai extends HtmlView
// remove from page (in case debug mode is on) // remove from page (in case debug mode is on)
$this->params->set('openai_token', null); $this->params->set('openai_token', null);
$this->params->set('gitea_token', null); $this->params->set('gitea_token', null);
// set meta // set the input object
$this->setMetaData(); $this->input = $this->app->input;
// is the area active
if ($this->params->get('enable_open_ai') == 1)
{
// set the page direction globally
$this->getDocument()->setDirection($this->translation->direction);
// set the global language declaration
// $this->getDocument()->setLanguage($this->translation->joomla); (soon ;)
// set meta
$this->setMetaData();
}
// Set the toolbar // Set the toolbar
$this->addToolBar(); $this->addToolBar();

18
update_server.xml
View File

@ -737,4 +737,22 @@
<maintainerurl>https://getbible.net</maintainerurl> <maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="3.*"/> <targetplatform name="joomla" version="3.*"/>
</update> </update>
<update>
<name>Get Bible</name>
<description>The Bible for Joomla</description>
<element>pkg_getbible</element>
<type>package</type>
<client>site</client>
<version>3.1.1</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.1.1.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<maintainer>Llewellyn van der Merwe</maintainer>
<maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="3.*"/>
</update>
</updates> </updates>