public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-04-13 09:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix url patterns usage to use a list of url() calls

Browse source
This commit is contained in:
jmath1 2020-06-11 04:34:16 -04:00
parent 6412393ca9
commit 0f9d839a49
21 changed files with 103 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/analyzer/urls.py
View file

@ -1,9 +1,9 @@
from django.conf.urls import * from django.conf.urls import url
from apps.analyzer import views from apps.analyzer import views
urlpatterns = patterns('', urlpatterns = [
(r'^$', views.index), url(r'^$', views.index),
(r'^save/?', views.save_classifier), url(r'^save/?', views.save_classifier),
(r'^popularity/?', views.popularity_query), url(r'^popularity/?', views.popularity_query),
(r'^(?P<feed_id>\d+)', views.get_classifiers_feed), url(r'^(?P<feed_id>\d+)', views.get_classifiers_feed),
) ]

6
apps/api/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import * from django.conf.urls import url
from apps.api import views from apps.api import views
urlpatterns = patterns('', urlpatterns = [
url(r'^logout', views.logout, name='api-logout'), url(r'^logout', views.logout, name='api-logout'),
url(r'^login', views.login, name='api-login'), url(r'^login', views.login, name='api-login'),
url(r'^signup', views.signup, name='api-signup'), url(r'^signup', views.signup, name='api-signup'),
@ -11,4 +11,4 @@ urlpatterns = patterns('',
url(r'^check_share_on_site/(?P<token>\w+)', views.check_share_on_site, name='api-check-share-on-site'), url(r'^check_share_on_site/(?P<token>\w+)', views.check_share_on_site, name='api-check-share-on-site'),
url(r'^share_story/(?P<token>\w+)', views.share_story, name='api-share-story'), url(r'^share_story/(?P<token>\w+)', views.share_story, name='api-share-story'),
url(r'^share_story/?$', views.share_story), url(r'^share_story/?$', views.share_story),
) ]

6
apps/categories/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import url, patterns from django.conf.urls import url
from apps.categories import views from apps.categories import views
urlpatterns = patterns('', urlpatterns = [
url(r'^/?$', views.all_categories, name='all-categories'), url(r'^/?$', views.all_categories, name='all-categories'),
url(r'^subscribe/?$', views.subscribe, name='categories-subscribe'), url(r'^subscribe/?$', views.subscribe, name='categories-subscribe'),
) ]

6
apps/feed_import/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import * from django.conf.urls import url
from apps.feed_import import views from apps.feed_import import views
urlpatterns = patterns('apps.feed_import.views', urlpatterns = [
url(r'^opml_upload/?$', views.opml_upload, name='opml-upload'), url(r'^opml_upload/?$', views.opml_upload, name='opml-upload'),
url(r'^opml_export/?$', views.opml_export, name='opml-export'), url(r'^opml_export/?$', views.opml_export, name='opml-export'),
) ]

6
apps/mobile/urls.py
View file

@ -1,6 +1,6 @@
from django.conf.urls import * from django.conf.urls import url
from apps.mobile import views from apps.mobile import views
urlpatterns = patterns('apps.mobile.views', urlpatterns = [
url(r'^$', views.index, name='mobile-index'), url(r'^$', views.index, name='mobile-index'),
) ]

6
apps/newsletters/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import * from django.conf.urls import url
from apps.newsletters import views from apps.newsletters import views
urlpatterns = patterns('', urlpatterns = [
url(r'^receive/?$', views.newsletter_receive, name='newsletter-receive'), url(r'^receive/?$', views.newsletter_receive, name='newsletter-receive'),
url(r'^story/(?P<story_hash>[\w:]+)/?$', views.newsletter_story, name='newsletter-story'), url(r'^story/(?P<story_hash>[\w:]+)/?$', views.newsletter_story, name='newsletter-story'),
) ]

6
apps/notifications/urls.py
View file

@ -1,11 +1,11 @@
from django.conf.urls import url, patterns from django.conf.urls import url
from apps.notifications import views from apps.notifications import views
from oauth2_provider import views as op_views from oauth2_provider import views as op_views
urlpatterns = patterns('', urlpatterns = [
url(r'^$', views.notifications_by_feed, name='notifications-by-feed'), url(r'^$', views.notifications_by_feed, name='notifications-by-feed'),
url(r'^feed/?$', views.set_notifications_for_feed, name='set-notifications-for-feed'), url(r'^feed/?$', views.set_notifications_for_feed, name='set-notifications-for-feed'),
url(r'^apns_token/?$', views.set_apns_token, name='set-apns-token'), url(r'^apns_token/?$', views.set_apns_token, name='set-apns-token'),
url(r'^android_token/?$', views.set_android_token, name='set-android-token'), url(r'^android_token/?$', views.set_android_token, name='set-android-token'),
url(r'^force_push/?$', views.force_push, name='force-push-notification'), url(r'^force_push/?$', views.force_push, name='force-push-notification'),
) ]

4
apps/oauth/urls.py
View file

@ -2,7 +2,7 @@ from django.conf.urls import url, patterns
from apps.oauth import views from apps.oauth import views
from oauth2_provider import views as op_views from oauth2_provider import views as op_views
urlpatterns = patterns('', urlpatterns = [
url(r'^twitter_connect/?$', views.twitter_connect, name='twitter-connect'), url(r'^twitter_connect/?$', views.twitter_connect, name='twitter-connect'),
url(r'^facebook_connect/?$', views.facebook_connect, name='facebook-connect'), url(r'^facebook_connect/?$', views.facebook_connect, name='facebook-connect'),
url(r'^twitter_disconnect/?$', views.twitter_disconnect, name='twitter-disconnect'), url(r'^twitter_disconnect/?$', views.twitter_disconnect, name='twitter-disconnect'),
@ -32,4 +32,4 @@ urlpatterns = patterns('',
url(r'^actions/add-site/?$', views.api_save_new_subscription, name="ifttt-action-subscription"), url(r'^actions/add-site/?$', views.api_save_new_subscription, name="ifttt-action-subscription"),
url(r'^actions/add-site/fields/folder/options/?$', url(r'^actions/add-site/fields/folder/options/?$',
views.api_folder_list, name="ifttt-action-folderlist"), views.api_folder_list, name="ifttt-action-folderlist"),
) ]

4
apps/profile/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import * from django.conf.urls import *
from apps.profile import views from apps.profile import views
urlpatterns = patterns('', urlpatterns = [
url(r'^get_preferences?/?', views.get_preference), url(r'^get_preferences?/?', views.get_preference),
url(r'^set_preference/?', views.set_preference), url(r'^set_preference/?', views.set_preference),
url(r'^set_account_settings/?', views.set_account_settings), url(r'^set_account_settings/?', views.set_account_settings),
@ -30,4 +30,4 @@ urlpatterns = patterns('',
url(r'^delete_all_sites/?', views.delete_all_sites, name='profile-delete-all-sites'), url(r'^delete_all_sites/?', views.delete_all_sites, name='profile-delete-all-sites'),
url(r'^email_optout/?', views.email_optout, name='profile-email-optout'), url(r'^email_optout/?', views.email_optout, name='profile-email-optout'),
url(r'^ios_subscription_status/?', views.ios_subscription_status, name='profile-ios-subscription-status'), url(r'^ios_subscription_status/?', views.ios_subscription_status, name='profile-ios-subscription-status'),
) ]

4
apps/push/urls.py
View file

@ -1,6 +1,6 @@
from django.conf.urls import * from django.conf.urls import *
from apps.push import views from apps.push import views
urlpatterns = patterns('', urlpatterns = [
url(r'^(?P<push_id>\d+)/?$', views.push_callback, name='push-callback'), url(r'^(?P<push_id>\d+)/?$', views.push_callback, name='push-callback'),
) ]

4
apps/reader/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import * from django.conf.urls import *
from apps.reader import views from apps.reader import views
urlpatterns = patterns('', urlpatterns = [
url(r'^$', views.index), url(r'^$', views.index),
url(r'^buster', views.iframe_buster, name='iframe-buster'), url(r'^buster', views.iframe_buster, name='iframe-buster'),
url(r'^login_as', views.login_as, name='login_as'), url(r'^login_as', views.login_as, name='login_as'),
@ -60,4 +60,4 @@ urlpatterns = patterns('',
url(r'^load_tutorial', views.load_tutorial, name='load-tutorial'), url(r'^load_tutorial', views.load_tutorial, name='load-tutorial'),
url(r'^save_search', views.save_search, name='save-search'), url(r'^save_search', views.save_search, name='save-search'),
url(r'^delete_search', views.delete_search, name='delete-search'), url(r'^delete_search', views.delete_search, name='delete-search'),
) ]

4
apps/recommendations/urls.py
View file

@ -1,10 +1,10 @@
from django.conf.urls import * from django.conf.urls import *
from apps.recommendations import views from apps.recommendations import views
urlpatterns = patterns('', urlpatterns = [
url(r'^load_recommended_feed', views.load_recommended_feed, name='load-recommended-feed'), url(r'^load_recommended_feed', views.load_recommended_feed, name='load-recommended-feed'),
url(r'^save_recommended_feed', views.save_recommended_feed, name='save-recommended-feed'), url(r'^save_recommended_feed', views.save_recommended_feed, name='save-recommended-feed'),
url(r'^approve_feed', views.approve_feed, name='approve-recommended-feed'), url(r'^approve_feed', views.approve_feed, name='approve-recommended-feed'),
url(r'^decline_feed', views.decline_feed, name='decline-recommended-feed'), url(r'^decline_feed', views.decline_feed, name='decline-recommended-feed'),
url(r'^load_feed_info/(?P<feed_id>\d+)', views.load_feed_info, name='load-recommended-feed-info'), url(r'^load_feed_info/(?P<feed_id>\d+)', views.load_feed_info, name='load-recommended-feed-info'),
) ]

4
apps/rss_feeds/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import url, patterns from django.conf.urls import url, patterns
from apps.rss_feeds import views from apps.rss_feeds import views
urlpatterns = patterns('', urlpatterns = [
url(r'^feed_autocomplete', views.feed_autocomplete, name='feed-autocomplete'), url(r'^feed_autocomplete', views.feed_autocomplete, name='feed-autocomplete'),
url(r'^search_feed', views.search_feed, name='search-feed'), url(r'^search_feed', views.search_feed, name='search-feed'),
url(r'^statistics/(?P<feed_id>\d+)', views.load_feed_statistics, name='feed-statistics'), url(r'^statistics/(?P<feed_id>\d+)', views.load_feed_statistics, name='feed-statistics'),
@ -17,4 +17,4 @@ urlpatterns = patterns('',
url(r'^original_text', views.original_text, name='original-text'), url(r'^original_text', views.original_text, name='original-text'),
url(r'^original_story', views.original_story, name='original-story'), url(r'^original_story', views.original_story, name='original-story'),
url(r'^story_changes', views.story_changes, name='story-changes'), url(r'^story_changes', views.story_changes, name='story-changes'),
) ]

4
apps/social/urls.py
View file

@ -1,7 +1,7 @@
from django.conf.urls import url, patterns from django.conf.urls import url, patterns
from apps.social import views from apps.social import views
urlpatterns = patterns('', urlpatterns = [
url(r'^river_stories/?$', views.load_river_blurblog, name='social-river-blurblog'), url(r'^river_stories/?$', views.load_river_blurblog, name='social-river-blurblog'),
url(r'^share_story/?$', views.mark_story_as_shared, name='mark-story-as-shared'), url(r'^share_story/?$', views.mark_story_as_shared, name='mark-story-as-shared'),
url(r'^unshare_story/?$', views.mark_story_as_unshared, name='mark-story-as-unshared'), url(r'^unshare_story/?$', views.mark_story_as_unshared, name='mark-story-as-unshared'),
@ -37,4 +37,4 @@ urlpatterns = patterns('',
url(r'^statistics/(?P<social_user_id>\w+)/?$', views.load_social_statistics, name='load-social-statistics'), url(r'^statistics/(?P<social_user_id>\w+)/?$', views.load_social_statistics, name='load-social-statistics'),
url(r'^mute_story/(?P<secret_token>\w+)/(?P<shared_story_id>\w+)?$', views.mute_story, name='social-mute-story'), url(r'^mute_story/(?P<secret_token>\w+)/(?P<shared_story_id>\w+)?$', views.mute_story, name='social-mute-story'),
url(r'^(?P<username>[-\w]+)/?$', views.shared_stories_public, name='shared-stories-public'), url(r'^(?P<username>[-\w]+)/?$', views.shared_stories_public, name='shared-stories-public'),
) ]

4
apps/statistics/urls.py
View file

@ -1,8 +1,8 @@
from django.conf.urls import * from django.conf.urls import *
from apps.statistics import views from apps.statistics import views
urlpatterns = patterns('', urlpatterns = [
url(r'^dashboard_graphs', views.dashboard_graphs, name='statistics-graphs'), url(r'^dashboard_graphs', views.dashboard_graphs, name='statistics-graphs'),
url(r'^feedback_table', views.feedback_table, name='feedback-table'), url(r'^feedback_table', views.feedback_table, name='feedback-table'),
url(r'^revenue', views.revenue, name='revenue'), url(r'^revenue', views.revenue, name='revenue'),
) ]

86
urls.py
View file

@ -1,50 +1,52 @@
from django.conf.urls import include, url, patterns from django.conf.urls import include, url
from django.conf import settings from django.conf import settings
from apps.reader import views as reader_views from apps.reader import views as reader_views
from apps.social import views as social_views from apps.social import views as social_views
from apps.static import views as static_views from apps.static import views as static_views
from apps.profile import views as profile_views from apps.profile import views as profile_views
from django.conf.urls.static import static
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.views import logout
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = [
url(r'^$', reader_views.index, name='index'), url(r'^$', reader_views.index, name='index'),
(r'^reader/', include('apps.reader.urls')), url(r'^reader/', include('apps.reader.urls')),
(r'^add/?', reader_views.index), url(r'^add/?', reader_views.index),
(r'^try/?', reader_views.index), url(r'^try/?', reader_views.index),
(r'^site/(?P<feed_id>\d+)?', reader_views.index), url(r'^site/(?P<feed_id>\d+)?', reader_views.index),
url(r'^folder/(?P<folder_name>\d+)?', reader_views.index, name='folder'), url(r'^folder/(?P<folder_name>\d+)?', reader_views.index, name='folder'),
url(r'^saved/(?P<tag_name>\d+)?', reader_views.index, name='saved-stories-tag'), url(r'^saved/(?P<tag_name>\d+)?', reader_views.index, name='saved-stories-tag'),
(r'^saved/?', reader_views.index), url(r'^saved/?', reader_views.index),
(r'^read/?', reader_views.index), url(r'^read/?', reader_views.index),
(r'^social/\d+/.*?', reader_views.index), url(r'^social/\d+/.*?', reader_views.index),
(r'^user/.*?', reader_views.index), url(r'^user/.*?', reader_views.index),
(r'^null/.*?', reader_views.index), url(r'^null/.*?', reader_views.index),
(r'^story/.*?', reader_views.index), url(r'^story/.*?', reader_views.index),
(r'^feed/?', social_views.shared_stories_rss_feed_noid), url(r'^feed/?', social_views.shared_stories_rss_feed_noid),
(r'^rss_feeds/', include('apps.rss_feeds.urls')), url(r'^rss_feeds/', include('apps.rss_feeds.urls')),
(r'^analyzer/', include('apps.analyzer.urls')), url(r'^analyzer/', include('apps.analyzer.urls')),
(r'^classifier/', include('apps.analyzer.urls')), url(r'^classifier/', include('apps.analyzer.urls')),
(r'^profile/', include('apps.profile.urls')), url(r'^profile/', include('apps.profile.urls')),
(r'^folder_rss/', include('apps.profile.urls')), url(r'^folder_rss/', include('apps.profile.urls')),
(r'^import/', include('apps.feed_import.urls')), url(r'^import/', include('apps.feed_import.urls')),
(r'^api/', include('apps.api.urls')), url(r'^api/', include('apps.api.urls')),
(r'^recommendations/', include('apps.recommendations.urls')), url(r'^recommendations/', include('apps.recommendations.urls')),
(r'^notifications/?', include('apps.notifications.urls')), url(r'^notifications/?', include('apps.notifications.urls')),
(r'^statistics/', include('apps.statistics.urls')), url(r'^statistics/', include('apps.statistics.urls')),
(r'^social/', include('apps.social.urls')), url(r'^social/', include('apps.social.urls')),
(r'^oauth/', include('apps.oauth.urls')), url(r'^oauth/', include('apps.oauth.urls')),
(r'^mobile/', include('apps.mobile.urls')), url(r'^mobile/', include('apps.mobile.urls')),
(r'^m/', include('apps.mobile.urls')), url(r'^m/', include('apps.mobile.urls')),
(r'^push/', include('apps.push.urls')), url(r'^push/', include('apps.push.urls')),
(r'^newsletters/', include('apps.newsletters.urls')), url(r'^newsletters/', include('apps.newsletters.urls')),
(r'^categories/', include('apps.categories.urls')), url(r'^categories/', include('apps.categories.urls')),
(r'^_haproxychk', static_views.haproxy_check), url(r'^_haproxychk', static_views.haproxy_check),
(r'^_dbcheck/postgres', static_views.postgres_check), url(r'^_dbcheck/postgres', static_views.postgres_check),
(r'^_dbcheck/mongo', static_views.mongo_check), url(r'^_dbcheck/mongo', static_views.mongo_check),
(r'^_dbcheck/redis', static_views.redis_check), url(r'^_dbcheck/redis', static_views.redis_check),
(r'^_dbcheck/elasticsearch', static_views.elasticsearch_check), url(r'^_dbcheck/elasticsearch', static_views.elasticsearch_check),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^about/?', static_views.about, name='about'), url(r'^about/?', static_views.about, name='about'),
url(r'^faq/?', static_views.faq, name='faq'), url(r'^faq/?', static_views.faq, name='faq'),
@ -67,18 +69,12 @@ urlpatterns = patterns('',
url(r'^account/login/?$', profile_views.login, name='login'), url(r'^account/login/?$', profile_views.login, name='login'),
url(r'^account/signup/?$', profile_views.signup, name='signup'), url(r'^account/signup/?$', profile_views.signup, name='signup'),
url(r'^account/logout/?$', url(r'^account/logout/?$',
'django.contrib.auth.views.logout', logout,
{'next_page': '/'}, name='logout'), {'next_page': '/'}, name='logout'),
url(r'^account/ifttt/v1/', include('apps.oauth.urls')), url(r'^account/ifttt/v1/', include('apps.oauth.urls')),
url(r'^account/', include('oauth2_provider.urls', namespace='oauth2_provider')), url(r'^account/', include('oauth2_provider.urls', namespace='oauth2_provider')),
) ]
if settings.DEBUG: if settings.DEBUG:
urlpatterns += patterns('', urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
(r'^media/(?P<path>.*)$', 'django.views.static.serve', urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
{'document_root': settings.MEDIA_ROOT}),
)
urlpatterns += patterns('',
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.STATIC_ROOT}),
)

8
vendor/paypal/standard/ipn/tests/test_urls.py vendored
View file

@ -1,5 +1,5 @@
from django.conf.urls import patterns from django.conf.urls import url
urlpatterns = patterns('paypal.standard.ipn.views', urlpatterns = [
(r'^ipn/$', 'ipn'), url('paypal.standard.ipn.views', (r'^ipn/$', 'ipn'),
) ]

9
vendor/paypal/standard/ipn/urls.py vendored
View file

@ -1,5 +1,6 @@
from django.conf.urls import patterns, url from django.conf.urls import url
from paypal.standard.ipn.views import ipn
urlpatterns = patterns('paypal.standard.ipn.views', urlpatterns = [
url(r'^$', 'ipn', name="paypal-ipn"), url(r'^$', ipn, name="paypal-ipn"),
) ]

9
vendor/paypal/standard/pdt/tests/test_urls.py vendored
View file

@ -1,5 +1,6 @@
from django.conf.urls import patterns from django.conf.urls import url
from paypal.standard.pdt.views import pdt
urlpatterns = patterns('paypal.standard.pdt.views', urlpatterns = [
(r'^pdt/$', 'pdt'), url(r'^pdt/$', pdt)
) ]

10
vendor/paypal/standard/pdt/urls.py vendored
View file

@ -1,5 +1,5 @@
from django.conf.urls import patterns, url from django.conf.urls import url
from paypal.standard.pdt.views import pdt
urlpatterns = patterns('paypal.standard.pdt.views', urlpatterns = [
url(r'^$', 'pdt', name="paypal-pdt"), url(r'^$', pdt, name="paypal-pdt"),
) ]

4
vendor/zebra/urls.py vendored
View file

@ -2,7 +2,7 @@ from django.conf.urls import *
from zebra import views from zebra import views
urlpatterns = patterns('', urlpatterns = [
url(r'webhooks/$', views.webhooks, name='webhooks'), url(r'webhooks/$', views.webhooks, name='webhooks'),
url(r'webhooks/v2/$', views.webhooks_v2, name='webhooks_v2'), url(r'webhooks/v2/$', views.webhooks_v2, name='webhooks_v2'),
) ]