Commit 3de5de7d authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Finish public-facing exposed user status (opt-in)

parent 1bf12893

lib/Travelynx.pm

+1 −0
Original line number Diff line number Diff line
@@ -1729,6 +1729,7 @@ sub startup { 
	$r->get('/register')->to('account#registration_form');

	$r->get('/reg/:id/:token')->to('account#verify');

	$r->get('/status/:name')->to('traveling#user_status');

	$r->get('/ajax/status/:name')->to('traveling#public_status_card');

	$r->post('/action')->to('traveling#log_action');

	$r->post('/geolocation')->to('traveling#geolocation');

	$r->post('/list_departures')->to('traveling#redirect_to_station');

lib/Travelynx/Controller/Account.pm

+2 −2
Original line number Diff line number Diff line
@@ -222,13 +222,13 @@ sub privacy { 
			$public_level &= ~0x02;

		}

		$self->set_privacy( $user->{id}, $public_level );

		$self->redirect_to('account');

	}

	else {

		$self->param( public_status => $public_level & 0x02 ? 1 : 0 );

	}



		$self->render( 'privacy', name => $user->{name} );

	}

}



sub change_mail {

	my ($self) = @_;

lib/Travelynx/Controller/Traveling.pm

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ sub public_status_card { 
	my $name = $self->stash('name');

	my $user = $self->get_privacy_by_name($name);



	delete $self->stash->{layout};



	if ( $user and ( $user->{public_level} & 0x02 ) ) {

		my $status = $self->get_user_status( $user->{id} );

		$self->render(

public/static/js/travelynx-actions.js

+22 −3
Original line number Diff line number Diff line
@@ -21,10 +21,23 @@ function tvly_update() { 
	$.get('/ajax/status_card.html', function(data) {

		$('.statuscol').html(data);

		tvly_reg_handlers();

		setTimeout(tvly_update, 15000);

		setTimeout(tvly_update, 20000);

	}).fail(function() {

		$('.sync-failed-marker').css('display', 'block');

		setTimeout(tvly_update, 15000);

		setTimeout(tvly_update, 20000);

	});

}

function tvly_update_public() {

	var user_name;

	$('.publicstatuscol').each(function() {

		user_name = $(this).data('user');

	});

	$.get('/ajax/status/' + user_name + '.html', function(data) {

		$('.publicstatuscol').html(data);

		setTimeout(tvly_update_public, 20000);

	}).fail(function() {

		$('.sync-failed-marker').css('display', 'block');

		setTimeout(tvly_update_public, 20000);

	});

}

function tvly_reg_handlers() {
@@ -92,6 +105,12 @@ function tvly_reg_handlers() { 
$(document).ready(function() {

	tvly_reg_handlers();

	if ($('.statuscol .autorefresh').length) {

		setTimeout(tvly_update, 15000);

		setTimeout(tvly_update, 20000);

	}

});

$(document).ready(function() {

	tvly_reg_handlers();

	if ($('.publicstatuscol .autorefresh').length) {

		setTimeout(tvly_update_public, 20000);

	}

});

public/static/js/travelynx-actions.min.js

+1 −1
Original line number Diff line number Diff line 
function tvly_run(t,a,e){var n='<i class="material-icons">error</i>',c=$('<div class="progress"><div class="indeterminate"></div></div>');t.hide(),t.after(c),$.post("/action",a,function(a){a.success?$(location).attr("href",a.redirect_to):(M.toast({html:n+" "+a.error}),c.remove(),e&&e(),t.append(" "+n),t.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,15e3)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update,15e3)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,15e3)});
 
function tvly_run(t,e,a){var n='<i class="material-icons">error</i>',c=$('<div class="progress"><div class="indeterminate"></div></div>');t.hide(),t.after(c),$.post("/action",e,function(e){e.success?$(location).attr("href",e.redirect_to):(M.toast({html:n+" "+e.error}),c.remove(),a&&a(),t.append(" "+n),t.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update,2e4)})}function tvly_update_public(){var t;$(".publicstatuscol").each(function(){t=$(this).data("user")}),$.get("/ajax/status/"+t+".html",function(t){$(".publicstatuscol").html(t),setTimeout(tvly_update_public,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update_public,2e4)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),e={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,e,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),e={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,e)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,2e4)}),$(document).ready(function(){tvly_reg_handlers(),$(".publicstatuscol .autorefresh").length&&setTimeout(tvly_update_public,2e4)});