improve communication b/t angular and api; improve data importing; make a nice little blog layout

Author: shea256

AngularFlask/__init__.py

@@ -7,6 +7,8 @@
 
 app.config.from_object('AngularFlask.settings')
 
+app.url_map.strict_slashes = False
+
 import AngularFlask.core
 import AngularFlask.models
 import AngularFlask.controllers

AngularFlask/controllers.py

@@ -6,42 +6,59 @@
 
 from AngularFlask import app
 
-# special file handlers
-@app.route('/favicon.ico')
-def favicon():
-	return send_from_directory(os.path.join(app.root_path, 'static'), 'img/favicon.ico')
+###
+# controllers/routing for API endpoints
+# (auto-generated from the models listed in app.config['API_MODELS'])
+###
+from AngularFlask.core import api_manager
+from AngularFlask.models import *
 
-# 404 error handler
-@app.errorhandler(404)
-def page_not_found(e):
-    return render_template('404.html'), 404
+api_models = app.config['API_MODELS']
+for model_name in api_models:
+	model_class = api_models[model_name]
+	api_manager.create_api(model_class, methods=['GET', 'POST'])
+
+session = api_manager.session
 
-# basic page url handler
+###
+# controllers/routing for basic pages (pass routing onto the Angular app)
+###
 @app.route('/')
 @app.route('/about')
+@app.route('/blog')
 def basic_pages(**kwargs):
 	return make_response(open('AngularFlask/templates/index.html').read())
 
-# API
-from AngularFlask.core import api_manager
-from AngularFlask.models import Post
-
-session = api_manager.session
-
-api_manager.create_api(Post, methods=['GET', 'POST'])
-
-# RESTful page url handler
+###
+# controllers/routing for CRUD-style endpoints, or ones that refer to a particular resource or collection
+# (pass routing onto the Angular app only if the corresponding resource exists in the db)
+###
 from sqlalchemy.sql import exists
 
-supported_models = ['post']
+crud_url_models = app.config['CRUD_URL_MODELS']
 
-@app.route('/<model_name>')
+@app.route('/<model_name>/')
 @app.route('/<model_name>/<item_id>')
 def rest_pages(model_name, item_id=None):
-	if model_name in supported_models:
-		model = eval(model_name.capitalize())
-		if session.query(exists().where(model.id == item_id)).scalar():
+	if model_name in crud_url_models:
+		model_class = crud_url_models[model_name]
+		if item_id is None or session.query(exists().where(model_class.id == item_id)).scalar():
 			return make_response(open('AngularFlask/templates/index.html').read())
 	abort(404)
 
+###
+# special file handlers
+##
+@app.route('/favicon.ico')
+def favicon():
+	return send_from_directory(os.path.join(app.root_path, 'static'), 'img/favicon.ico')
+
+###
+# error handlers
+##
+@app.errorhandler(404)
+def page_not_found(e):
+    return render_template('404.html'), 404
+
+
 

AngularFlask/models.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from AngularFlask.core import db
+from AngularFlask import app
 
 class Post(db.Model):
 	id = db.Column(db.Integer, primary_key=True)
@@ -18,3 +19,9 @@ def __init__(self, title, body, pub_date=None):
 	def __repr__(self):
 		return '<Post %r>' % self.title
 
+# models for which we want to create API endpoints
+app.config['API_MODELS'] = { 'post': Post }
+
+# models for which we want to create CRUD-style URL endpoints,
+# and pass the routing onto our AngularJS application
+app.config['CRUD_URL_MODELS'] = { 'post': Post }

AngularFlask/settings.py

@@ -2,5 +2,5 @@
 DEBUG = True
 SECRET_KEY = '7bfb14e2315513c0fc0e1a6f8e343ba3904c61b10665d3dd'
 
-SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/AngularFlask.db'
+SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/AngularFlask4.db'
 

AngularFlask/static/css/main.css

@@ -29,7 +29,7 @@
 }
 
 .header-push {
-	height: 370px;
+	height: 250px;
 }
 
 .main {

AngularFlask/static/js/app.js

@@ -20,6 +20,11 @@ angular.module('AngularFlask', ['angularFlaskServices'])
 			templateUrl: '/static/partials/post-detail.html',
 			controller: PostDetailController
 		})
+		/* Create a "/blog" route that takes the user to the same place as "/post" */
+		.when('/blog', {
+			templateUrl: 'static/partials/post-list.html',
+			controller: PostListController
+		})
 		.otherwise({
 			redirectTo: '/'
 		})

AngularFlask/static/js/controllers.js

@@ -11,7 +11,9 @@ function AboutController($scope) {
 }
 
 function PostListController($scope, Post) {
-	$scope.posts = Post.query();
+	$scope.postsQ = Post.get({}, function(posts) {
+		$scope.posts = posts.objects;
+	});
 }
 
 function PostDetailController($scope, $routeParams, Post) {

AngularFlask/static/partials/about.html

@@ -1,3 +1,3 @@
 <div>
-	<p>This is an auto-generated AngularJS + Flask application.</p>
+	<p>This is a basic AngularJS + Flask application.</p>
 </div>

AngularFlask/static/partials/landing.html

@@ -9,3 +9,6 @@ <h1 class="heading">Welcome Home.</h1>
 <div class="header-push">
 </div>
 
+<div>
+	<h3><a href="/blog">Check out my blog</a></h3>
+</div>

AngularFlask/static/partials/post-detail.html

@@ -1,4 +1,6 @@
 <div>
-	<p>Title: {{ postTitle }}</p>
-	<p>Body: {{ postBody }}</p>
+	<h2>{{ postTitle }}</h2>
+	<h4>{{ postBody }}</h4>
+
+	<p><a href="/blog">back</a></p>
 </div>