Merge pull request #34 from GiorginoSerbuciano/patches-v.0.1.0

Patching up minor things.

Author: xbngrg

README.md

@@ -1,5 +1,11 @@
 # Tech Basics Companion v0.1.0-alpha
 
+![GitHub](https://img.shields.io/github/license/giorginoserbuciano/techbasicscompanion?style=flat-square) 
+![GitHub last commit](https://img.shields.io/github/last-commit/giorginoserbuciano/techbasicscompanion?style=flat-square)
+![GitHub top language](https://img.shields.io/github/languages/top/giorginoserbuciano/techbasicscompanion?style=flat-square)
+
+A Flask-SQLAlchemy website for sharing Python-related projects among Tech Basics students and alumni. Projects are linked to their respective Github repositories, from which information about the project is drawn through the Github API and presented on the site.
+
 _This project is built from scratch, following CoreyMS's Flask-SQLAlchemy tutorial series. You can find these code snippets [forked on my GitHub profile](https://github.com/GiorginoSerbuciano/code_snippets/tree/master/Python/Flask_Blog)._
 
 Before starting work on TBCOMP, I had been planning to repurpose one of my other applications, DesktopSort, into a Python code analyser/file manipulation software, but I ultimately decided against that for the following reasons:
@@ -49,8 +55,7 @@ It turns out that silent failures are actually very easy to cause in WTForms; no
 	</tr>
 	<tr>
 		<td>`field_name.data`</td>
-		<td>The data returned from field `field_name`, seen from inside the context of a form.</tr>
-	</tr>		
+		<td>The data returned from field `field_name`, seen from inside the context of a form.</tr>	
 	<tr>
 		<td>`field_name`</td>
 		<td>The field entity.</td>
@@ -110,6 +115,6 @@ Not all problems were equally educative. I had set up the password reset email s
 
 A brief note on using GitHub: If you look at the commits on the project, you'll notice that my interaction with GitHub got more sophisiticated at some point in March. This is when I figured out how pushing, pulling, stashing, branching, etc. all work, so I've been using them to the greatest extent that I can. It's actually turning out to be very useful in a number of ways, the most important of which is that I can now commit changes very precisely; I sometimes commit one file at a time if the change I have made is significant only to that file. I'm also getting into the habit of creating issues and working on branches. All of this helps me navigate the project's history much quicker&mdash;which also makes it easier to document&mdash;and lets me reverse experimentation on one file without reversing what already worked well in 50 others.
 
-I would like to look at a very recent example of an issue that really stretched my nerves, namely #8 Project creators cannot set contributors. In this issue, I dealt with many-to-many relationships between Flask-SQLAlchemy models for the first time. I'm going to use a slash to mirror the task: The task was to assign users as contributors to projects,/and to assign projects with contributors which were users. The left side of the slash was necessary in order to allow multiple users to be contributors of projects, while the right side allows projects to keep a record of which users are contributing to it for look-up purposes. The reason why I want to attribute multiple contributors to each project (and not just one author) is because, first of all, it's not impossible that more than one person works on a project&mdash;it's actually quite common in Tech Basics seminars, as it turns out&mdash;, so I want multiple people to be able to create posts on the project's page (yet to be implemented) and to edit projects (I have not yet figured out what the privileges of a project admin should be, if any).
+An issue that really stretched my nerves was #8 Project creators cannot set contributors. In this issue, I dealt with many-to-many relationships between Flask-SQLAlchemy models for the first time. I'm going to use a slash to mirror the task: The task was to assign users as contributors to projects,/and to assign projects with contributors which were users. The left side of the slash was necessary in order to allow multiple users to be contributors of projects, while the right side allows projects to keep a record of which users are contributing to it for look-up purposes. The reason why I want to attribute multiple contributors to each project (and not just one author) is because, first of all, it's not impossible that more than one person works on a project&mdash;it's actually quite common in Tech Basics seminars, as it turns out&mdash;, so I want multiple people to be able to create posts on the project's page (yet to be implemented) and to edit projects. I have not yet figured out what the privileges of a project admin should be, if any).
 
 

tbcompanion/accounts/routes.py

@@ -109,7 +109,7 @@ def password_reset_request():
 						   form=form)
 
 
-@accounts.route('/passwordReset/<token>', methods=['POST'])
+@accounts.route('/passwordReset/<token>', methods=['GET','POST'])
 def password_reset(token):
 	"""Password reset link redirects to this page. Resets user's password. """
 

tbcompanion/models.py

@@ -7,30 +7,27 @@
 from tbcompanion import db, login_man
 
 contributor_table = db.Table('contributor_table',
-	db.Column('user_id', db.Integer, db.ForeignKey('user.id')),
-	db.Column('project_id', db.Integer, db.ForeignKey('project.id'))
-)
+							 db.Column('user_id', db.Integer, db.ForeignKey('user.id')),
+							 db.Column('project_id', db.Integer, db.ForeignKey('project.id'))
+							 )
+
 
 @login_man.user_loader
-def load_user(id):
-	return User.query.get(int(id))
+def load_user(user_id):
+	return User.query.get(int(user_id))
 
 
 class User(db.Model, UserMixin):
-
 	post_author = db.relationship('Post', backref='author', lazy=True)
 	project_admin = db.relationship('Project', backref='admin', lazy=True)
-	# projects = db.relationship('Project', secondary="contributor_table", lazy=True)	
-	#sqlalchemy.exc.ArgumentError: Error creating backref 'contributor' on relationship 'Project.contributor_id': property of that name exists on mapper 'mapped class User->user'
-		
+
 	id = db.Column(db.Integer, primary_key=True)
 	username = db.Column(db.String(20), unique=True, nullable=False)
 	email = db.Column(db.String(120), unique=True, nullable=False)
 	image_file = db.Column(db.String(20), nullable=False, default='profile_pics\default.jpg')
 	password = db.Column(db.String(60), nullable=False)
 	is_admin = db.Column(db.Boolean)
 
-
 	def __repr__(self):
 		return self.username
 
@@ -47,6 +44,7 @@ def validate_reset_token(token):
 			return None
 		return User.query.get(user_id)
 
+
 class Post(db.Model):
 	id = db.Column(db.Integer, primary_key=True)
 	title = db.Column(db.String(120), nullable=False)
@@ -61,7 +59,6 @@ def __repr__(self):
 
 
 class Project(db.Model):
-
 	contributors = db.relationship('User', secondary='contributor_table', backref='contribution_id')
 
 	id = db.Column(db.Integer, primary_key=True)
@@ -75,4 +72,3 @@ class Project(db.Model):
 	def __repr__(self):
 		return "Project('{}','{}','{}')".format(
 			self.title, self.date, self.content)
-

tbcompanion/posts/forms.py

@@ -30,7 +30,7 @@ def validate_project_id(self, project_id):
 
 		"""Raise ValidationError if the project exists but the current user is not a contributor,
 		   or if the project does not exist."""
-		if project and project.contributor != current_user:
+		if project and current_user not in project.contributors:
 			raise ValidationError('You are not contributing to this project. '
 								  'Please leave a comment on the project\'s page instead.')
 		elif not project:

tbcompanion/posts/routes.py

@@ -49,7 +49,7 @@ def update_post(post_id):
 
 	post_query = Post.query.get_or_404(post_id)
 
-	if post_query.author != current_user:  # Only the post's author can edit it..
+	if post_query.author != current_user:  # Only the post's author can edit it.
 		abort(403)
 
 	form = PostForm()

tbcompanion/templates/home.html

@@ -27,6 +27,8 @@
 	</fieldset>
 </form>
 
+<a href="{{ url_for('.github_authorization') }}">To avoid API errors, authorize this app by following this link.</a>
+
 {% endblock content %}
 
 {% block feed %}