Skip to content

Commit

Permalink
Merge pull request #57 from vcatafesta/main
Browse files Browse the repository at this point in the history 
ter 22 ago 2023 11:26:11 -04 Vilmar Catafesta ([email protected])
  • Loading branch information
@bigbruno
bigbruno authored Aug 22, 2023
2 parents 11f0843 + b2522d7 commit a5f52d8
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 225 deletions.
3 changes: 1 addition & 2 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ div#box_progress_snap_install, div#box_progress_snap_remove, div#box_progress_fl
height: 100%;
z-index: 10;
display: none;

}


Expand Down Expand Up @@ -378,7 +377,7 @@ div#box_aur {
}

div#box_flatpak {
// display: none;
/* display: none;*/
background-attachment: fixed;
margin-bottom: 25px;
border-radius: 15px;
Expand Down
62 changes: 32 additions & 30 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/header.sh.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,37 +658,39 @@
fi

if [ "$aur_checkbox" = "checked" ]; then
[[ -e ${TMP_FOLDER}/aur_number.html ]] && rm -f ${TMP_FOLDER}/aur_number.html
cat <<-EOF
<div id="box_aur">
<div id="title_aur">
<div id="button_aur" class="tooltipped" data-position="right" data-tooltip="$ABOUT_AUR">
<div style="display: inline-flex; margin-top: -8px; margin-right: 10px;">
<svg role="img" viewBox="0 0 640 512" xmlns="http://www.w3.org/2000/svg" style="width:20px;margin-left: 5px;">
<path fill="var(--text-a-color)" d="M75.23 33.4L320 63.1L564.8 33.4C571.5 32.56 578 36.06 581.1 42.12L622.8 125.5C631.7 143.4 622.2 165.1 602.9 170.6L439.6 217.3C425.7 221.2 410.8 215.4 403.4 202.1L320 63.1L236.6 202.1C229.2 215.4 214.3 221.2 200.4 217.3L37.07 170.6C17.81 165.1 8.283 143.4 17.24 125.5L58.94 42.12C61.97 36.06 68.5 32.56 75.23 33.4H75.23zM321.1 128L375.9 219.4C390.8 244.2 420.5 255.1 448.4 248L576 211.6V378.5C576 400.5 561 419.7 539.6 425.1L335.5 476.1C325.3 478.7 314.7 478.7 304.5 476.1L100.4 425.1C78.99 419.7 64 400.5 64 378.5V211.6L191.6 248C219.5 255.1 249.2 244.2 264.1 219.4L318.9 128H321.1z"/>
</svg></div>
<div style="margin-right: 5px;">
$Programas_AUR
</div></div>
</div>
<div id="content_aur">
<script>document.getElementById("aur_icon_loading").innerHTML = "<div class=progress><div class=indeterminate></div></div>";</script>
EOF

# Search
[[ -e ${TMP_FOLDER}/aur.html ]] && rm -f ${TMP_FOLDER}/aur.html
resultFilter_checkbox="$resultFilter_checkbox" ./search_aur.sh "${search,,}" &

cat <<-EOF
<script>fileReplaceDiv(true, '#content_aur', '${TMP_FOLDER}/aur.html');</script>
<script>fileReplaceDiv(true, '#aur_number', '${TMP_FOLDER}/aur_number.html');</script>
</div></div>
EOF
AUR_CATEGORY "${search,,}"
# [[ -e ${TMP_FOLDER}/aur_number.html ]] && rm -f ${TMP_FOLDER}/aur_number.html
# cat <<-EOF
# <div id="box_aur">
# <div id="title_aur">
# <div id="button_aur" class="tooltipped" data-position="right" data-tooltip="$ABOUT_AUR">
# <div style="display: inline-flex; margin-top: -8px; margin-right: 10px;">
# <svg role="img" viewBox="0 0 640 512" xmlns="http://www.w3.org/2000/svg" style="width:20px;margin-left: 5px;">
# <path fill="var(--text-a-color)" d="M75.23 33.4L320 63.1L564.8 33.4C571.5 32.56 578 36.06 581.1 42.12L622.8 125.5C631.7 143.4 622.2 165.1 602.9 170.6L439.6 217.3C425.7 221.2 410.8 215.4 403.4 202.1L320 63.1L236.6 202.1C229.2 215.4 214.3 221.2 200.4 217.3L37.07 170.6C17.81 165.1 8.283 143.4 17.24 125.5L58.94 42.12C61.97 36.06 68.5 32.56 75.23 33.4H75.23zM321.1 128L375.9 219.4C390.8 244.2 420.5 255.1 448.4 248L576 211.6V378.5C576 400.5 561 419.7 539.6 425.1L335.5 476.1C325.3 478.7 314.7 478.7 304.5 476.1L100.4 425.1C78.99 419.7 64 400.5 64 378.5V211.6L191.6 248C219.5 255.1 249.2 244.2 264.1 219.4L318.9 128H321.1z"/>
# </svg></div>
# <div style="margin-right: 5px;">
# $Programas_AUR
# </div></div>
# </div>
# <div id="content_aur">
# <script>document.getElementById("aur_icon_loading").innerHTML = "<div class=progress><div class=indeterminate></div></div>";</script>
# EOF
#
# # Search
# [[ -e ${TMP_FOLDER}/aur.html ]] && rm -f ${TMP_FOLDER}/aur.html
# resultFilter_checkbox="$resultFilter_checkbox" ./search_aur.sh "${search,,}" &
#
# cat <<-EOF
# <script>fileReplaceDiv(true, '#content_aur', '${TMP_FOLDER}/aur.html');</script>
# <script>fileReplaceDiv(true, '#aur_number', '${TMP_FOLDER}/aur_number.html');</script>
# </div>
# </div>
# EOF
fi

