Commit 48b777251353260ed7534b644df0e1a69b7a6f3e

Anon Ray
Tue Jun 03 16:17:20 IST 2014

Tree SHA1: 6bcd01b
Parent SHA1: 1e7645a (Update code after removing submodule)
raw diff | raw patch

Add timestamp format at server-side; code consistency at views

  - Decided to moment.js but later. Until then, the to_dict method of sweet and
    user returns formatted date in UTC.
  - Making all sweet and user related views to use the to_dict method and be
    consistent

Diff rendering mode:
inline
side by side


99	99	def getFrontendSwts():
100	100	return Sweet.query.order_by(Sweet.created.desc()).all()
101	101
102		# get sweets all sweets authored by a particular user
	102	# get all sweets authored by a particular user
103	103	@staticmethod
104	104	def getByCreator(user):
105	105	return Sweet.query.filter_by(who=user).\
…	…
125	125	'context_id': self.context_id,
126	126	'where': self.where,
127	127	'how': self.how,
128		'created': self.created.isoformat()
	128	#'created': self.created.isoformat()
	129	'created': self.created.strftime('%a, %d %b %Y, %I:%M %p UTC'),
129	130	}
130	131
131	132


60	60	'id': self.id,
61	61	'username': self.username,
62	62	'email': self.email,
63		'created': self.created.isoformat(),
64		'last_active': self.last_active.isoformat()
	63	#'created': self.created.isoformat(),
	64	'created': self.created.strftime('%a, %d %b %Y, %I:%M %p UTC'),
	65	#'last_active': self.last_active.isoformat()
	66	'last_active': self.last_active.strftime('%a, %d %b %Y, %I:%M %p UTC')
65	67	}
66	68
67	69	def __repr__(self):


5	5	from flask import Module, jsonify, request, render_template, redirect,\
6	6	url_for, g, current_app
7	7
8		from sqlalchemy import desc
9
10	8	from swtstore.classes.models import Sweet, User
11	9
12	10
…	…
13	13	@frontend.route('/', methods=['GET'])
14	14	def index():
15	15	sweets = Sweet.getFrontendSwts()
16
17		user = User.getCurrentUser()
	16	sweets = [sweet.to_dict() for sweet in sweets]
18	17
19	18	return render_template('frontend/index.html', sweets=sweets)
20	19


21	21	sweet = Sweet.query.get(id)
22	22	if sweet:
23	23	print "sweet found " + str(sweet)
24		return render_template('sweet/specific.html', sweet=sweet)
	24	return render_template('sweet/specific.html', sweet=sweet.to_dict())
25	25	else:
26	26	abort(404)


89	89	return redirect(url_for('frontend.index'))
90	90
91	91	if request.method == 'GET':
92		return render_template('user/me.html', user=current_user)
	92	return render_template('user/me.html', user=current_user.to_dict())
93	93
94	94	# else POST request
95	95	username = request.form.get('username')
…	…
110	110	return redirect(url_for('frontend.index'))
111	111
112	112	swts = Sweet.getByCreator(user)
	113	swts = [swt.to_dict() for swt in swts]
113	114	return render_template('user/sweets.html', sweets=swts)
114	115
115	116


23	23	font-size: 0.8em;
24	24	text-align: center;
25	25	}
	26	.created {
	27	font-size: 0.9em;
	28	font-style: italic;
	29	}


6	6
7	7	{% if sweets\|length > 0 %}
8	8
9		<ul class="entries unstyled">
	9	<ul class="list-group">
10	10	{% for sweet in sweets %}
11		<li>
	11	<li class="list-group-item">
12	12	<span class="who">
13	13	<a href="#">
14		@{{ sweet.who.username }}
	14	@{{ sweet.who }}
15	15	</a>
16	16	</span>
17	17	<span class="what">
18		<b> #{{ sweet.what.name }} </b>
	18	<b> #{{ sweet.what }} </b>
19	19	</span>
20	20	<span class="where">
21	21	{{ sweet.where }}
…	…
25	25	{{ sweet.how\|escape\|safe }}
26	26	</span>
27	27
28		<small><i>created: {{sweet.created }}</i></small>
	28	<p></p>
	29	<span class="created">created:
	30	<span>{{ sweet.created }}</span>
	31	</span>
29	32
30	33	<span class="pull-right permalink">
31	34	<a href="{{ url_for('sweet.showSweet', id=sweet.id) }}">


2	2
3	3	{% block body %}
4	4
5		<ul class="entries unstyled">
6		<li>
	5	<ul class="list-group">
	6	<li class="list-group-item">
7	7	<span class="who">
8	8	<a href="#">
9		@{{ sweet.who.username }}
	9	@{{ sweet.who }}
10	10	</a>
11	11	</span>
12	12	<span class="what">
13		<b> #{{ sweet.what.name }} </b>
	13	<b> #{{ sweet.what }} </b>
14	14	</span>
15	15	<span class="where">
16	16	{{ sweet.where }}


26	26	</p>
27	27	</div>
28	28	</div>
	29	<div class="form-group">
	30	<label class="control-label">Last Active</label>
	31	<div class="">
	32	<p class="form-control-static" id="last-active">
	33	{{ user.last_active }}
	34	</p>
	35	</div>
	36	</div>
29	37	<button type="submit" class="btn btn-primary">Update</button>
30	38	</form>
31
32		{% endblock %}
33
34		{% block scripts %}
35
36		<script>
37		var created = new Date("{{ user.created }}");
38		window.onload = function() {
39		$('#user-created').html(created.toString());
40		};
41		</script>
42	39
43	40	{% endblock %}


4	4
5	5	{% if sweets\|length > 0 %}
6	6
7		<ul class="entries unstyled">
	7	<ul class="list-group">
8	8	{% for sweet in sweets %}
9		<li>
	9	<li class="list-group-item">
10	10	<span class="who">
11	11	<a href="#">
12		@{{ sweet.who.username }}
	12	@{{ sweet.who }}
13	13	</a>
14	14	</span>
15	15	<span class="what">
16		<b> #{{ sweet.what.name }} </b>
	16	<b> #{{ sweet.what }} </b>
17	17	</span>
18	18	<span class="where">
19	19	{{ sweet.where }}

Commit 48b777251353260ed7534b644df0e1a69b7a6f3e

Gitorious