API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Feb 28th, 2019
139
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 24.40 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/packages/app-client/_clients/digikniggs/build.sh b/packages/app-client/_clients/digikniggs/build.sh
  2. index a0d22ddad..fd65e0da9 100755
  3. --- a/packages/app-client/_clients/digikniggs/build.sh
  4. +++ b/packages/app-client/_clients/digikniggs/build.sh
  5. @@ -11,7 +11,7 @@ cd ${parent_path};
  6. cd ../../;
  7.  
  8. export CLIENT=digikniggs
  9. -export APP_IDENTIFIER="at.${CLIENT}.micro"
  10. +export APP_IDENTIFIER="at.${CLIENT}.ovosplay"
  11. export APP_NAME="DigiKniggs"
  12. export APP_DESCRIPTION="Alles rund um den „Achtsamen Umgang“ für Kids von 7 bis 10 Jahren."
  13.  
  14. @@ -23,4 +23,4 @@ cd cordova;
  15. bundle exec fastlane android buildRelease;
  16.  
  17. mkdir -p ../.artifacts/${CLIENT};
  18. -mv ../cordova/platforms/android/app/build/outputs/* ../.artifacts/${CLIENT};
  19. \ No newline at end of file
  20. +mv ../cordova/platforms/android/app/build/outputs/* ../.artifacts/${CLIENT};
  21. diff --git a/packages/app-client/cordova/build-ios.sh b/packages/app-client/cordova/build-ios.sh
  22. index 018b7d801..ddec8eeb2 100755
  23. --- a/packages/app-client/cordova/build-ios.sh
  24. +++ b/packages/app-client/cordova/build-ios.sh
  25. @@ -1,31 +1,35 @@
  26. #!/bin/bash
  27. +branch_regex="master"
  28.  
  29. -release_regex="^(release(\/|\-).*)|feature\/build-ios-akademie-sw|master"
  30. -
  31. -if [[ ! ${CIRCLE_BRANCH} =~ $release_regex ]]; then
  32. - echo "ipa is only built on release* or master branches. Skipping."
  33. +if [[ ! ${CIRCLE_BRANCH} =~ $branch_regex ]]; then
  34. + echo "digikniggs ipa is built only on master branch. Skipping."
  35. exit
  36. fi
  37.  
  38. -parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
  39. -cd ${parent_path};
  40. -cd ../../;
  41. -
  42. -CLIENT=asw
  43. -APP_IDENTIFIER="at.ovos.asw"
  44. -
  45. -CLIENT=${CLIENT} yarn build:mobile;
  46. -
  47. -cd cordova;
  48. +parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
  49. +cd "${parent_path}" || exit;
  50. +cd ../../ || exit;
  51. +
  52. +export CLIENT=digikniggs
  53. +export APP_IDENTIFIER="at.${CLIENT}.micro"
  54. +export APP_NAME="DigiKniggs"
  55. +export APP_DESCRIPTION="Alles rund um den 'Achtsamen Umgang' für Kids von 7 bis 10 Jahren."
  56. +export AUTHOR_EMAIL="bettina.gruber@kinderknigge.com"
  57. +export AUTHOR_HREF="https://www.kinderknigge.com"
  58. +export AUTHOR_NAME="KinderKnigge GmbH"
  59. +export TEAM_ID="2LN2B2MC44"
  60. +export ITC_TEAM_ID="119660338"
  61. +export CERTIFICATE_PATH="../_clients/digikniggs/Kinderknigge_DistributionCertificate.p12"
  62. +
  63. +yarn build:mobile;
  64. +
  65. +cd cordova || exit;
  66. +rm -rf platforms plugins;
  67. cordova prepare ios;
  68. npm i xml2js;
  69. (cd platforms/ios && pod install) # fix googletoolboxformac errors on CI
  70.  
  71. -bundle exec fastlane ios development;
  72. -
  73. -if [ ${CIRCLE_BRANCH} = 'master' ]; then
  74. - bundle exec fastlane ios release;
  75. -fi;
  76. +VERSION_CODE=${CIRCLE_BUILD_NUM} bundle exec fastlane ios release;
  77.  
  78. mkdir -p ../.artifacts/${CLIENT};
  79. mv ../cordova/platforms/ios/build/device/* ../.artifacts/${CLIENT};
  80. diff --git a/packages/app-client/cordova/build.sh b/packages/app-client/cordova/build.sh
  81. index a723a66e5..fd65e0da9 100755
  82. --- a/packages/app-client/cordova/build.sh
  83. +++ b/packages/app-client/cordova/build.sh
  84. @@ -1,9 +1,8 @@
  85. #!/bin/bash
  86. +branch_regex="master"
  87.  
  88. -release_regex="^release\/.*"
  89. -
  90. -if [[ ! ${CIRCLE_BRANCH} =~ $release_regex ]]; then
  91. - echo "POST Stage apk is built only on release/* branches. Skipping."
  92. +if [[ ! ${CIRCLE_BRANCH} =~ $branch_regex ]]; then
  93. + echo "digikniggs apk is built only on master branch. Skipping."
  94. exit
  95. fi
  96.  
  97. @@ -11,12 +10,17 @@ parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
  98. cd ${parent_path};
  99. cd ../../;
  100.  
  101. -CLIENT=post
  102. +export CLIENT=digikniggs
  103. +export APP_IDENTIFIER="at.${CLIENT}.ovosplay"
  104. +export APP_NAME="DigiKniggs"
  105. +export APP_DESCRIPTION="Alles rund um den „Achtsamen Umgang“ für Kids von 7 bis 10 Jahren."
  106.  
  107. -CLIENT=${CLIENT}-stage yarn build:mobile;
  108. +yarn build:mobile;
  109.  
  110. cd cordova;
  111. -APP_IDENTIFIER="at.${CLIENT}.micro" bundle exec fastlane android buildDebugNoVersionUpdate;
  112.  
  113. -mkdir -p ../.artifacts/${CLIENT}-stage;
  114. -mv ../cordova/platforms/android/app/build/outputs/* ../.artifacts/${CLIENT}-stage;
  115. +# @TODO change this to just "release" once we have the necessary json_key_file an configure fastlane for autodeploy
  116. +bundle exec fastlane android buildRelease;
  117. +
  118. +mkdir -p ../.artifacts/${CLIENT};
  119. +mv ../cordova/platforms/android/app/build/outputs/* ../.artifacts/${CLIENT};
  120. diff --git a/packages/app-client/cordova/config.xml b/packages/app-client/cordova/config.xml
  121. index 2fcb839d4..01cbe1838 100644
  122. --- a/packages/app-client/cordova/config.xml
  123. +++ b/packages/app-client/cordova/config.xml
  124. @@ -1,7 +1,7 @@
  125. <?xml version='1.0' encoding='utf-8'?>
  126. -<widget android-versionCode="1" id="at.ovos.micro" ios-CFBundleVersion="1" version="1.11.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
  127. - <name>ovos play [DEV]</name>
  128. - <description>ovos play application DEV BUILD</description>
  129. +<widget android-versionCode="10" id="at.digikniggs.ovosplay" ios-CFBundleVersion="1" version="1.14.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
  130. + <name>ovos play micro</name>
  131. + <description />
  132. <author email="office@ovos.at" href="https://ovos.at">ovos media gmbh</author>
  133. <content src="index.html" />
  134. <access origin="*" />
  135. diff --git a/packages/app-client/cordova/fastlane/Fastfile b/packages/app-client/cordova/fastlane/Fastfile
  136. index 08d4a63a9..609cde152 100644
  137. --- a/packages/app-client/cordova/fastlane/Fastfile
  138. +++ b/packages/app-client/cordova/fastlane/Fastfile
  139. @@ -83,7 +83,7 @@ platform :android do
  140. end
  141.  
  142. lane :buildRelease do
  143. - setVersionCodesEnv
  144. + # setVersionCodesEnv
  145.  
  146. cordova(
  147. platform: 'android',
  148. @@ -162,4 +162,3 @@ platform :ios do
  149. )
  150. end
  151. end
  152. -
  153. diff --git a/packages/app-client/cordova/google-services.json b/packages/app-client/cordova/google-services.json
  154. index d9755d4a6..c3b6e6dab 100644
  155. --- a/packages/app-client/cordova/google-services.json
  156. +++ b/packages/app-client/cordova/google-services.json
  157. @@ -84,6 +84,45 @@
  158. }
  159. }
  160. },
  161. + {
  162. + "client_info": {
  163. + "mobilesdk_app_id": "1:870333243993:android:9bab5299af118195",
  164. + "android_client_info": {
  165. + "package_name": "at.digikniggs.ovosplay"
  166. + }
  167. + },
  168. + "oauth_client": [
  169. + {
  170. + "client_id": "870333243993-o2clpc78b25sibksmf6g73m10te36nln.apps.googleusercontent.com",
  171. + "client_type": 3
  172. + },
  173. + {
  174. + "client_id": "870333243993-c9mhdifau8btd71erff6jdkmj04n4j6g.apps.googleusercontent.com",
  175. + "client_type": 3
  176. + },
  177. + {
  178. + "client_id": "870333243993-g62am09mpl8vmnkaiqka3hhpm4mi94pt.apps.googleusercontent.com",
  179. + "client_type": 3
  180. + }
  181. + ],
  182. + "api_key": [
  183. + {
  184. + "current_key": "AIzaSyAQYlQtUuhqljhuebulXBfOZA4BYct6-HQ"
  185. + }
  186. + ],
  187. + "services": {
  188. + "analytics_service": {
  189. + "status": 1
  190. + },
  191. + "appinvite_service": {
  192. + "status": 1,
  193. + "other_platform_oauth_client": []
  194. + },
  195. + "ads_service": {
  196. + "status": 2
  197. + }
  198. + }
  199. + },
  200. {
  201. "client_info": {
  202. "mobilesdk_app_id": "1:870333243993:android:af7959d841526cf4",
  203. @@ -398,4 +437,4 @@
  204. }
  205. ],
  206. "configuration_version": "1"
  207. -}
  208. +}
  209. \ No newline at end of file
  210. diff --git a/packages/app-client/cordova/res/icons/android/drawable-hdpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-hdpi-icon.png
  211. old mode 100644
  212. new mode 100755
  213. index 0cd88d484..5d2acd4ef
  214. Binary files a/packages/app-client/cordova/res/icons/android/drawable-hdpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-hdpi-icon.png differ
  215. diff --git a/packages/app-client/cordova/res/icons/android/drawable-ldpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-ldpi-icon.png
  216. old mode 100644
  217. new mode 100755
  218. index bccbfec26..7432f8721
  219. Binary files a/packages/app-client/cordova/res/icons/android/drawable-ldpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-ldpi-icon.png differ
  220. diff --git a/packages/app-client/cordova/res/icons/android/drawable-mdpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-mdpi-icon.png
  221. old mode 100644
  222. new mode 100755
  223. index 779a89af4..b2e9e2f61
  224. Binary files a/packages/app-client/cordova/res/icons/android/drawable-mdpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-mdpi-icon.png differ
  225. diff --git a/packages/app-client/cordova/res/icons/android/drawable-xhdpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-xhdpi-icon.png
  226. old mode 100644
  227. new mode 100755
  228. index 7ea759bd8..67c9a8d79
  229. Binary files a/packages/app-client/cordova/res/icons/android/drawable-xhdpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-xhdpi-icon.png differ
  230. diff --git a/packages/app-client/cordova/res/icons/android/drawable-xxhdpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-xxhdpi-icon.png
  231. old mode 100644
  232. new mode 100755
  233. index 2976d79a6..5106bcf2b
  234. Binary files a/packages/app-client/cordova/res/icons/android/drawable-xxhdpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-xxhdpi-icon.png differ
  235. diff --git a/packages/app-client/cordova/res/icons/android/drawable-xxxhdpi-icon.png b/packages/app-client/cordova/res/icons/android/drawable-xxxhdpi-icon.png
  236. old mode 100644
  237. new mode 100755
  238. index 82f7d5654..0865d0c7d
  239. Binary files a/packages/app-client/cordova/res/icons/android/drawable-xxxhdpi-icon.png and b/packages/app-client/cordova/res/icons/android/drawable-xxxhdpi-icon.png differ
  240. diff --git a/packages/app-client/cordova/res/icons/ios/icon-40.png b/packages/app-client/cordova/res/icons/ios/icon-40.png
  241. index 8228b35c0..e805d4936 100644
  242. Binary files a/packages/app-client/cordova/res/icons/ios/icon-40.png and b/packages/app-client/cordova/res/icons/ios/icon-40.png differ
  243. diff --git a/packages/app-client/cordova/res/icons/ios/icon-40@2x.png b/packages/app-client/cordova/res/icons/ios/icon-40@2x.png
  244. index e72b63492..efbdb6460 100644
  245. Binary files a/packages/app-client/cordova/res/icons/ios/icon-40@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-40@2x.png differ
  246. diff --git a/packages/app-client/cordova/res/icons/ios/icon-50.png b/packages/app-client/cordova/res/icons/ios/icon-50.png
  247. index 4c07e450f..91bde4935 100644
  248. Binary files a/packages/app-client/cordova/res/icons/ios/icon-50.png and b/packages/app-client/cordova/res/icons/ios/icon-50.png differ
  249. diff --git a/packages/app-client/cordova/res/icons/ios/icon-50@2x.png b/packages/app-client/cordova/res/icons/ios/icon-50@2x.png
  250. index f8b7cd07c..63fe3dd85 100644
  251. Binary files a/packages/app-client/cordova/res/icons/ios/icon-50@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-50@2x.png differ
  252. diff --git a/packages/app-client/cordova/res/icons/ios/icon-60.png b/packages/app-client/cordova/res/icons/ios/icon-60.png
  253. index e0f173c52..15a2b5c7d 100644
  254. Binary files a/packages/app-client/cordova/res/icons/ios/icon-60.png and b/packages/app-client/cordova/res/icons/ios/icon-60.png differ
  255. diff --git a/packages/app-client/cordova/res/icons/ios/icon-60@2x.png b/packages/app-client/cordova/res/icons/ios/icon-60@2x.png
  256. index 225a77c9c..b1f8a17ed 100644
  257. Binary files a/packages/app-client/cordova/res/icons/ios/icon-60@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-60@2x.png differ
  258. diff --git a/packages/app-client/cordova/res/icons/ios/icon-60@3x.png b/packages/app-client/cordova/res/icons/ios/icon-60@3x.png
  259. index d44ff94c7..3d2788a59 100644
  260. Binary files a/packages/app-client/cordova/res/icons/ios/icon-60@3x.png and b/packages/app-client/cordova/res/icons/ios/icon-60@3x.png differ
  261. diff --git a/packages/app-client/cordova/res/icons/ios/icon-72.png b/packages/app-client/cordova/res/icons/ios/icon-72.png
  262. index 0cd88d484..656498345 100644
  263. Binary files a/packages/app-client/cordova/res/icons/ios/icon-72.png and b/packages/app-client/cordova/res/icons/ios/icon-72.png differ
  264. diff --git a/packages/app-client/cordova/res/icons/ios/icon-72@2x.png b/packages/app-client/cordova/res/icons/ios/icon-72@2x.png
  265. index 2976d79a6..2273979b0 100644
  266. Binary files a/packages/app-client/cordova/res/icons/ios/icon-72@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-72@2x.png differ
  267. diff --git a/packages/app-client/cordova/res/icons/ios/icon-76.png b/packages/app-client/cordova/res/icons/ios/icon-76.png
  268. index a0f889ef3..948d2fa7f 100644
  269. Binary files a/packages/app-client/cordova/res/icons/ios/icon-76.png and b/packages/app-client/cordova/res/icons/ios/icon-76.png differ
  270. diff --git a/packages/app-client/cordova/res/icons/ios/icon-76@2x.png b/packages/app-client/cordova/res/icons/ios/icon-76@2x.png
  271. index d4a9cc5a1..c737a28f0 100644
  272. Binary files a/packages/app-client/cordova/res/icons/ios/icon-76@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-76@2x.png differ
  273. diff --git a/packages/app-client/cordova/res/icons/ios/icon-small.png b/packages/app-client/cordova/res/icons/ios/icon-small.png
  274. index 8235c9232..6c5b921ea 100644
  275. Binary files a/packages/app-client/cordova/res/icons/ios/icon-small.png and b/packages/app-client/cordova/res/icons/ios/icon-small.png differ
  276. diff --git a/packages/app-client/cordova/res/icons/ios/icon-small@2x.png b/packages/app-client/cordova/res/icons/ios/icon-small@2x.png
  277. index 893e100ec..cf3b3fb59 100644
  278. Binary files a/packages/app-client/cordova/res/icons/ios/icon-small@2x.png and b/packages/app-client/cordova/res/icons/ios/icon-small@2x.png differ
  279. diff --git a/packages/app-client/cordova/res/icons/ios/icon-small@3x.png b/packages/app-client/cordova/res/icons/ios/icon-small@3x.png
  280. index a75ff4f22..0064750f1 100644
  281. Binary files a/packages/app-client/cordova/res/icons/ios/icon-small@3x.png and b/packages/app-client/cordova/res/icons/ios/icon-small@3x.png differ
  282. diff --git a/packages/app-client/cordova/res/icons/ios/icon.png b/packages/app-client/cordova/res/icons/ios/icon.png
  283. index aabb77040..6bac9f6ad 100644
  284. Binary files a/packages/app-client/cordova/res/icons/ios/icon.png and b/packages/app-client/cordova/res/icons/ios/icon.png differ
  285. diff --git a/packages/app-client/cordova/res/icons/ios/icon@2x.png b/packages/app-client/cordova/res/icons/ios/icon@2x.png
  286. index 2dbb5539c..f96737083 100644
  287. Binary files a/packages/app-client/cordova/res/icons/ios/icon@2x.png and b/packages/app-client/cordova/res/icons/ios/icon@2x.png differ
  288. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-hdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-hdpi-screen.png
  289. old mode 100644
  290. new mode 100755
  291. index d8b1bd157..58f0adc43
  292. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-hdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-hdpi-screen.png differ
  293. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-ldpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-ldpi-screen.png
  294. old mode 100644
  295. new mode 100755
  296. index 150329784..f864349d8
  297. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-ldpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-ldpi-screen.png differ
  298. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-mdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-mdpi-screen.png
  299. old mode 100644
  300. new mode 100755
  301. index b9a966408..036402579
  302. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-mdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-mdpi-screen.png differ
  303. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-xhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-xhdpi-screen.png
  304. old mode 100644
  305. new mode 100755
  306. index 37f54693d..92a32b743
  307. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-xhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-xhdpi-screen.png differ
  308. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-xxhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-xxhdpi-screen.png
  309. old mode 100644
  310. new mode 100755
  311. index 8e2b57bd4..cfe1e81f1
  312. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-xxhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-xxhdpi-screen.png differ
  313. diff --git a/packages/app-client/cordova/res/screens/android/drawable-land-xxxhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-land-xxxhdpi-screen.png
  314. old mode 100644
  315. new mode 100755
  316. index e4b344ee3..bf1aed305
  317. Binary files a/packages/app-client/cordova/res/screens/android/drawable-land-xxxhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-land-xxxhdpi-screen.png differ
  318. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-hdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-hdpi-screen.png
  319. old mode 100644
  320. new mode 100755
  321. index 3a177a43e..7ec9ee560
  322. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-hdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-hdpi-screen.png differ
  323. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-ldpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-ldpi-screen.png
  324. old mode 100644
  325. new mode 100755
  326. index 1d2434e14..e9483a505
  327. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-ldpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-ldpi-screen.png differ
  328. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-mdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-mdpi-screen.png
  329. old mode 100644
  330. new mode 100755
  331. index df78cd716..647c95520
  332. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-mdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-mdpi-screen.png differ
  333. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-xhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-xhdpi-screen.png
  334. old mode 100644
  335. new mode 100755
  336. index 45db18496..850b09b21
  337. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-xhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-xhdpi-screen.png differ
  338. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-xxhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-xxhdpi-screen.png
  339. old mode 100644
  340. new mode 100755
  341. index a4121ba6b..885645a82
  342. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-xxhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-xxhdpi-screen.png differ
  343. diff --git a/packages/app-client/cordova/res/screens/android/drawable-port-xxxhdpi-screen.png b/packages/app-client/cordova/res/screens/android/drawable-port-xxxhdpi-screen.png
  344. old mode 100644
  345. new mode 100755
  346. index ae2df0b80..dd95dab80
  347. Binary files a/packages/app-client/cordova/res/screens/android/drawable-port-xxxhdpi-screen.png and b/packages/app-client/cordova/res/screens/android/drawable-port-xxxhdpi-screen.png differ
  348. diff --git a/packages/app-client/cordova/res/screens/ios/Default-568h@2x~iphone.png b/packages/app-client/cordova/res/screens/ios/Default-568h@2x~iphone.png
  349. old mode 100644
  350. new mode 100755
  351. index dff47c552..dbc2cf975
  352. Binary files a/packages/app-client/cordova/res/screens/ios/Default-568h@2x~iphone.png and b/packages/app-client/cordova/res/screens/ios/Default-568h@2x~iphone.png differ
  353. diff --git a/packages/app-client/cordova/res/screens/ios/Default-667h.png b/packages/app-client/cordova/res/screens/ios/Default-667h.png
  354. old mode 100644
  355. new mode 100755
  356. index 0dda4dad4..bdc446ae1
  357. Binary files a/packages/app-client/cordova/res/screens/ios/Default-667h.png and b/packages/app-client/cordova/res/screens/ios/Default-667h.png differ
  358. diff --git a/packages/app-client/cordova/res/screens/ios/Default-736h.png b/packages/app-client/cordova/res/screens/ios/Default-736h.png
  359. old mode 100644
  360. new mode 100755
  361. index 26fb62230..249e88fbd
  362. Binary files a/packages/app-client/cordova/res/screens/ios/Default-736h.png and b/packages/app-client/cordova/res/screens/ios/Default-736h.png differ
  363. diff --git a/packages/app-client/cordova/res/screens/ios/Default-Landscape-736h.png b/packages/app-client/cordova/res/screens/ios/Default-Landscape-736h.png
  364. old mode 100644
  365. new mode 100755
  366. index f40589adc..4d05f6b34
  367. Binary files a/packages/app-client/cordova/res/screens/ios/Default-Landscape-736h.png and b/packages/app-client/cordova/res/screens/ios/Default-Landscape-736h.png differ
  368. diff --git a/packages/app-client/cordova/res/screens/ios/Default-Landscape@2x~ipad.png b/packages/app-client/cordova/res/screens/ios/Default-Landscape@2x~ipad.png
  369. old mode 100644
  370. new mode 100755
  371. index e200aca6d..3bfd62a65
  372. Binary files a/packages/app-client/cordova/res/screens/ios/Default-Landscape@2x~ipad.png and b/packages/app-client/cordova/res/screens/ios/Default-Landscape@2x~ipad.png differ
  373. diff --git a/packages/app-client/cordova/res/screens/ios/Default-Landscape~ipad.png b/packages/app-client/cordova/res/screens/ios/Default-Landscape~ipad.png
  374. old mode 100644
  375. new mode 100755
  376. index cedb79205..31efc8a0a
  377. Binary files a/packages/app-client/cordova/res/screens/ios/Default-Landscape~ipad.png and b/packages/app-client/cordova/res/screens/ios/Default-Landscape~ipad.png differ
  378. diff --git a/packages/app-client/cordova/res/screens/ios/Default-Portrait@2x~ipad.png b/packages/app-client/cordova/res/screens/ios/Default-Portrait@2x~ipad.png
  379. old mode 100644
  380. new mode 100755
  381. index c72cba85c..f9ec5b8af
  382. Binary files a/packages/app-client/cordova/res/screens/ios/Default-Portrait@2x~ipad.png and b/packages/app-client/cordova/res/screens/ios/Default-Portrait@2x~ipad.png differ
  383. diff --git a/packages/app-client/cordova/res/screens/ios/Default-Portrait~ipad.png b/packages/app-client/cordova/res/screens/ios/Default-Portrait~ipad.png
  384. old mode 100644
  385. new mode 100755
  386. index d9dddcbb0..2de95b0f5
  387. Binary files a/packages/app-client/cordova/res/screens/ios/Default-Portrait~ipad.png and b/packages/app-client/cordova/res/screens/ios/Default-Portrait~ipad.png differ
  388. diff --git a/packages/app-client/cordova/res/screens/ios/Default@2x~iphone.png b/packages/app-client/cordova/res/screens/ios/Default@2x~iphone.png
  389. old mode 100644
  390. new mode 100755
  391. index fbce03a19..53ddb2b39
  392. Binary files a/packages/app-client/cordova/res/screens/ios/Default@2x~iphone.png and b/packages/app-client/cordova/res/screens/ios/Default@2x~iphone.png differ
  393. diff --git a/packages/app-client/cordova/res/screens/ios/Default~iphone.png b/packages/app-client/cordova/res/screens/ios/Default~iphone.png
  394. old mode 100644
  395. new mode 100755
  396. index df78cd716..647c95520
  397. Binary files a/packages/app-client/cordova/res/screens/ios/Default~iphone.png and b/packages/app-client/cordova/res/screens/ios/Default~iphone.png differ
  398. diff --git a/packages/app-client/src/components/LoadingSpinners/Circle.tsx b/packages/app-client/src/components/LoadingSpinners/Circle.tsx
  399. index 68d91f267..d8e594537 100644
  400. --- a/packages/app-client/src/components/LoadingSpinners/Circle.tsx
  401. +++ b/packages/app-client/src/components/LoadingSpinners/Circle.tsx
  402. @@ -1,11 +1,15 @@
  403. import React, { memo } from 'react';
  404.  
  405. -import { withTheme } from '../../domains/theming';
  406. +import { withTheme, InjectedWithThemeProps } from '../../domains/theming';
  407.  
  408. import * as styles from './circle.less';
  409.  
  410. +interface ICircle extends InjectedWithThemeProps {
  411. + center: boolean;
  412. +}
  413. +
  414. // @ts-ignore
  415. -export default memo(withTheme('colors')(({ theme, center = false }) => (
  416. +export default memo(withTheme('colors')(({ theme, center = false }: ICircle) => (
  417. <div className={center ? styles.center : ''}>
  418. <div
  419. className={styles.loader}
  420. diff --git a/packages/app-client/src/domains/authentication/components/GuestRoute.tsx b/packages/app-client/src/domains/authentication/components/GuestRoute.tsx
  421. index ec3e1c2be..3adeba2f3 100644
  422. --- a/packages/app-client/src/domains/authentication/components/GuestRoute.tsx
  423. +++ b/packages/app-client/src/domains/authentication/components/GuestRoute.tsx
  424. @@ -7,7 +7,7 @@ const mapStateToProps = ({ auth }) => ({
  425. });
  426.  
  427. interface IGuestRouteProps extends RouteProps {
  428. - component: React.ComponentType;
  429. + component: React.LazyExoticComponent<any>;
  430. isLoggedIn?: boolean | string;
  431. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!