add members

config file to enable/disable registration and other future admin settings

myriad/__init__.py

@@ -11,15 +11,11 @@ def create_app(test_config=None):
         DATABASE=os.path.join(app.instance_path, 'database.sqlite'),
     )
 
-    if test_config is None:
-        # load the instance config, if it exists, when not testing
-        app.config.from_pyfile('config.py', silent=True)
-    else:
-        # load the test config if passed in
-        app.config.from_mapping(test_config)
-
     # ensure the instance folder exists
     os.makedirs(app.instance_path, exist_ok=True)
+
+    app.config.from_pyfile('config.py')
+    #print(app.config["REGISTRATION"])
     
     from . import db
     db.init_app(app)
@@ -31,4 +27,7 @@ def create_app(test_config=None):
     app.register_blueprint(home.bp)
     app.add_url_rule('/', endpoint='index')
 
+    from . import manage
+    app.register_blueprint(manage.bp)
+
     return app

myriad/auth.py

@@ -1,7 +1,7 @@
 import functools
 
 from flask import (
-    Blueprint, flash, g, redirect, render_template, request, session, url_for
+    Blueprint, flash, g, redirect, render_template, request, session, url_for, current_app
 )
 from werkzeug.security import check_password_hash, generate_password_hash
 
@@ -9,8 +9,34 @@ from myriad.db import get_db
 
 bp = Blueprint('auth', __name__, url_prefix='/auth')
 
+def login_required(view):
+    @functools.wraps(view)
+    def wrapped_view(**kwargs):
+        if g.user is None:
+            return redirect(url_for('auth.login'))
+
+        return view(**kwargs)
+
+    return wrapped_view
+
+
+@bp.before_app_request
+def load_logged_in_user():
+    user_id = session.get('user_id')
+
+    if user_id is None:
+        g.user = None
+    else:
+        g.user = get_db().execute(
+            'SELECT * FROM user WHERE id = ?', (user_id,)
+        ).fetchone()
+
+
+
 @bp.route('/register', methods=('GET', 'POST'))
 def register():
+    if current_app.config["REGISTRATION"] == False and g.user is None:
+        return redirect(url_for("index"))
     if request.method == 'POST':
         username = request.form['username']
         password = request.form['password']
@@ -63,17 +89,6 @@ def login():
 
     return render_template('auth/login.html')
 
-@bp.before_app_request
-def load_logged_in_user():
-    user_id = session.get('user_id')
-
-    if user_id is None:
-        g.user = None
-    else:
-        g.user = get_db().execute(
-            'SELECT * FROM user WHERE id = ?', (user_id,)
-        ).fetchone()
-
 
 @bp.route('/logout')
 def logout():
@@ -81,12 +96,3 @@ def logout():
     return redirect(url_for('index'))
 
 
-def login_required(view):
-    @functools.wraps(view)
-    def wrapped_view(**kwargs):
-        if g.user is None:
-            return redirect(url_for('auth.login'))
-
-        return view(**kwargs)
-
-    return wrapped_view

myriad/home.py

@@ -16,4 +16,10 @@ def index():
     #     ' FROM post p JOIN user u ON p.author_id = u.id'
     #     ' ORDER BY created DESC'
     # ).fetchall()
-    return render_template('index.html')
+    return render_template('index.html')
+
+@bp.route('/full')
+def full_list():
+    db = get_db()
+    members = db.execute('SELECT * FROM member ORDER BY member_name').fetchall()
+    return render_template('full.html', memberlist=members)

myriad/manage.py

@@ -0,0 +1,36 @@
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, session, url_for
+)
+
+from myriad.auth import login_required
+from myriad.db import get_db
+
+bp = Blueprint('manage', __name__, url_prefix='/manage')
+
+@bp.route('/new', methods=('GET', 'POST'))
+@login_required
+def new():
+    if request.method == 'POST':
+        name = request.form['name']
+        bio = request.form['bio']
+        #icon = request.form['icon']
+        user_id = g.user[0]
+        db = get_db()
+        error = None
+
+        if not name:
+            error = 'Name is required.'
+
+        if error is None:   
+            db.execute(
+                "INSERT INTO member (user_id, member_name, bio) VALUES (?, ?, ?)",
+                (user_id, name, bio),
+
+            )
+            db.commit()
+
+        flash(error)
+
+        return redirect(url_for('home.full_list'))
+    
+    return render_template('manage/new.html')

myriad/static/style.css

@@ -29,6 +29,11 @@ form{
 label,input{
     margin:10px;
 }
+form textarea{
+    height:100px;
+    width:300px;
+    vertical-align: top;
+}
 
 
 

myriad/templates/base.html

@@ -7,14 +7,25 @@
 <div id="main">
   
   <div class="container" id="nav">
-    <div class="heading">myriad</div>
-    <div class="navitem">> <a href="{{ url_for('index') }}">Home</a></div>
+    <div class="heading">Myriad</div>
+    <div class="navitem">> <a href="{{ url_for('home.index') }}">Home</a></div>
+    <div class="navitem">> <a href="{{ url_for('home.full_list') }}">Full List</a></div>
+
+    {% if g.user %}
+    <div class="heading">Manage</div>
+    <div class="navitem">> <a href="{{ url_for('manage.new') }}">Add New</a></div>
+    {% endif %}
+
+    <div class="heading">Administration</div>
     {% if g.user %}
       <div class="navitem">> <a href="{{ url_for('auth.logout') }}">Log out</a></div>
     {% else %}
-      <div class="navitem">> <a href="{{ url_for('auth.register') }}">Register</a></div>
+      {% if config["REGISTRATION"] == True %}
+        <div class="navitem">> <a href="{{ url_for('auth.register') }}">Register</a></div>
+      {% endif %}
       <div class="navitem">> <a href="{{ url_for('auth.login') }}">Log in</a></div>
     {% endif %}
+
     </div>
 
   <div class="container">

myriad/templates/full.html

@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <div class="title">{% block title %}Full List{% endblock %}</div>
+{% endblock %}
+
+{% block content %}
+  
+    {% for member in memberlist %}
+
+    <div class="profile">
+        <div class="heading"><b>{{ member[3] }}</b> {{ member[4] }}</div>
+        <img src="{{ url_for('static', filename='/icons/any.jpg') }}" class="icon">
+        <div class="bio">
+            {{ member[5] }}
+        </div>
+        <br class="clear" />
+        <!--<div class="heading links"><a href="/geo">my page</a> &#9734 tumblr &#9734</div>
+        <img src="/geo/dsgame.webp" class="dsgame">
+        <br class="clear" /> -->
+    </div>
+
+    {% endfor %}
+
+{% endblock %}

myriad/templates/manage/new.html

@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <div class="title">{% block title %}New{% endblock %}</div>
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    <label for="name">Name</label>
+    <input name="name" id="name" required><br>
+    <label for="bio">Description</label>
+    <textarea name="bio" id="bio"></textarea><br>
+    <input type="submit" value="Submit">
+  </form>
+{% endblock %}