Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 894

Timestamp:

02/25/08 18:54:14

Author:

goldoraf

Message:

Major improvements of notifier demo app

Files:

apps/notifier/app/models/note.php (deleted)
apps/notifier/app/models/status.php (added)
apps/notifier/app/models/user.php (modified) (2 diffs)
apps/notifier/app/resources/base_resource.php (modified) (2 diffs)
apps/notifier/app/resources/friends_resource.php (added)
apps/notifier/app/resources/friends_timeline_resource.php (added)
apps/notifier/app/resources/notes_resource.php (deleted)
apps/notifier/app/resources/public_timeline_resource.php (deleted)
apps/notifier/app/resources/statuses_resource.php (added)
apps/notifier/app/resources/users_resource.php (modified) (1 diff)
apps/notifier/app/views/test/index.php (modified) (5 diffs)
apps/notifier/conf/routes.php (modified) (1 diff)
apps/notifier/db/db_schema.php (modified) (2 diffs)
apps/notifier/db/test_data.sql (added)
apps/notifier/public/js/notifier.js (modified) (7 diffs)
apps/notifier/public/styles/main.css (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

apps/notifier/app/models/user.php

r882	r894
4	4	{
5	5	public static $objects;
	6	public static $relationships = array(
	7	'friends' => array('assoc_type' => 'many_to_many', 'join_table' => 'friendships',
	8	'class_name' => 'User')
	9	);
6	10
7	11	public static function authenticate($login, $password)
8	12	{
9	13	try {
10		return User::$objects->get('name = ?', array($login, md5($password)));
	14	return User::$objects->get('name = ?', 'pwd = ?', array($login, md5($password)));
11	15	} catch (SRecordNotFound $e) {
12	16	return false;
…	…
20	24	$this->validate_uniqueness_of('name', array('message' => 'est déjà pris'));
21	25	}
	26
	27	public function serializable_form()
	28	{
	29	return parent::serializable_form(array('exclude' => array('pwd')));
	30	}
22	31	}
23	32

apps/notifier/app/resources/base_resource.php

r882	r894
6	6	{
7	7	protected $authenticated_user;
8
9		protected $before_filters = array('authenticate');
	8	protected $user;
10	9
11	10	protected function authenticate()
…	…
16	15	}
17	16
18		protected function must_specifiy_user()
	17	protected function must_specify_user()
19	18	{
20		$this->user = User::$objects->get_by_name($this->params['username']);
	19	try {
	20	$this->user = User::$objects->get_by_name($this->params['username']);
	21	} catch (SRecordNotFound $e) {
	22	return false;
	23	}
21	24	}
22	25

apps/notifier/app/resources/users_resource.php

r884	r894
3	3	class UsersResource extends BaseResource
4	4	{
5		protected $before_filters = array(array('authenticate', 'except' => 'post'));
	5	public function __construct()
	6	{
	7	$this->add_before_filter('authenticate', array('except' => 'post'));
	8	}
6	9
7	10	public function post()
8	11	{
9		$user = new User($this->params['user']);
10		if ($user->save())
11		$this->responds_created($user);
12		else
13		$this->responds_error($user->errors, 400);
	12	try {
	13	$user = User::$objects->get_by_name($this->params['user']['name']);
	14	// le nom d'utilisateur est déjà pris
	15	$this->responds_error(409);
	16	} catch (SRecordNotFound $e) {
	17	$this->params['user']['pwd'] = md5($this->params['user']['pwd']);
	18	$user = new User($this->params['user']);
	19	if ($user->save())
	20	$this->responds_nothing(201);
	21	else
	22	$this->responds_detailed_error($user->errors, 400);
	23	}
14	24	}
15	25	}

apps/notifier/app/views/test/index.php

r884	r894
13	13	<div id="login">
14	14	<label for="login">Identifiant</label>
15		<input type="text" id="~~login~~" value="" />
	15	<input type="text" id="name" value="" />
16	16	<label for="pwd">Mot de passe</label>
17	17	<input type="password" id="pwd" value="" />
…	…
23	23	<input type="text" id="reg_email" value="" />
24	24	<label for="reg_login">Identifiant</label>
25		<input type="text" id="reg_~~login~~" value="" />
	25	<input type="text" id="reg_name" value="" />
26	26	<label for="reg_pwd">Mot de passe</label>
27	27	<input type="password" id="reg_pwd" value="" />
…	…
31	31	<div id="tabs">
32	32	<a href="#" class="active" onclick="notifier.ui.showTab(this, 'friends-timeline');">Timeline</a>
33		<a href="#" onclick="notifier.ui.showTab(this, 'friends');">Friends</a>
	33	<a href="#" onclick="notifier.ui.showTab(this, 'friends');notifier.actions.refreshFriendsList();">Friends</a>
34	34	<a href="#" onclick="notifier.ui.showTab(this, 'favorites');">Favorites</a>
35	35	</div>
…	…
37	37	<h2>Timeline</h2>
38	38	<textarea rows="8" id="note_text"></textarea>
39		<input type="submit" onclick="notifier.api.sendNote($('#note_text').val(), notifier.ui.prependNote);"
40		value="Envoyer" />
	39	<input type="submit" id="note_submit" onclick="notifier.actions.sendNote();" value="Envoyer" />
41	40	<a href="#" onclick="notifier.actions.refreshFriendsTimeline();">Actualiser</a>
42	41	<div id="friends-timeline"></div>
…	…
44	43	<div id="friends-tab" class="tab" style="display:none;">
45	44	<h2>Friends</h2>
	45	<div id="friends-list"></div>
46	46	</div>
47	47	<div id="favorites-tab" class="tab" style="display:none;">

apps/notifier/conf/routes.php

r882	r894
2	2
3	3	$map = new SRouteSet();
4		$map->connect('api/notes/:id', array('resource' => 'notes'));
5		$map->connect('api/public_timeline', array('resource' => 'public_timeline'));
6		$map->connect('api/users', array('resource' => 'users'));
	4	$map->connect('api/users/:username/statuses/:id', array('resource' => 'statuses'));
	5	$map->connect('api/users/:username/timeline', array('resource' => 'user_timeline'));
	6	$map->connect('api/users/:username/friends/timeline', array('resource' => 'friends_timeline'));
	7	$map->connect('api/users/:username/friends', array('resource' => 'friends'));
	8	$map->connect('api/users/:id', array('resource' => 'users'));
	9
7	10	$map->connect(':controller/:action/:id');
8	11

apps/notifier/db/db_schema.php

r844	r894
3	3	return array
4	4	(
5		new STable('~~not~~es', array(
	5	new STable('statuses', array(
6	6	new SColumn('id', SColumn::PK),
7	7	new SColumn('text', SColumn::TEXT),
…	…
15	15	new SColumn('pwd', SColumn::STRING)
16	16	)),
	17	new STable('friendships', array(
	18	new SColumn('user_id', SColumn::INTEGER),
	19	new SColumn('friend_id', SColumn::INTEGER)
	20	))
17	21	);
18	22

apps/notifier/public/js/notifier.js

r884	r894
3	3	notifier.prefs = {};
4	4	notifier.prefs.baseUrl = 'http://localhost/notifier/api/';
5		notifier.prefs.username = '~~test@test.com~~';
6		notifier.prefs.password = '~~test~~';
	5	notifier.prefs.username = '';
	6	notifier.prefs.password = '';
7	7
8	8	notifier.actions = {};
9	9	notifier.actions.login = function() {
10		$('#login').hide();
	10	notifier.prefs.username = $('#name').val();
	11	notifier.prefs.password = $('#pwd').val();
	12	$('#login').hide();
11	13	$('#main').show();
	14	notifier.actions.refreshFriendsTimeline();
12	15	}
13	16	notifier.actions.register = function() {
14	17	var data = {
15		'user[name]': $('#reg_~~login~~').val(),
	18	'user[name]': $('#reg_name').val(),
16	19	'user[email]': $('#reg_email').val(),
17	20	'user[pwd]': $('#reg_pwd').val()
…	…
19	22	notifier.api.doRequest('users.json', {
20	23	method: 'POST',
	24	authenticate: false,
21	25	params: data,
22	26	success: function() {
23	27	$('#register').hide();
24	28	$('#login').show();
	29	},
	30	error: function(error, status) {
	31	if (status == 409) {
	32	alert("Ce nom d'utilisateur est déjà pris !");
	33	} else {
	34	notifier.api.alertError(error, status);
	35	}
25	36	}
26	37	});
27	38	}
28	39	notifier.actions.refreshFriendsTimeline = function() {
	40	notifier.api.doRequest('users/'+notifier.prefs.username+'/friends/timeline.json', {
	41	success: function(notes) {
	42	$('#friends-timeline').empty();
	43	for (var i in notes) {
	44	$('#friends-timeline').append(notifier.ui.htmlForNote(notes[i]));
	45	}
	46	}
	47	});
	48	}
	49	notifier.actions.sendNote = function() {
	50	text = $('#note_text').val();
	51	$('#note_submit').attr('disabled', 'true');
	52	notifier.api.doRequest('users/'+notifier.prefs.username+'/statuses.json', {
	53	method: 'POST',
	54	params: {'text': text},
	55	success: function(note) {
	56	notifier.ui.prependNote(note);
	57	$('#note_text').val('');
	58	$('#note_submit').attr('disabled', 'false');
	59	},
	60	error: function(error, status) {
	61	$('#note_submit').attr('disabled', 'false');
	62	notifier.api.alertError(error, status);
	63	}
	64	});
	65	}
	66	notifier.actions.deleteNote = function(noteId) {
	67	if (!confirm('Etes-vous sûr de vouloir supprimer cette note ?')) return;
29	68
	69	notifier.api.doRequest('users/'+notifier.prefs.username+'/statuses/'+noteId+'.json', {
	70	method: 'DELETE',
	71	success: function() {
	72	$('#note_'+noteId).remove();
	73	}
	74	});
	75	}
	76	notifier.actions.refreshFriendsList = function() {
	77	notifier.api.doRequest('users/'+notifier.prefs.username+'/friends.json', {
	78	success: function(friends) {
	79	$('#friends-list').empty();
	80	for (var i in friends) {
	81	$('#friends-list').append(notifier.ui.htmlForFriend(friends[i]));
	82	}
	83	}
	84	});
30	85	}
31	86
…	…
41	96	}
42	97	notifier.ui.htmlForNote = function(note) {
43		return '<div class="note">'
44		+'<p class="note-text">'+note.text+'</p>'
45		+'<p class="note-details">'+'raphael'+' le '+note.timestamp+'</p>'
46		+'</div>'
47		}
48		notifier.ui.refreshFriendsTimeline = function(notes) {
49		$('#friends-timeline').empty();
50		for (var i in notes) {
51		$('#friends-timeline').append(notifier.ui.htmlForNote(notes[i]));
	98	var html = '<div class="note" id="note_'+note.id+'">'
	99	+'<p class="note-text">'+note.text+'</p>'
	100	+'<p class="note-details">'+note.sender.name+' le '+note.timestamp
	101	if (note.sender.name == notifier.prefs.username) {
	102	html+= ' <a href="#" onclick="notifier.actions.deleteNote(\''+note.id+'\');">delete</a>';
52	103	}
	104	html+= '</p></div>';
	105	return html;
53	106	}
54	107	notifier.ui.prependNote = function(note) {
55	108	$('#friends-timeline').prepend(notifier.ui.htmlForNote(note));
	109	}
	110	notifier.ui.htmlForFriend = function(friend) {
	111	return '<div class="friend">'
	112	+'<span class="friend-avatar">?</span>'
	113	+'<p class="friend-name">'+friend.name+'</p>'
	114	+'<p class="friend-email">'+friend.email+'</p>'
	115	+'</div>'
56	116	}
57	117
…	…
61	121	method: 'GET',
62	122	params: {},
63		authenticate: ~~fals~~e,
	123	authenticate: true,
64	124	success: null,
65	125	error: null
…	…
78	138	if (options.authenticate) {
79	139	xhr.setRequestHeader("Authorization",
80		"Basic " + Base64.encode(notifier.prefs.~~email~~ + ":" + notifier.prefs.password));
	140	"Basic " + Base64.encode(notifier.prefs.username + ":" + notifier.prefs.password));
81	141	xhr.setRequestHeader("Cookie", "");
82	142	}
…	…
103	163	}
104	164	if (options.error !== null) {
105		options.error(~~data,~~ status);
	165	options.error(error, xhr.status);
106	166	} else {
107		var str = "Erreur "+xhr.status+" !\n\n";
108		for (var key in error) {
109		str += key+': '+error[key]+"\n";
110		}
111		alert(str);
	167	notifier.api.alertError(error, xhr.status);
112	168	}
113	169	}
…	…
115	171	return $.ajax(reqParams);
116	172	}
117
118		notifier.api.sendNote = function(text) {
119		return this.doRequest('notes.json', {
120		method: 'POST',
121		params: {'text': text},
122		callback: callback
123		});
	173	notifier.api.alertError = function(error, status) {
	174	var str = "Erreur "+status+" !\n\n";
	175	for (var key in error) {
	176	str += key+': '+error[key]+"\n";
	177	}
	178	alert(str);
124	179	}
125	180
126		notifier.api.publicTimeline = function(callback) {
127		return this.doRequest('public_timeline.json', {
128		callback: callback
129		});
130		}
	181

apps/notifier/public/styles/main.css

r882	r894
50	50	}
51	51
52		div.note {
	52	div.note, div.friend {
53	53	border-top: 1px solid #ccc;
54	54	}
…	…
65	65	color: #bbb;
66	66	}
	67	span.friend-avatar {
	68	font-size: 24px;
	69	font-weight: bold;
	70	float: left;
	71	border: 1px solid black;
	72	background-color: #e6f2fe;
	73	margin: 5px 10px 0 0;
	74	padding: 5px 10px;
	75	text-align: center;
	76	}
	77	p.friend-name {
	78	font-size: 16px;
	79	padding: 5px;
	80	}
	81	p.friend-email {
	82	font-size: 11px;
	83	color: #bbb;
	84	}

Développement

Changeset Navigation

Changeset 894

Legend:

apps/notifier/app/models/user.php

apps/notifier/app/resources/base_resource.php

apps/notifier/app/resources/users_resource.php

apps/notifier/app/views/test/index.php

apps/notifier/conf/routes.php

apps/notifier/db/db_schema.php

apps/notifier/public/js/notifier.js

apps/notifier/public/styles/main.css

Download in other formats: