Merge branch 'app' into app-publish

.circleci/config.yml

@@ -34,7 +34,7 @@ jobs:
   build-and-publish-apple:
     macos:
       # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: "13.0.0" # 11.3.1 12.4.0 13.2.1
+      xcode: "14.3.0" # 11.3.1 12.4.0 13.2.1 13.0.0
     #resource_class: large
     resource_class: macos.x86.medium.gen2
     steps:

components/GlobalWarning.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
+  <div v-if="false">
     <client-only>
-      <NoticeMessage v-if="show && false" variant="info">
+      <NoticeMessage v-if="show" variant="info">
         <b-btn variant="link" class="float-right" @click="hideit">
           Hide this
         </b-btn>

components/MainHeader.vue

@@ -137,7 +137,7 @@
           height="58"
           width="58"
           rounded
-          :src="require(`@/static/icon.png`)"
+          :src="logo"
           alt="Home"
         />
       </b-navbar-brand>
@@ -312,6 +312,9 @@ export default {
     
       if (ret.ret === 0 && ret.logo) {
         this.logo = ret.logo.path.replace(/.*logos/, '/logos')
+        if (this.isApp) {
+          this.logo = ret.logo.path.replace('/images', '')
+        }
       }
     }
     }, 5000)

mobile/freegle/ios/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.ilovefreegle.iphone" ios-CFBundleVersion="335" version="2.0.119" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.ilovefreegle.iphone" ios-CFBundleVersion="336" version="2.0.119" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Freegle</name>
     <description>Offer and request free items on your local Freegle reuse group</description>
     <author email="[email protected]" href="https://ilovefreegle.org">