Apps/NotePostApp
2
0
Fork 0
Code Issues 1 Pull Requests Releases 5 Wiki Activity

Fix white screen on launch, update versions and dependencies

Browse Source
This commit is contained in:
Skylar Ittner 2020-09-18 13:32:14 -06:00
parent 0269107830
commit 2dc815e2ea
12 changed files with 21467 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.netsyms.NotePostApp" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.netsyms.NotePostApp" version="1.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>NotePost</name>
<description>
A cross-platform client app for NotePost.
@ -19,8 +19,8 @@
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<platform name="android">
<preference name="android-minSdkVersion" value="21" />
<preference name="android-targetSdkVersion" value="28" />
<preference name="android-minSdkVersion" value="22" />
<preference name="android-targetSdkVersion" value="29" />
<allow-intent href="market:*" />
<preference name="HeaderColor" value="#F44336" />
<preference name="StatusBarBackgroundColor" value="#E0E0E0" />

7713
license-credits.md Normal file
View File

File diff suppressed because one or more lines are too long

3460
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@ -1,7 +1,7 @@
{
"name": "com.netsyms.NotePostApp",
"displayName": "NotePost",
"version": "1.3.1",
"version": "1.3.2",
"description": "A cross-platform client app for NotePost.",
"main": "index.js",
"scripts": {
@ -10,8 +10,9 @@
"author": "Netsyms Technologies",
"license": "MPL-2.0",
"dependencies": {
"cordova-android": "^8.1.0",
"cordova-browser": "^5.0.4",
"cordova": "^10.0.0",
"cordova-android": "^9.0.0",
"cordova-browser": "^6.0.0",
"cordova-plugin-app-version": "^0.1.9",
"cordova-plugin-headercolor": "^1.0.0",
"cordova-plugin-inappbrowser": "^3.0.0",
@ -31,4 +32,4 @@
"android"
]
}
}
}

75
scripts/remove_bloat.sh
View File

@ -3,7 +3,11 @@
echo "Removing bloat in node_modules..."
cd www/node_modules
set -e
DIR="$(pwd)/www/node_modules"
cd $DIR
rm -rf array-parallel
rm -rf codemirror
rm -rf codemirror-spell-checker
@ -15,56 +19,51 @@ rm -rf template7
rm -rf throttleit
rm -rf tiny-emitter
rm -rf typo-js
rm -rf .bin
cd $DIR
cd @fortawesome/fontawesome-free
rm -rf js
rm -rf less
rm -rf scss
rm -rf sprites
rm -rf svgs
cd ../..
rm -rf {js,less,metadata,scss,sprites,svgs}
find css -type f -not -name 'all.min.css' -delete
cd $DIR
cd jquery
rm -rf src
rm -rf external
cd ..
cd $DIR
cd framework7
rm -rf components
rm -rf lazy-components
rm -rf less
rm -rf modules
rm -rf utils
cd css
rm framework7.bundle.css framework7.bundle.rtl.css framework7.css framework7.rtl.css
cd ../js
rm framework7-lite* framework7.bundle.d.ts framework7.bundle.js framework7.d.ts framework7.js framework7.min.js framework7.min.js.map
cd ..
rm framework7*
cd ..
rm -f framework7.*
rm -f framework7-lite.*
find css -type f -not -name 'framework7.bundle.min.css' -delete
find js -type f -not -name 'framework7.bundle.min.js' -delete
cd $DIR
cd jquery
rm -rf src
rm -rf external
find dist -type f -not -name 'jquery.min.js' -delete
cd $DIR
cd material-design-icons
rm -rf action
rm -rf alert
rm -rf av
rm -rf bower.json
rm -rf communication
rm -rf content
rm -rf device
rm -rf editor
rm -rf file
rm -rf gulpfile.babel.js
rm -rf hardware
rm -rf image
rm -rf index.js
rm -rf maps
rm -rf navigation
rm -rf notification
rm -rf package.json
rm -rf places
rm -rf README.md
rm -rf social
rm -rf sprites
rm -rf toggle
cd ..
# Remove everything except the icon font and license, but also exclude the
# current and parent folder (. , ..) so rm won't complain about refusing
# to delete the whole filesystem
find . -maxdepth 1 -not -name '.' -not -name 'LICENSE' -not -name 'iconfont' -exec rm -rf {} \;
cd $DIR
cd marked
rm -rf {bin,lib,man,src}
cd $DIR
cd shufflejs
rm -rf src
find dist -type f -not -name 'shuffle.min.js' -delete
cd $DIR
echo "Cleanup finished"

2
scripts/yarn_install.sh
View File

