diff options
Diffstat (limited to 'pyaggr3g470r')
| -rw-r--r-- | pyaggr3g470r/controllers/category.py | 12 | ||||
| -rw-r--r-- | pyaggr3g470r/models/category.py | 8 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/about.html | 32 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/categories.html | 36 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/edit_category.html | 23 | ||||
| -rw-r--r-- | pyaggr3g470r/views/admin.py | 166 | ||||
| -rw-r--r-- | pyaggr3g470r/views/api/category.py | 31 | ||||
| -rw-r--r-- | pyaggr3g470r/views/category.py | 86 | ||||
| -rw-r--r-- | pyaggr3g470r/views/user.py | 152 |
9 files changed, 0 insertions, 546 deletions
diff --git a/pyaggr3g470r/controllers/category.py b/pyaggr3g470r/controllers/category.py deleted file mode 100644 index a0f746e9..00000000 --- a/pyaggr3g470r/controllers/category.py +++ /dev/null @@ -1,12 +0,0 @@ -from .abstract import AbstractController -from pyaggr3g470r.models import Category -from .feed import FeedController - - -class CategoryController(AbstractController): - _db_cls = Category - - def delete(self, obj_id): - FeedController(self.user_id).update({'category_id': obj_id}, - {'category_id': None}) - return super().delete(obj_id) diff --git a/pyaggr3g470r/models/category.py b/pyaggr3g470r/models/category.py deleted file mode 100644 index 513227a5..00000000 --- a/pyaggr3g470r/models/category.py +++ /dev/null @@ -1,8 +0,0 @@ -from bootstrap import db - - -class Category(db.Model): - id = db.Column(db.Integer(), primary_key=True) - name = db.Column(db.String()) - - user_id = db.Column(db.Integer, db.ForeignKey('user.id')) diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html deleted file mode 100644 index fe108878..00000000 --- a/pyaggr3g470r/templates/about.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -<div class="container"> - <div class="well"> - <h1>{{ _("About") }}</h1> - <p> - {{ _("pyAggr3g470r is a news aggregator platform and can be shared between several users.") }} - {{ _("You can easily install pyAggr3g470r on your server.") }} - {{ _("Alternatively, you can deploy your own copy using this button:") }}</p> - <a class="reference external image-reference" href="https://heroku.com/deploy?template=https://github.com/cedricbonhomme/pyAggr3g470r"><img alt="https://www.herokucdn.com/deploy/button.png" src="https://www.herokucdn.com/deploy/button.png" /></a></p> - <p>{{ _("This software is under AGPLv3 license. You are welcome to copy, modify or redistribute the %(start_link_source)ssource code%(end_link_source)s according to the %(start_link_affero)sAffero GPL%(end_link_affero)s license.", - start_link_source="<a href='https://bitbucket.org/cedricbonhomme/pyaggr3g470r'>"|safe, end_link_source="</a>"|safe, - start_link_affero="<a href='https://www.gnu.org/licenses/agpl-3.0.html'>"|safe, end_link_affero="</a>"|safe) }}</p> - <p>{{ _("Found a bug? Report it %(start_link)shere%(end_link)s.", start_link="<a href='https://bitbucket.org/cedricbonhomme/pyaggr3g470r/issues'>"|safe, end_link="</a>"|safe) }}</p> - </div> - <div class="well"> - <h1>{{ _("Help") }}</h1> - <p>{{ _("If you have any problem, %(start_link)scontact%(end_link)s the administrator.", start_link="<a href='http://wiki.cedricbonhomme.org/contact'>"|safe, end_link="</a>"|safe) }}</p> - <p>{{ _("The documentation of the RESTful API is %(start_link)shere%(end_link)s.", start_link="<a href='https://pyaggr3g470r.readthedocs.org/en/latest/web-services.html'>"|safe, end_link="</a>"|safe) }}</p> - <p>{{ _("You can subscribe to new feeds with a bookmarklet. Drag the following button to your browser bookmarks.") }}</p> - <a class="btn btn-default" href="javascript:window.location='{{ url_for("feed.bookmarklet", _external=True) }}?url='+encodeURIComponent(document.location)'" rel="bookmark"> - {{ _("Subscribe to this feed using pyAggr3g470r") }} - </a> - </div> - <div class="well"> - <h1>{{ _("Donation") }}</h1> - <p>{{ _("If you wish and if you like pyAggr3g470r, you can donate via bitcoin %(start_link)s1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ%(end_link)s. Thank you!", - start_link="<a href='https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ'>"|safe, end_link="</a>"|safe) }} - </p> - </div> -</div><!-- /.container --> -{% endblock %} diff --git a/pyaggr3g470r/templates/categories.html b/pyaggr3g470r/templates/categories.html deleted file mode 100644 index a61cc4b2..00000000 --- a/pyaggr3g470r/templates/categories.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -<div class="container"> - <h1>{{ _("You have %(categories)d categories · Add a %(start_link)scategory%(end_link)s", categories=categories|count, start_link=("<a href='%s'>" % url_for("category.form"))|safe, end_link="</a>"|safe) }}</h1> - {% if categories|count == 0 %} - <h1>{{_("No category")}}</h1> - {% else %} - <div class="table-responsive"> - <table class="table table-striped"> - <thead> - <tr> - <th>#</th> - <th>{{ _('Name') }}</th> - <th>{{ _('Feeds') }}</th> - <th>{{ _('Articles') }}</th> - <th>{{ _('Actions') }}</th> - </tr> - </thead> - <tbody> - {% for category in categories|sort(attribute="name") %} - <tr> - <td>{{ loop.index }}</td> - <td>{{ category.name }}</td> - <td>{{ feeds_count.get(category.id, 0) }}</td> - <td>( {{ unread_article_count.get(category.id, 0) }} ) {{ article_count.get(category.id, 0) }}</td> - <td> - <a href="{{ url_for("category.form", category_id=category.id) }}"><i class="glyphicon glyphicon-edit" title='{{ _("Edit this category") }}'></i></a> - <a href="{{ url_for("category.delete", category_id=category.id) }}"><i class="glyphicon glyphicon-remove" title='{{ _("Delete this category") }}' onclick="return confirm('{{ _('You are going to delete this category.') }}');"></i></a> - </td> - </tr> - {% endfor %} - </tbody> - </table> - </div> - {% endif %} -{% endblock %} diff --git a/pyaggr3g470r/templates/edit_category.html b/pyaggr3g470r/templates/edit_category.html deleted file mode 100644 index 93c952d6..00000000 --- a/pyaggr3g470r/templates/edit_category.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -<div class="container"> - <div class="well"> - <h3>{{ action }}</h3> - <form action="" method="post" name="save" class="form-horizontal"> - {{ form.hidden_tag() }} - <div class="form-group"> - <label for="{{ form.name.id }}" class="col-sm-3 control-label">{{ form.name.label }}</label> - <div class="col-sm-9"> - {{ form.name(class_="form-control", size="100%") }} - </div> - {% for error in form.name.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %} - </div> - <div class="form-group"> - <div class="col-sm-offset-3 col-sm-9"> - {{ form.submit(class_="btn btn-default") }} - </div> - </div> - </form> - </div> -</div><!-- /.container --> -{% endblock %} diff --git a/pyaggr3g470r/views/admin.py b/pyaggr3g470r/views/admin.py deleted file mode 100644 index 744f3523..00000000 --- a/pyaggr3g470r/views/admin.py +++ /dev/null @@ -1,166 +0,0 @@ -from flask import (Blueprint, g, render_template, redirect, - flash, url_for, request) -from flask.ext.babel import gettext -from flask.ext.login import login_required - -from flask.ext.principal import Permission, RoleNeed - -from pyaggr3g470r.lib.utils import redirect_url -from pyaggr3g470r.models import Role -from pyaggr3g470r.controllers import UserController, ArticleController - -from pyaggr3g470r.forms import InformationMessageForm, UserForm -from pyaggr3g470r import notifications - -admin_bp = Blueprint('admin', __name__, url_prefix='/admin') -admin_permission = Permission(RoleNeed('admin')) - - -@admin_bp.route('/dashboard', methods=['GET', 'POST']) -@login_required -@admin_permission.require(http_exception=403) -def dashboard(): - """ - Adminstrator's dashboard. - """ - form = InformationMessageForm() - - if request.method == 'POST': - if form.validate(): - try: - notifications.information_message(form.subject.data, - form.message.data) - except Exception as error: - flash(gettext( - 'Problem while sending email: %(error)s', error=error), - 'danger') - - users = UserController().read() - return render_template('admin/dashboard.html', - users=users, current_user=g.user, form=form) - - -@admin_bp.route('/user/create', methods=['GET']) -@admin_bp.route('/user/edit/<int:user_id>', methods=['GET']) -@login_required -@admin_permission.require(http_exception=403) -def user_form(user_id=None): - if user_id is not None: - user = UserController().get(id=user_id) - form = UserForm(obj=user) - message = gettext('Edit the user <i>%(nick)s</i>', nick=user.nickname) - else: - form = UserForm() - message = gettext('Add a new user') - return render_template('/admin/create_user.html', - form=form, message=message) - - -@admin_bp.route('/user/create', methods=['POST']) -@admin_bp.route('/user/edit/<int:user_id>', methods=['POST']) -@login_required -@admin_permission.require(http_exception=403) -def process_user_form(user_id=None): - """ - Create or edit a user. - """ - form = UserForm() - user_contr = UserController() - - if not form.validate(): - return render_template('/admin/create_user.html', form=form, - message=gettext('Some errors were found')) - - role_user = Role.query.filter(Role.name == "user").first() - if user_id is not None: - # Edit a user - user_contr.update({'id': user_id}, - {'nickname': form.nickname.data, - 'email': form.email.data, - 'password': form.password.data, - 'refresh_rate': form.refresh_rate.data}) - user = user_contr.get(id=user_id) - flash(gettext('User %(nick)s successfully updated', - nick=user.nickname), 'success') - else: - # Create a new user - user = user_contr.create(nickname=form.nickname.data, - email=form.email.data, - password=form.password.data, - roles=[role_user], - refresh_rate=form.refresh_rate.data, - activation_key="") - flash(gettext('User %(nick)s successfully created', - nick=user.nickname), 'success') - return redirect(url_for('admin.user_form', user_id=user.id)) - - -@admin_bp.route('/user/<int:user_id>', methods=['GET']) -@login_required -@admin_permission.require(http_exception=403) -def user(user_id=None): - """ - See information about a user (stations, etc.). - """ - user = UserController().get(id=user_id) - if user is not None: - article_contr = ArticleController(user_id) - return render_template('/admin/user.html', user=user, feeds=user.feeds, - article_count=article_contr.count_by_feed(), - unread_article_count=article_contr.count_by_feed(readed=False)) - - else: - flash(gettext('This user does not exist.'), 'danger') - return redirect(redirect_url()) - - -@admin_bp.route('/delete_user/<int:user_id>', methods=['GET']) -@login_required -@admin_permission.require(http_exception=403) -def delete_user(user_id=None): - """ - Delete a user (with all its data). - """ - try: - user = UserController().delete(user_id) - flash(gettext('User %(nick)s successfully deleted', - nick=user.nickname), 'success') - except Exception as error: - flash(gettext('An error occured while trying to delete a user: ' - '%(error)', error=error), 'danger') - return redirect(redirect_url()) - - -@admin_bp.route('/toggle_user/<int:user_id>', methods=['GET']) -@login_required -@admin_permission.require() -def toggle_user(user_id=None): - """ - Enable or disable the account of a user. - """ - user_contr = UserController() - user = user_contr.get(id=user_id) - - if user is None: - flash(gettext('This user does not exist.'), 'danger') - return redirect(url_for('admin.dashboard')) - - if user.activation_key != "": - - # Send the confirmation email - try: - notifications.new_account_activation(user) - user_contr.unset_activation_key(user.id) - message = gettext('Account of the user %(nick)s successfully ' - 'activated.', nick=user.nickname) - except Exception as error: - flash(gettext('Problem while sending activation email %(error)s:', - error=error), 'danger') - return redirect(url_for('admin.dashboard')) - - else: - user_contr.set_activation_key(user.id) - message = gettext('Account of the user %(nick)s successfully disabled', - nick=user.nickname) - flash(message, 'success') - return redirect(url_for('admin.dashboard')) diff --git a/pyaggr3g470r/views/api/category.py b/pyaggr3g470r/views/api/category.py deleted file mode 100644 index 31f46751..00000000 --- a/pyaggr3g470r/views/api/category.py +++ /dev/null @@ -1,31 +0,0 @@ -from flask import g - -from pyaggr3g470r.controllers.category import CategoryController -from pyaggr3g470r.views.api.common import (PyAggResourceNew, - PyAggResourceExisting, - PyAggResourceMulti) - - -CAT_ATTRS = {'name': {'type': str}, - 'user_id': {'type': int}} - - -class CategoryNewAPI(PyAggResourceNew): - controller_cls = CategoryController - attrs = CAT_ATTRS - - -class CategoryAPI(PyAggResourceExisting): - controller_cls = CategoryController - attrs = CAT_ATTRS - - -class CategoriesAPI(PyAggResourceMulti): - controller_cls = CategoryController - attrs = CAT_ATTRS - - -g.api.add_resource(CategoryNewAPI, '/category', endpoint='category_new.json') -g.api.add_resource(CategoryAPI, '/category/<int:obj_id>', - endpoint='category.json') -g.api.add_resource(CategoriesAPI, '/categories', endpoint='categories.json') diff --git a/pyaggr3g470r/views/category.py b/pyaggr3g470r/views/category.py deleted file mode 100644 index 027a800f..00000000 --- a/pyaggr3g470r/views/category.py +++ /dev/null @@ -1,86 +0,0 @@ -from flask import g, Blueprint, render_template, flash, redirect, url_for -from flask.ext.babel import gettext -from flask.ext.login import login_required - -from pyaggr3g470r.forms import CategoryForm -from pyaggr3g470r.lib.utils import redirect_url -from pyaggr3g470r.lib.view_utils import etag_match -from pyaggr3g470r.controllers \ - import ArticleController, FeedController, CategoryController - -categories_bp = Blueprint('categories', __name__, url_prefix='/categories') -category_bp = Blueprint('category', __name__, url_prefix='/category') - - -@categories_bp.route('/', methods=['GET']) -@login_required -@etag_match -def list_(): - "Lists the subscribed feeds in a table." - art_contr = ArticleController(g.user.id) - return render_template('categories.html', - categories=list(CategoryController(g.user.id).read()), - feeds_count=FeedController(g.user.id).count_by_category(), - unread_article_count=art_contr.count_by_category(readed=False), - article_count=art_contr.count_by_category()) - - -@category_bp.route('/create', methods=['GET']) -@category_bp.route('/edit/<int:category_id>', methods=['GET']) -@login_required -@etag_match -def form(category_id=None): - action = gettext("Add a category") - head_titles = [action] - if category_id is None: - return render_template('edit_category.html', action=action, - head_titles=head_titles, form=CategoryForm()) - category = CategoryController(g.user.id).get(id=category_id) - action = gettext('Edit category') - head_titles = [action] - if category.name: - head_titles.append(category.name) - return render_template('edit_category.html', action=action, - head_titles=head_titles, category=category, - form=CategoryForm(obj=category)) - - -@category_bp.route('/delete/<int:category_id>', methods=['GET']) -@login_required -def delete(category_id=None): - category = CategoryController(g.user.id).delete(category_id) - flash(gettext("Category %(category_name)s successfully deleted.", - category_name=category.name), 'success') - return redirect(redirect_url()) - - -@category_bp.route('/create', methods=['POST']) -@category_bp.route('/edit/<int:category_id>', methods=['POST']) -@login_required -def process_form(category_id=None): - form = CategoryForm() - cat_contr = CategoryController(g.user.id) - - if not form.validate(): - return render_template('edit_category.html', form=form) - existing_cats = list(cat_contr.read(name=form.name.data)) - if existing_cats and category_id is None: - flash(gettext("Couldn't add category: already exists."), "warning") - return redirect(url_for('category.form', - category_id=existing_cats[0].id)) - # Edit an existing category - category_attr = {'name': form.name.data} - - if category_id is not None: - cat_contr.update({'id': category_id}, category_attr) - flash(gettext('Category %(cat_name)r successfully updated.', - cat_name=category_attr['name']), 'success') - return redirect(url_for('category.form', category_id=category_id)) - - # Create a new category - new_category = cat_contr.create(**category_attr) - - flash(gettext('Category %(category_name)r successfully created.', - category_name=new_category.name), 'success') - - return redirect(url_for('category.form', category_id=new_category.id)) diff --git a/pyaggr3g470r/views/user.py b/pyaggr3g470r/views/user.py deleted file mode 100644 index cb416b5d..00000000 --- a/pyaggr3g470r/views/user.py +++ /dev/null @@ -1,152 +0,0 @@ -import string -import random -from flask import (Blueprint, g, render_template, redirect, - flash, url_for, request) -from flask.ext.babel import gettext -from flask.ext.login import login_required - -import conf -from pyaggr3g470r import utils, notifications -from pyaggr3g470r.controllers import (UserController, FeedController, - ArticleController) - -from pyaggr3g470r.forms import ProfileForm, RecoverPasswordForm - -users_bp = Blueprint('users', __name__, url_prefix='/users') -user_bp = Blueprint('user', __name__, url_prefix='/user') - - -@user_bp.route('/management', methods=['GET', 'POST']) -@login_required -def management(): - """ - Display the management page. - """ - if request.method == 'POST': - if None != request.files.get('opmlfile', None): - # Import an OPML file - data = request.files.get('opmlfile', None) - if not utils.allowed_file(data.filename): - flash(gettext('File not allowed.'), 'danger') - else: - try: - nb = utils.import_opml(g.user.email, data.read()) - if conf.CRAWLING_METHOD == "classic": - utils.fetch(g.user.email, None) - flash(str(nb) + ' ' + gettext('feeds imported.'), - "success") - flash(gettext("Downloading articles..."), 'info') - except: - flash(gettext("Impossible to import the new feeds."), - "danger") - elif None != request.files.get('jsonfile', None): - # Import an account - data = request.files.get('jsonfile', None) - if not utils.allowed_file(data.filename): - flash(gettext('File not allowed.'), 'danger') - else: - try: - nb = utils.import_json(g.user.email, data.read()) - flash(gettext('Account imported.'), "success") - except: - flash(gettext("Impossible to import the account."), - "danger") - else: - flash(gettext('File not allowed.'), 'danger') - - nb_feeds = FeedController(g.user.id).read().count() - art_contr = ArticleController(g.user.id) - nb_articles = art_contr.read().count() - nb_unread_articles = art_contr.read(readed=False).count() - return render_template('management.html', user=g.user, - nb_feeds=nb_feeds, nb_articles=nb_articles, - nb_unread_articles=nb_unread_articles) - - -@user_bp.route('/profile', methods=['GET', 'POST']) -@login_required -def profile(): - """ - Edit the profile of the currently logged user. - """ - user_contr = UserController(g.user.id) - user = user_contr.get(id=g.user.id) - form = ProfileForm() - - if request.method == 'POST': - if form.validate(): - user_contr.update({'id': g.user.id}, - {'nickname': form.nickname.data, - 'email': form.email.data, - 'password': form.password.data, - 'refresh_rate': form.refresh_rate.data}) - - flash(gettext('User %(nick)s successfully updated', - nick=user.nickname), 'success') - return redirect(url_for('user.profile')) - else: - return render_template('profile.html', user=user, form=form) - - if request.method == 'GET': - form = ProfileForm(obj=user) - return render_template('profile.html', user=user, form=form) - - -@user_bp.route('/delete_account', methods=['GET']) -@login_required -def delete_account(): - """ - Delete the account of the user (with all its data). - """ - UserController(g.user.id).delete(g.user.id) - flash(gettext('Your account has been deleted.'), 'success') - return redirect(url_for('login')) - - -@user_bp.route('/confirm_account/<string:activation_key>', methods=['GET']) -def confirm_account(activation_key=None): - """ - Confirm the account of a user. - """ - user_contr = UserController() - if activation_key != "": - user = user_contr.read(activation_key=activation_key).first() - if user is not None: - user_contr.update({'id': user.id}, {'activation_key': ''}) - flash(gettext('Your account has been confirmed.'), 'success') - else: - flash(gettext('Impossible to confirm this account.'), 'danger') - return redirect(url_for('login')) - - -@user_bp.route('/recover', methods=['GET', 'POST']) -def recover(): - """ - Enables the user to recover its account when he has forgotten - its password. - """ - form = RecoverPasswordForm() - user_contr = UserController() - - if request.method == 'POST': - if form.validate(): - user = user_contr.get(email=form.email.data) - characters = string.ascii_letters + string.digits - password = "".join(random.choice(characters) - for x in range(random.randint(8, 16))) - user.set_password(password) - user_contr.update({'id': user.id}, {'password': password}) - - # Send the confirmation email - try: - notifications.new_password_notification(user, password) - flash(gettext('New password sent to your address.'), 'success') - except Exception as error: - flash(gettext('Problem while sending your new password: ' - '%(error)s', error=error), 'danger') - - return redirect(url_for('login')) - return render_template('recover.html', form=form) - - if request.method == 'GET': - return render_template('recover.html', form=form) |