cdmoss преди 2 години
родител
ревизия
4d2bc573e4
променени са 7 файла, в които са добавени 44 реда и са изтрити 20 реда
  1. 1 8
      android/app/src/main/AndroidManifest.xml
  2. BIN
      assets/locator.png
  3. 33 5
      assets/mapicon.svg
  4. BIN
      assets/misc.png
  5. 1 1
      src/data/Auth/AuthContext.tsx
  6. 7 4
      src/utils/GlobalUtils.ts
  7. 2 2
      src/utils/RequestUtils.ts

+ 1 - 8
android/app/src/main/AndroidManifest.xml

@@ -8,13 +8,6 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <queries>
-    <intent>
-      <action android:name="android.intent.action.VIEW"/>
-      <category android:name="android.intent.category.BROWSABLE"/>
-      <data android:scheme="https"/>
-    </intent>
-  </queries>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
     <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBkpMWgPFbmVFUrma67bR8knwqA-U24H8c"/>
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
@@ -32,7 +25,7 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="cnp.mobile"/>
-        <data android:scheme="com.clicknpush.mobile"/>
+        <data android:scheme="https"/>
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>

BIN
assets/locator.png


+ 33 - 5
assets/mapicon.svg

@@ -28,14 +28,14 @@
      inkscape:document-units="mm"
      showgrid="false"
      inkscape:zoom="1.6017536"
-     inkscape:cx="263.14908"
-     inkscape:cy="333.69676"
+     inkscape:cx="361.16666"
+     inkscape:cy="314.9673"
      inkscape:window-width="1284"
      inkscape:window-height="793"
      inkscape:window-x="2029"
      inkscape:window-y="128"
      inkscape:window-maximized="0"
-     inkscape:current-layer="layer1-0" />
+     inkscape:current-layer="layer1" />
   <defs
      id="defs2" />
   <g
@@ -56,14 +56,14 @@
          y="-3.8746803"
          style="fill:#800080" />
       <circle
-         style="fill:#008000;fill-rule:evenodd;stroke-width:0.412708"
+         style="fill:#800033;fill-rule:evenodd;stroke-width:0.412708"
          id="path31"
          cx="134.12941"
          cy="10.2516"
          r="17.5" />
       <path
          sodipodi:type="star"
-         style="fill:#008000;fill-rule:evenodd"
+         style="fill:#800033;fill-rule:evenodd"
          id="path553"
          inkscape:flatsided="false"
          sodipodi:sides="3"
@@ -86,5 +86,33 @@
          cy="9.4013062"
          r="13" />
     </g>
+    <image
+       width="23.18363"
+       height="25.165833"
+       preserveAspectRatio="none"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+jwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPlSURBVHhe7d1dUtswFAbQUKA8UFbTDbLBbqbT
+djr0V25MJ8SOoiSWLCnnvNiZYRLp415ZGEg2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQgpvxmN3z5uOf8fSo582nYuNaU2om8pgqlUm2Fzll
+sjE9FYdMpmrPZPEnXWrCc1otjFyZyGNq6UwWe7Kck97XSmGUykQeU0tlssST3IWJ/xjPi6m5KEoW
+wq6KM7kJmfwez4sJedyHw8/to/NcFOhahbCrtqJYOxN5TF2SybvxeLIaJj6oZRzBQx3F8G8Mw8q5
+uh5q5KwGqago/6lgPE9hDN/H89WFsbyEw+P20Tp6qZGTLz21TXzXStuLoTk+j+dVCXl8CIev20fl
+9FQjJ31xzRN/VbhJhm1VNVeOOSGP9+FQ7CZKbzWS/IUtTPxVqSZpJRN5TKVmkvQzSEsTH92Ox2za
+KoYiY63ixkCq1EzOvotVszD5i+59H9PggpF9zOH5hxsD3TnaIC0Ww6DVcbeo5xqJNogim2o5E9/P
+WXfjcVaXW6xXCiK/1jMO44/e4Ys1SJE7Hy3poeEsGrMO1vrBBglBFv/jshwURD69ZBur9a63WEvq
+qdEsGulmG0SAXJtDNX8VVxANv7xrydQWCyI0SIIeV0tX1TQaBCImDWJl4VrN1b4rCERoEIjQIBCh
+QSBCg0DEpEFK/f8y1Gau9l1BIEKDJOjxqmqnkEaDQMRVNIjVcnnXkulsgygors2hmrfFStTTomEB
+THewQUKIXTSPYsinl2xjtR5rAn/Vu6eHgrBgzDpY69GrRAgz+qZatVMM+bWe8bEaP7aN+jUeGbVc
+EBaMWdEaP/pzRquhKoZyeq6Row3SojDxrB9/0GJB5B5zeP6mt+OHJDVIgwWR/V0hW8qk0Fib2o6n
+ZpJ8BWmlIEqOM7zWw3harTDGYh9s02ONnLTFqj2AFcb3El7zaTyvThjb8Em3WT9MaF9vNXLWZGp8
+55OVvzGPIZMv43kVxub4tn1UXi81cnZR1RRAJavWfcikio8hC3kM26qiV445PdTIRYW1dgBrr5Jz
+KsikhsXivxqa5JJMlgjzNoRQfLWqrRB2rVUUMnkr5DHcer7o7tpigZYMoOZC2FUqE3lMLZXJ4sHm
+DKGVQtiXKxN5TC2dSc6Ab0IQF//CrtUimLNUYcjkrZDH8OuKLE1XLOhTguipAGJSM5HH1LVkAgAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACTab
+vzgUM5kLFUqnAAAAAElFTkSuQmCC
+"
+       id="image1142"
+       x="92.197334"
+       y="61.165543" />
   </g>
 </svg>

