Commit 2cca1305 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg

Merge branch 'fix-deeplink' into 'master'

Fix photos deeplink

See merge request !376
parents 961806bd 4b5b6484
......@@ -36,7 +36,7 @@
<data android:host="thalia.nu" />
<data android:path="/pizzas/" />
<data android:pathPattern="/events/.*/" />
<data android:pathPattern="/photos/.*/" />
<data android:pathPattern="/members/photos/.*/" />
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
......
......@@ -67,12 +67,12 @@ const deepLink = function* deepLink(action) {
args: [],
},
{
regexp: new RegExp('^/photos/([-\\w]+)/$'),
regexp: new RegExp('^/members/photos/([-\\w]+)/$'),
action: photosActions.openAlbumWithSlug,
args: [],
},
{
regexp: new RegExp('^/photos/$'),
regexp: new RegExp('^/members/photos/$'),
action: photosActions.openAlbums,
args: [],
},
......
......@@ -6,7 +6,7 @@
"start": "react-native start",
"start:ios": "react-native run-ios",
"start:android": "react-native run-android",
"start:android-dev": "react-native run-android --appId com.thaliapp.dev",
"start:android-dev": "react-native run-android --no-jetifier --appId com.thaliapp.dev",
"menu:android": "adb shell input keyevent 82",
"log:ios": "react-native log-ios",
"log:android": "react-native log-android",
......@@ -49,6 +49,7 @@
"@react-native-community/cli": "2.9.0",
"@react-native-community/status-bar": "1.0.3",
"i18next": "17.0.6",
"jetifier": "^1.6.4",
"metro-config": "0.55.0",
"metro-core": "0.55.0",
"moment": "2.24.0",
......
......@@ -5500,6 +5500,11 @@ jetifier@^1.6.2:
resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.3.tgz#61a95b29aefddfe3b6d81ee956f5e99f8b9cba19"
integrity sha512-i0rb2nHVPZDPzFhgs9+yYxEDMh2z0iSHRD3vBQmvn98wlgWKwhmU2F3MUEEXfK+MLnKwLKqsCTvlcS1+CpDTUg==
jetifier@^1.6.4:
version "1.6.4"
resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.4.tgz#6159db8e275d97980d26162897a0648b6d4a3222"
integrity sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==
js-levenshtein@^1.1.3:
version "1.1.6"
resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment