Skip to content

Commit

Permalink
fix: apps fix (#1335)
Browse files Browse the repository at this point in the history
* v

* Update satolist.js

* v

* Update index.js

* Update index.js

* v

* Update sdk.js

* Update package.json
  • Loading branch information
maxgithubprofile authored Dec 16, 2024
1 parent 2385e24 commit 14a93a6
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 14 deletions.
2 changes: 1 addition & 1 deletion components/home/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="applications chapter">
<div class="header">
<div class="caption">
<span>Applications</span>
<span><%- e('e14106') %></span>
</div>
</div>
<div class="searchWrapper">
Expand Down
6 changes: 6 additions & 0 deletions components/leftpanel/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,19 @@
#leftpanel .rightbottomnav span {
font-size: 0.8em;
}
#leftpanel .rightbottomnav .likelink,
#leftpanel .rightbottomnav a {
white-space: nowrap;
-moz-transition: 0.3s;
-o-transition: 0.3s;
-webkit-transition: 0.3s;
transition: 0.3s;
}
#leftpanel .rightbottomnav .likelink {
cursor: pointer;
}
@media (pointer: fine) {
#leftpanel .rightbottomnav .likelink:hover,
#leftpanel .rightbottomnav a:hover {
color: rgb(var(--color-txt-ac));
}
Expand Down
4 changes: 4 additions & 0 deletions components/leftpanel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ var leftpanel = (function(){
sitemessage(self.app.localization.e('copybuiltfrom'));
});

_p.el.find('.fordevelopers').on('click', () => {
self.app.apps.openInWndById('app.pocketnet.docs')
})

if(clbk) clbk()
})
},
Expand Down
10 changes: 8 additions & 2 deletions components/leftpanel/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,18 @@
span{
font-size: 0.8em;
}

.likelink,
a{
white-space: nowrap;
.transition(0.3s);

}

.likelink{
cursor: pointer;
}

@media (pointer:fine) {
.likelink,
a{
&:hover{
color : rgb(var(--color-txt-ac));
Expand All @@ -298,6 +303,7 @@


}

}

.copyright {
Expand Down
2 changes: 2 additions & 0 deletions components/leftpanel/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

<a elementsid="https://<%-app.options.url%>/blockexplorer/" href="https://<%-app.options.url%>/blockexplorer/"><%= e('e13182') %></a>
<span>&middot;</span>
<span class="fordevelopers likelink"><%= e('fordevelopers') %></span>
<span>&middot;</span>
<% if(!app.cutversion) {%>
<a elementsid="aboutlink" href="about"><%= e('aboutus') %></a>
<span>&middot;</span>
Expand Down
14 changes: 8 additions & 6 deletions js/lib/apps/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,11 @@ var BastyonApps = function (app) {


var syncInstalledAppData = function (application) {

console.log('application.id', application.id, application)

if(application.id == 'undefined' || !application.id) return

if (
!localdata[application.id] ||
!_.isEqual(localdata[application.id].data, application)
Expand Down Expand Up @@ -1157,8 +1162,6 @@ var BastyonApps = function (app) {
result.includeminiapps = true
}



if (application.production) {
result.production = true
}
Expand All @@ -1182,7 +1185,6 @@ var BastyonApps = function (app) {

syncInstalledAppData(application)


trigger('installed', {
application
})
Expand Down Expand Up @@ -1850,9 +1852,9 @@ var BastyonApps = function (app) {

promises.push(Promise.all(_.map(installedLocal, (info) => {

if(_.find(allApps, (app) => {
/*if(_.find(allApps, (app) => {
return app.id == info.id
})) return Promise.resolve()
})) return Promise.resolve()*/

return self.get.applicationall(info.id, info.cached).then(({
application
Expand Down Expand Up @@ -1968,7 +1970,7 @@ var BastyonApps = function (app) {
if (appData) {
return "development"
} else {
return new Error("application:status:not_found")
return ""
}
},
forminiapps: function () {
Expand Down
2 changes: 1 addition & 1 deletion js/lib/client/sdk.js
Original file line number Diff line number Diff line change
Expand Up @@ -3062,7 +3062,7 @@ var pSDK = function ({ app, api, actions }) {
prepareStorages()
}

self.search = function(type, str = ''){
self.localSearch = function(type, str = ''){
if(!self[type]) return []

var meta = self[type]
Expand Down
4 changes: 3 additions & 1 deletion localization/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -3081,4 +3081,6 @@ _l.emptyntime1 = 'Please select the date and time of publication'

_l.postWaitDelayed = function(time){
return 'The publication will be published: ' + time
}
}

_l.fordevelopers = "For developers"
4 changes: 3 additions & 1 deletion localization/ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -2886,4 +2886,6 @@ _l.emptyntime1 = 'Пожалуйста, выберите дату и время

_l.postWaitDelayed = function(time){
return 'Публикация будет опубликована: ' + time
}
}

_l.fordevelopers = "Для разработчиков"
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

"version": "0.9.105",

"versionsuffix": "5",
"versionsuffix": "6",
"cordovaversion": "1.8.105",
"cordovaversioncode": "1801055",
"cordovaversioncode": "1801056",

"description": "Bastyon desktop application",
"author": "Pocketnet Community <[email protected]>",
Expand Down

0 comments on commit 14a93a6

Please sign in to comment.