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

Removing google reader signup.

Browse source
This commit is contained in:
Samuel Clay 2020-06-08 12:20:19 -04:00
parent 38fcbed6fb
commit d354828727
5 changed files with 1 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/feed_import/urls.py
View file

@ -4,5 +4,4 @@ from apps.feed_import import views
urlpatterns = patterns('apps.feed_import.views',
url(r'^opml_upload/?$', views.opml_upload, name='opml-upload'),
url(r'^opml_export/?$', views.opml_export, name='opml-export'),
url(r'^signup/?$', views.import_signup, name='import-signup'),
)

40
apps/feed_import/views.py
View file

@ -89,43 +89,3 @@ def opml_export(request):
)
return response
def import_signup(request):
ip = request.META.get('HTTP_X_FORWARDED_FOR', None) or request.META.get('REMOTE_ADDR', "")
if request.method == "POST":
signup_form = SignupForm(prefix='signup', data=request.POST)
if signup_form.is_valid():
new_user = signup_form.save()
user_token = OAuthToken.objects.filter(user=new_user)
if not user_token:
user_uuid = request.COOKIES.get('newsblur_reader_uuid')
if user_uuid:
user_token = OAuthToken.objects.filter(uuid=user_uuid).order_by('-created_date')
if not user_token:
if request.session.session_key:
user_token = OAuthToken.objects.filter(session_id=request.session.session_key).order_by('-created_date')
if not user_token:
user_token = OAuthToken.objects.filter(remote_ip=ip).order_by('-created_date')
if user_token:
user_token = user_token[0]
user_token.session_id = request.session.session_key
user_token.user = new_user
user_token.save()
login_user(request, new_user)
if request.user.profile.is_premium:
return HttpResponseRedirect(reverse('index'))
url = "https://%s%s" % (Site.objects.get_current().domain,
reverse('stripe-form'))
return HttpResponseRedirect(url)
else:
logging.user(request, "~BR~FW ***> Can't find user token during import/signup. Re-authenticating...")
return HttpResponseRedirect(reverse('google-reader-authorize'))
else:
signup_form = SignupForm(prefix='signup')
return render_to_response('import/signup.xhtml', {
'signup_form': signup_form,
}, context_instance=RequestContext(request))

56
media/js/newsblur/reader/reader.js
View file

@ -113,9 +113,6 @@
this.load_javascript_elements_on_page();
this.apply_resizable_layout();
this.add_body_classes();
if (NEWSBLUR.Flags['start_import_from_google_reader']) {
this.start_import_from_google_reader();
}
NEWSBLUR.app.sidebar_header = new NEWSBLUR.Views.SidebarHeader({
feed_collection: NEWSBLUR.assets.feeds,
socialfeed_collection: NEWSBLUR.assets.social_feeds
@ -5470,59 +5467,6 @@
// =============================
// = Import from Google Reader =
// =============================
post_google_reader_connect: function(data) {
if (NEWSBLUR.intro) {
NEWSBLUR.intro.start_import_from_google_reader(data);
} else {
this.start_import_from_google_reader();
}
},
start_import_from_google_reader: function() {
var self = this;
var $progress = this.$s.$feeds_progress;
var $bar = $('.NB-progress-bar', $progress);
var percentage = 0;
this.flags['import_from_google_reader_working'] = true;
$('.NB-progress-title', $progress).text('Importing from Google Reader');
$('.NB-progress-counts', $progress).hide();
$('.NB-progress-percentage', $progress).hide();
$bar.progressbar({
value: percentage
});
this.animate_progress_bar($bar, 5);
this.model.start_import_from_google_reader(
$.rescope(this.finish_import_from_google_reader, this));
this.show_progress_bar();
},
finish_import_from_google_reader: function(e, data) {
var $progress = this.$s.$feeds_progress;
var $bar = $('.NB-progress-bar', $progress);
this.flags['import_from_google_reader_working'] = false;
clearTimeout(this.locks['animate_progress_bar']);
if (data.code >= 1) {
$bar.progressbar({value: 100});
NEWSBLUR.assets.load_feeds();
$('.NB-progress-title', $progress).text('');
$('.NB-progress-link', $progress).html('');
} else {
NEWSBLUR.log(['Import Error!', data]);
this.$s.$feed_link_loader.fadeOut(250);
$progress.addClass('NB-progress-error');
$('.NB-progress-title', $progress).text('Error importing Google Reader');
$('.NB-progress-link', $progress).html($.make('a', {
className: 'NB-modal-submit-button NB-modal-submit-green',
href: NEWSBLUR.URLs['google-reader-authorize']
}, ['Try importing again']));
$('.left-center-footer').css('height', 'auto');
}
},
start_count_unreads_after_import: function() {
var self = this;

1
templates/base.html
View file

@ -96,7 +96,6 @@
'story_share_email' : true
};
NEWSBLUR.URLs = {
'google-reader-authorize' : "{% url "google-reader-authorize" %}",
'upload-avatar' : "{% url "upload-avatar" %}",
'opml-upload' : "{% url "opml-upload" %}",
'opml-export' : "{% url "opml-export" %}",

19
templates/social/social_connect.xhtml
View file

@ -59,24 +59,7 @@
}, 1000);
} else if (opener && opener.NEWSBLUR) {
console.log(["Found opener", opener.NEWSBLUR]);
if (opener.NEWSBLUR.reader.flags.importing_from_google_reader) {
console.log(['Importing from Reader']);
if (opener.NEWSBLUR.intro) {
console.log(['Using Intro dialog']);
opener.NEWSBLUR.intro.start_import_from_google_reader({
{% if error %}
'error': "{{ error }}"
{% endif %}
});
} else {
console.log(['Using some other dialog']);
opener.NEWSBLUR.reader.post_google_reader_connect({
{% if error %}
'error': "{{ error }}"
{% endif %}
});
}
} else if (opener.NEWSBLUR.intro) {
if (opener.NEWSBLUR.intro) {
console.log(['Connecting through intro']);
opener.NEWSBLUR.intro.post_connect({
{% if error %}