@ -4,4 +4,6 @@ yarn install
# Install frontend dependencies with Yarn, in www folder
cd www
# force a full update so the bloat script doesn't fail on missing files
rm -r node_modules
yarn install

24
www/js/main.js
View File

@ -65,15 +65,17 @@ router.on("pageInit", function (pagedata) {
// Run platform-specific setup code for Cordova or NW.js
initPlatform();
// Switch to dark theme if requested by user setting
setAppTheme();
runCodeAfterPlatformInit(function () {
// Switch to dark theme if requested by user setting
setAppTheme();
if (localStorage.getItem("configured") == null) {
// Open the setup page
router.navigate("/setup/0");
} else {
APICLIENT = new NotePostAPI(localStorage.getItem("serverurl"), localStorage.getItem("username"), localStorage.getItem("password"));
NOTES = new Notes();
NOTES.loadAll();
router.navigate("/home");
}
if (localStorage.getItem("configured") == null) {
// Open the setup page
router.navigate("/setup/0");
} else {
APICLIENT = new NotePostAPI(localStorage.getItem("serverurl"), localStorage.getItem("username"), localStorage.getItem("password"));
NOTES = new Notes();
NOTES.loadAll();
router.navigate("/home");
}
});

13
www/js/platform.js
View File

@ -30,6 +30,10 @@ var setAppTheme = function () {
}
}
var runCodeAfterPlatformInit = function (fun) {
fun();
}
function initCordova() {
platform_type = "cordova";
@ -44,9 +48,6 @@ function initCordova() {
router.navigate("/home");
}, false);
document.addEventListener("deviceready", function () {
}, false);
openBrowser = function (url) {
cordova.InAppBrowser.open(url, '_blank', 'location=yes');
}
@ -66,6 +67,12 @@ function initCordova() {
}
}
}
runCodeAfterPlatformInit = function (fun) {
document.addEventListener("deviceready", function () {
fun();
}, false);
}
}
function initNW() {

10
www/package.json
View File

@ -1,16 +1,16 @@
{
"name": "com.netsyms.NotePostApp",
"displayName": "NotePost",
"version": "1.3.1",
"version": "1.3.2",
"description": "A cross-platform client app for NotePost.",
"author": "Netsyms Technologies",
"license": "MPL-2.0",
"dependencies": {
"framework7": "^5.1.3",
"jquery": "^3.4.1",
"marked": "^0.7.0",
"framework7": "^5.7.12",
"jquery": "^3.5.1",
"marked": "^1.1.1",
"shufflejs": "^5.2.3",
"@fortawesome/fontawesome-free": "^5.10.2",
"@fortawesome/fontawesome-free": "^5.14.0",
"material-design-icons": "^3.0.1"
}
}

7752
www/pages/credits.html Normal file
View File

File diff suppressed because one or more lines are too long

128
www/yarn.lock
View File

@ -2,110 +2,84 @@
# yarn lockfile v1
"@fortawesome/fontawesome-free@^5.6.3":
version "5.6.3"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz#61c122c420d7a91613f393d6a06e5a4c6ae6abf3"
integrity sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==
"@fortawesome/fontawesome-free@^5.14.0":
version "5.14.0"
resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/5.14.0/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f"
integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==
array-parallel@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/array-parallel/-/array-parallel-0.1.3.tgz#8f785308926ed5aa478c47e64d1b334b6c0c947d"
integrity sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=
codemirror-spell-checker@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
integrity sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4=
dom7@^2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/dom7/-/dom7-2.1.5.tgz#a79411017800b31d8400070cdaebbfc92c1f6377"
integrity sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==
dependencies:
typo-js "*"
ssr-window "^2.0.0"
codemirror@^5.41.0:
version "5.42.2"
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.42.2.tgz#801ab715a7a7e1c7ed4162b78e9d8138b98de8f0"
integrity sha512-Tkv6im39VuhduFMsDA3MlXcC/kKas3Z0PI1/8N88QvFQbtOeiiwnfFJE4juGyC8/a4sb1BSxQlzsil8XLQdxRw==
dom7@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/dom7/-/dom7-2.1.2.tgz#a914070c0abe8465384997a9c4f34475f67f75bd"
integrity sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==
framework7@^5.7.12:
version "5.7.12"
resolved "https://registry.yarnpkg.com/framework7/-/framework7-5.7.12.tgz#07975f9ab40fa5440c935263512a40a80cd0a1db"
integrity sha512-LCRvun2cvx32dIUbYoSOelP+z0K9L9ffbA82oq8/lYi/hNRqYCda2BlBEBdhkx1PUNTSOnt9TcUwAxD6rjdNFQ==
dependencies:
ssr-window "^1.0.1"
dom7 "^2.1.5"
path-to-regexp "^6.1.0"
ssr-window "^2.0.0"
template7 "^1.4.2"
easymde@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.4.2.tgz#c91f79893b6fa6f5cb4184c234fc49e1c2e51884"
integrity sha512-LQ+kt98qKBUiykFG8e4E+UJezIowpeku5vowdPeVMKLtEV8sU7xxPxqS3GgDZWwhO3HghEngNa70eJInSMHh6A==
dependencies:
codemirror "^5.41.0"
codemirror-spell-checker "1.1.2"
marked "^0.5.1"
jquery@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
framework7@^3.6.5:
version "3.6.5"
resolved "https://registry.yarnpkg.com/framework7/-/framework7-3.6.5.tgz#dbd3c044ad36df73a9ed57cde5467e3c7c0d137e"
integrity sha512-bKIeIepeumIZM75rFhuk6DSr9yqi+05EPbpkyKHZLFOdNFfhbEW1wr0PYpjVrMuuxO3iK9frhiUx982QhlhPqA==
dependencies:
dom7 "^2.1.2"
path-to-regexp "^2.4.0"
ssr-window "^1.0.1"
template7 "^1.4.0"
jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
marked@^0.5.1:
version "0.5.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9"
integrity sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==
marked@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.0.tgz#a18d01cfdcf8d15c3c455b71c8329e5e0f01faa1"
integrity sha512-HduzIW2xApSXKXJSpCipSxKyvMbwRRa/TwMbepmlZziKdH8548WSoDP4SxzulEKjlo8BE39l+2fwJZuRKOln6g==
marked@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/marked/-/marked-1.1.1.tgz#e5d61b69842210d5df57b05856e0c91572703e6a"
integrity sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==
matches-selector@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/matches-selector/-/matches-selector-1.2.0.tgz#d1814e7e8f43e69d22ac33c9af727dc884ecf12a"
integrity sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==
path-to-regexp@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
material-design-icons@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
shufflejs@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/shufflejs/-/shufflejs-5.2.1.tgz#ebe68361aae24f28d597a2c71eaf58f340ee9f1a"
integrity sha512-qUu/1i4QHMUy/RQMH/FlNoXdliWTa5bWt55A/DeRRq7gD4kCJCMTCQK2k+r0buSREwTaZGLLu7c6E5dMueV0VA==
path-to-regexp@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.1.0.tgz#0b18f88b7a0ce0bfae6a25990c909ab86f512427"
integrity sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==
shufflejs@^5.2.3:
version "5.2.3"
resolved "https://registry.yarnpkg.com/shufflejs/-/shufflejs-5.2.3.tgz#67bd133b835ca728a1432b4be2eec821cc890d94"
integrity sha512-x/vb3Kdyb5X4GykbdOS49EU34jtMag2aYODL/z0nWT0DVFpWNk08xVeonKSMZnH4/piSWLjCkn4296BlxhvDnw==
dependencies:
array-parallel "^0.1.3"
matches-selector "^1.0.0"
throttleit "^1.0.0"
tiny-emitter "^2.0.1"
tiny-emitter "^2.1.0"
ssr-window@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-1.0.1.tgz#30752a6a4666e7767f0b7e6aa6fc2fdbd0d9b369"
integrity sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==
ssr-window@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-2.0.0.tgz#98c301aef99523317f8d69618f0010791096efc4"
integrity sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==
template7@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/template7/-/template7-1.4.0.tgz#d400af49ea56fc08cc835a20e6167a26b288fb1b"
integrity sha512-NMJWbKIoowHixUYIHq+DLvcBM47t/oZ/xfvBbYuMusjjS6BUjC02+gLWctntJuTTiEqILfefBNCXbfp/EMt/zQ==
template7@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/template7/-/template7-1.4.2.tgz#62f32959361e455ec171ef9ef33d29ca7130e009"
integrity sha512-eoKnScBMDk7lyj7+iCzKbxGiSLLlQk0DNvmclyJuMCUKxy9JrFuAB+GD5iplF4WiQPtMdI06CHHks3avL22JXA==
throttleit@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
tiny-emitter@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
integrity sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==
typo-js@*:
version "1.0.3"
resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.0.3.tgz#54d8ebc7949f1a7810908b6002c6841526c99d5a"
integrity sha1-VNjrx5SfGngQkItgAsaEFSbJnVo=
tiny-emitter@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==

2688
yarn.lock
View File

File diff suppressed because it is too large Load Diff