BIN
assets/misc.png


+ 1 - 1
src/data/Auth/AuthContext.tsx

@@ -288,7 +288,7 @@ export const AuthContextProvider: React.FC = ({children}) => {
         
             // handle authentication response from the server
             LOGGING.log('AUTH', 'info', "Prompting user with web browser...")
-            const response = await request.promptAsync(discovery);
+            const response = await request.promptAsync(discovery, {createTask: false});
         
             // if succesful, prepare a request for an access/id token
             if (response.type == "success" && request.codeVerifier) {

+ 7 - 4
src/utils/GlobalUtils.ts

@@ -30,6 +30,8 @@ export const lmTypes: {[key: number]: {image: ImageRequireSource, label: string}
     9: {image: require('../../assets/ice.png'), label: "ice"},
     14: {image: require('../../assets/ramp.png'), label: "ramp"},
     16: {image: require('../../assets/childfriendly.png'), label: "child friendly area"},
+    21: {image: require('../../assets/accessibleEntrance.png'), label: 'accessible entrance'},
+    22: {image: require('../../assets/misc.png'), label: 'misc'}
 }
 
 export const lmTypesIndoor: {[key: number]: {image: ImageRequireSource, label: string}} = {
@@ -43,10 +45,11 @@ export const lmTypesIndoor: {[key: number]: {image: ImageRequireSource, label: s
     14: {image: require('../../assets/ramp.png'), label: "ramp"},
     15: {image: require('../../assets/water.png'), label: "water fountain"},
     16: {image: require('../../assets/childfriendly.png'), label: "child friendly area"},
-    17: {image: require('../../assets/garbage.png'), label: "Garbage cans"},
-    18: {image: require('../../assets/loudnoise.png'), label: "Loud area"},
-    19: {image: require('../../assets/tripping.png'), label: "Tripping hazard"},
-
+    17: {image: require('../../assets/garbage.png'), label: "garbage cans"},
+    18: {image: require('../../assets/loudnoise.png'), label: "loud area"},
+    19: {image: require('../../assets/tripping.png'), label: "tripping hazard"},
+    20: {image: require('../../assets/locator.png'), label: 'locator'},
+    22: {image: require('../../assets/misc.png'), label: 'misc'}
 }
 
 // 2: {image: require('../../assets/stairs.png'), label: "stairs"},

+ 2 - 2
src/utils/RequestUtils.ts

@@ -11,8 +11,8 @@
 //export const API_URL = 'http://192.168.3.81:8000'
 // export const API_URL = 'https://staging.clicknpush.ca'
 
-//export const API_URL = 'https://app.clicknpush.ca'
-export const API_URL = 'http://192.168.1.64:8000'   // Chase
+export const API_URL = 'https://app.clicknpush.ca'
+//export const API_URL = 'http://192.168.1.64:8000'   // Chase
 //export const API_URL = 'http://192.168.0.22:8000'       // Eric
 //export const API_URL = 'https://app.clicknpush.ca'