Merge pull request #218 from levlaz/feature/archive

Added Archive

Author: levlaz

app/__init__.py

@@ -48,5 +48,4 @@ def create_app(config_name):
                 db.session.add(admin)
                 db.session.commit()
 
-
     return app

app/main/views.py

@@ -16,7 +16,7 @@ def index():
     if current_user.is_authenticated():
         notes = Note.query.filter_by(
             author_id=current_user.id,
-            is_deleted=False).order_by(
+            is_deleted=False, is_archived=False).order_by(
             Note.is_favorite.desc(),
             Note.updated_date.desc()).all()
         return render_template('app/app.html', notes=notes)
@@ -305,6 +305,35 @@ def favorite(id):
         return redirect(url_for('.index'))
 
 
+@main.route('/archive')
+@login_required
+def view_archive():
+    if current_user.is_authenticated():
+        notes = Note.query.filter_by(
+            author_id=current_user.id,
+            is_deleted=False, is_archived=True).order_by(
+                Note.updated_date.desc()).all()
+        if len(notes) == 0:
+            flash("Archive is empty")
+            return redirect(url_for('.index'))
+        return render_template('app/archive.html', notes=notes)
+    else:
+        return render_template('index.html')
+
+
+@main.route('/archive/<int:id>')
+@login_required
+def archive(id):
+    note = Note.query.get_or_404(id)
+    if current_user != note.author:
+        abort(403)
+    else:
+        note.is_archived = True
+        db.session.commit()
+        flash('The note has been archived.')
+        return redirect(url_for('.index'))
+
+
 @main.route('/shutdown')
 def server_shutdown():
     if not current_app.testing:

app/models.py

@@ -214,6 +214,7 @@ class Note(db.Model):
     notebook_id = db.Column(db.Integer, db.ForeignKey('notebooks.id'))
     is_deleted = db.Column(db.Boolean, default=False)
     is_favorite = db.Column(db.Boolean, default=False)
+    is_archived = db.Column(db.Boolean, default=False)
 
     tags = db.relationship(
         "Tag", secondary=note_tag,

app/templates/app/_note.html

@@ -1,11 +1,11 @@
 {% for note in notes %}
-{% if request.query_string == '' and loop.index == 1 %}
-<div class="tab-pane active" id="{{ note.id }}">
-{% elif request.args.get('active_note')|int == note.id %}
-<div class="tab-pane active" id="{{ note.id }}">
-{% else %}
-<div class="tab-pane" id="{{ note.id }}">
-{% endif %}
+  {% if request.query_string == '' and loop.index == 1 %}
+    <div class="tab-pane active" id="{{ note.id }}">
+  {% elif request.args.get('active_note')|int == note.id %}
+    <div class="tab-pane active" id="{{ note.id }}">
+  {% else %}
+    <div class="tab-pane" id="{{ note.id }}">
+  {% endif %}
 
     <h1> {{ note.title }} </h1>
 
@@ -16,27 +16,26 @@ <h1> {{ note.title }} </h1>
   </div>
 
   <div class="note-actions">
-      {% if not note.is_deleted %}
-      {% if note.is_favorite %}
-      <a href="{{ url_for('.favorite', id=note.id) }}"><span class="favorite actions glyphicon glyphicon-star" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Unmark as favorite" ></a></span>
-      {% else %}
-      <a href="{{ url_for('.favorite', id=note.id) }}"><span class="actions glyphicon glyphicon-star" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Mark as favorite"></a></span>
-      {% endif %}
-      <a href="{{ url_for('.share', id=note.id) }}"><span class="actions glyphicon glyphicon-share" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Share"></a></span>
-      <a href="{{ url_for('.edit', id=note.id) }}"><span class="actions glyphicon glyphicon-pencil" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Edit"></a></span>
-      <a href="{{ url_for('.delete', id=note.id) }}"><span class="actions glyphicon glyphicon-remove" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Delete"></a></span>
-      {% else %}
+    {% if not note.is_deleted %}
+    {% if note.is_favorite %}
+      <a href="{{ url_for('.favorite', id=note.id) }}"><i class="fa fa-star"></i></a>
+    {% else %}
+      <a href="{{ url_for('.favorite', id=note.id) }}"><i class="fa fa-star-o"></i></a>
+    {% endif %}
+      <a href="{{ url_for('.share', id=note.id) }}"><i class="fa fa-share"></i></a>
+      <a href="{{ url_for('.edit', id=note.id) }}"><i class="fa fa-pencil-square-o"></i></a>
+      <a href="{{ url_for('.archive', id=note.id) }}"><i class="fa fa-archive"></i></a>
+      <a href="{{ url_for('.delete', id=note.id) }}"><i class="fa fa-trash"></i></a>
+    {% else %}
       <a href="{{ url_for('.restore', id=note.id) }}"><span class="good actions glyphicon glyphicon-check" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Restore"></a></span>
       <a href="{{ url_for('.delete_forever', id=note.id) }}"><span class="bad actions glyphicon glyphicon-remove" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" data-original-title="Delete Forever"></a></span>
-      {% endif %}
+    {% endif %}
   </div>
 
   <div class="note-notebook">
       <a class="label label-notebook" href="{{ url_for('.notebook', id=note.notebook_id) }}"> {{ note.get_notebook(note.notebook_id).title | truncate(20) }} Notebook </a>
   </div>
 
-
-
   <div class="note-tags">
     <p>
       {% if current_user == note.author %}

app/templates/app/app_base.html

@@ -39,6 +39,9 @@
             <li class="sidebar-item" title="Settings">
                 <a href="/settings"><span class="nav-item glyphicon glyphicon-cog" aria-hidden="true"></span><br><span class="nav-description">Settings</span></a>
             </li>
+            <li class="sidebar-item" title="Archive">
+                <a href="/archive"><i class="fa fa-archive"></i><br><span class="nav-description">Archive</span></a>
+            </li>
             <li class="sidebar-item" title="View Trash">
                 <a href="/trash"><span class="nav-item glyphicon glyphicon-trash" aria-hidden="true"></span><br><span class="nav-description">Trash</span></a>
             </li>

app/templates/app/archive.html

@@ -0,0 +1,38 @@
+{% extends 'app/app_base.html' %}
+
+{% block title %} Braindump | Archive {% endblock %}
+
+{% block page_content %}
+<div class="col-sm-10">
+	<p class="heading"> Archived Notes</p>
+</div>
+
+<div class="row">
+
+      <div class="col-sm-4">
+          <ul class="nav nav-pills nav-stacked">
+          {% for note in notes %}
+            {% if loop.index == 1 %}
+              <li class="note-content active">
+            {% else %}
+              <li class="note-content">
+            {% endif %}
+                    <a href="#{{ note.id }}" data-toggle="pill">
+
+                        {{ note.title }}
+                        <br />
+                        <small>{{ moment(note.updated_date).fromNow() }}</small>
+                    </a>
+              </li>
+          {% endfor %}
+          </ul>
+      </div>
+
+      <div class="col-sm-7 preview">
+          <div class="tab-content">
+              {% include 'app/_note.html' %}
+          </div>
+      </div>
+
+</div>
+{% endblock %}