if [[ "$flatpak_checkbox" = "checked" ]]; then
FLATPAK_CATEGORY "${search,,}" &
# [[ -e ${TMP_FOLDER}/flatpak_number.html ]] & rm -f ${TMP_FOLDER}/flatpak_number.html
FLATPAK_CATEGORY "${search,,}"
# [[ -e ${TMP_FOLDER}/flatpak_number.html ]] && rm -f ${TMP_FOLDER}/flatpak_number.html
# cat <<-EOF
# <div id="box_flatpak">
# <div id="title_flatpak">
Expand All @@ -704,8 +706,8 @@
# EOF
#
# [[ -e ${TMP_FOLDER}/flatpak.html ]] && rm -f ${TMP_FOLDER}/flatpak.html
## resultFilter_checkbox="$resultFilter_checkbox" ./search_flatpak.sh "${search,,}" > /dev/null 2>&1 &
# resultFilter_checkbox="$resultFilter_checkbox" sh_search_flatpak "${search,,}" &
# resultFilter_checkbox="$resultFilter_checkbox" ./search_flatpak.sh "${search,,}" > /dev/null 2>&1 &
## resultFilter_checkbox="$resultFilter_checkbox" sh_search_flatpak "${search,,}" &
#
# cat <<-EOF
# <script>fileReplaceDiv(true, '#content_flatpak', '${TMP_FOLDER}/flatpak.html');</script>
Expand Down
30 changes: 20 additions & 10 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@
</div>
<div style="margin-right: 5px;">
$Programas_Flatpak
</div></div>
</div>
</div></div></div>
<div id="content_flatpak">
<script>document.getElementById("aur_icon_loading").innerHTML = "<div class=progress><div class=indeterminate></div></div>";</script>
EOF
Expand All @@ -107,15 +106,17 @@
[[ -e "${TMP_FOLDER}/flatpak_build.html" ]] && mv -f "${TMP_FOLDER}/flatpak_build.html" "${TMP_FOLDER}/flatpak.html"

cat <<-EOF
<script>fileReplaceDiv(true, '#content_flatpak', '${TMP_FOLDER}/flatpak.html');</script>
<script>fileReplaceDiv(true, '#flatpak_number', '${TMP_FOLDER}/flatpak_number.html');</script>
</div>
</div>
<script>fileReplaceDiv(true, '#content_flatpak', '${TMP_FOLDER}/flatpak.html');</script>
<script>fileReplaceDiv(true, '#flatpak_number', '${TMP_FOLDER}/flatpak_number.html');</script>
</div>
</div>
EOF
}
export -f FLATPAK_CATEGORY

function AUR_CATEGORY {
local param_search="$*"

[[ -e "${TMP_FOLDER}/aur_number.html" ]] && rm -f "${TMP_FOLDER}/aur_number.html"
[[ -e "${TMP_FOLDER}/aur.html" ]] && rm -f "${TMP_FOLDER}/aur.html"

Expand All @@ -133,10 +134,19 @@
</div></div></div>
<div id="content_aur">
<script>document.getElementById("aur_icon_loading").innerHTML = "<div class=progress><div class=indeterminate></div></div>";</script>
$(sh_category_aur "$(tr -s '\n' ' ' <$TMP_FOLDER/category_aur.txt)") >/dev/null 2>&1 &
<script>fileReplaceDiv(true, '#content_aur', '${TMP_FOLDER}/aur.html');</script>
</div>
</div>
EOF

if [[ -z "$param_search" ]]; then
cat <<-EOF
$(sh_search_aur "$(tr -s '\n' ' ' <$TMP_FOLDER/category_aur.txt)") >/dev/null 2>&1 &
EOF
else
resultFilter_checkbox="$resultFilter_checkbox" sh_search_aur "${param_search}" &
fi
cat <<-EOF
<script>fileReplaceDiv(true, '#content_aur', '${TMP_FOLDER}/aur.html');</script>
</div>
</div>
EOF
}
export -f AUR_CATEGORY
Expand Down
18 changes: 0 additions & 18 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/search_appstream_pamac.sh
View file

This file was deleted.

165 changes: 0 additions & 165 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/search_aur.sh
View file

This file was deleted.

0 comments on commit a5f52d8

Please sign in to comment.