Merge pull request #63 from aledruetta/devel

Devel

Author: aa779

prototipo/Vagrantfile

@@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider "virtualbox" do |vb|
     vb.name = "focal64_flaskAPI"
     vb.gui = false
-    vb.memory = "1024"
+    vb.memory = "2048"
   end
 
   config.vm.provision :shell, :path => "Vagrant-setup/bootstrap.sh"

prototipo/migrations/versions/61fd7b1a6054_.py

@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 61fd7b1a6054
+Revises: 3eeb4ae85a13
+Create Date: 2020-11-30 14:31:27.250926
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '61fd7b1a6054'
+down_revision = '3eeb4ae85a13'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user_auth', sa.Column('is_admin', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user_auth', 'is_admin')
+    # ### end Alembic commands ###

prototipo/projeto/app.py

@@ -1,7 +1,7 @@
 from datetime import timedelta
 from flask import Flask
 
-from .ext import auth, api, db, jwt, site
+from .ext import admin, auth, api, db, jwt, site
 
 
 def create_app():
@@ -15,11 +15,13 @@ def create_app():
     app.config["JWT_AUTH_USERNAME_KEY"] = "email"
     app.config["JWT_AUTH_URL_RULE"] = "/token"
     app.config["JWT_EXPIRATION_DELTA"] = timedelta(seconds=3600)
+    app.config['FLASK_ADMIN_SWATCH'] = 'simplex'
 
     db.init_app(app)
     api.init_app(app)
     jwt.init_app(app)
     auth.init_app(app)
+    admin.init_app(app)
     site.init_app(app)
 
     return app

prototipo/projeto/ext/admin/__init__.py

@@ -0,0 +1,48 @@
+from flask import redirect, url_for, request
+from flask_login import current_user, login_required
+from flask_admin import Admin
+from flask_admin.contrib.sqla import ModelView
+from projeto.ext.auth import UserAuth
+from projeto.ext.api.models import Estacao, Sensor
+from projeto.ext.db import db
+
+
+class AdminView(ModelView):
+    @login_required
+    def is_accessible(self):
+        if current_user.is_authenticated and current_user.is_admin:
+            return True
+        return False
+
+    def inaccessible_callback(self, name, **kwargs):
+        if not self.is_accessible():
+            return redirect(url_for("auth.login", next=request.url))
+
+
+class UserView(AdminView):
+    column_sortable_list = ()
+
+
+class EstacaoView(AdminView):
+    column_list = ('id', 'local', 'latitude', 'longitude')
+    column_sortable_list = ()
+
+
+class SensorView(AdminView):
+    column_list = ('id', 'tipo', 'descricao', 'params', 'estacao')
+    column_sortable_list = ()
+
+    form_excluded_columns = [
+        'leituras',
+    ]
+
+
+admin = Admin(name='flaskapi', template_mode='bootstrap3')
+
+admin.add_view(UserView(UserAuth, db.session))
+admin.add_view(EstacaoView(Estacao, db.session))
+admin.add_view(SensorView(Sensor, db.session))
+
+
+def init_app(app):
+    admin.init_app(app)

prototipo/projeto/ext/api/models.py

@@ -15,6 +15,7 @@ def get_sensor(self, sensor_id):
         for sensor in self.sensores:
             if sensor.id == sensor_id:
                 return sensor
+        return None
 
     def json(self):
         return {
@@ -25,7 +26,7 @@ def json(self):
         }
 
     def __repr__(self):
-        return f"{self.local} [{self.latitude}, {self.longitude}]"
+        return f"{self.local}"
 
 
 class Sensor(db.Model):

prototipo/projeto/ext/api/views.py

@@ -141,7 +141,7 @@ def put(self, estacao_id, sensor_id):
         parser.add_argument("params", type=str)
 
         data = parser.parse_args()
-        estacao = Estacao.query.get(sensor_id)
+        estacao = Estacao.query.get(estacao_id)
 
         if estacao:
             sensor = estacao.get_sensor(sensor_id)
@@ -159,7 +159,7 @@ def put(self, estacao_id, sensor_id):
 
     # @jwt_required()
     def delete(self, estacao_id, sensor_id):
-        estacao = Estacao.query.get(sensor_id)
+        estacao = Estacao.query.get(estacao_id)
 
         if estacao:
             sensor = estacao.get_sensor(sensor_id)

prototipo/projeto/ext/auth/models.py

@@ -7,6 +7,7 @@ class UserAuth(UserMixin, db.Model):
     id = db.Column("id", db.Integer, primary_key=True)
     email = db.Column("email", db.String(255), nullable=False, unique=True)
     password = db.Column("password", db.String(255), nullable=False)
+    is_admin = db.Column("is_admin", db.Boolean, default=False)
 
     def __repr__(self):
         return f"{self.id}: {self.email}"

prototipo/projeto/templates/base.html

@@ -4,25 +4,34 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{title}}</title>
+
     <link rel="icon" type="image/png" href="{{ url_for('static', filename='favicon-16x16.png') }}" sizes="16x16">
     <link rel="icon" type="image/png" href="{{ url_for('static', filename='favicon-32x32.png') }}" sizes="32x32">
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
     <link rel="stylesheet" href="{{ url_for('static', filename='font-awesome/css/font-awesome.min.css') }}">
+
+    {% block extracss %}{% endblock %}
+
     <!--
     <script defer src="https://use.fontawesome.com/releases/v5.14.0/js/all.js"></script>
     -->
 
-    {% block extracss %}{% endblock %}
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"
+        integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
+        crossorigin="anonymous">
+    </script>
+
+    <script src="{{ url_for('static', filename='script.js') }}"></script>
+
     {% block extrajs %}{% endblock %}
+
   </head>
 
   <body>
 
     {% include "navbar.html" %}
 
     {% block main %}{% endblock %}
-
-    <script src="{{ url_for('static', filename='script.js') }}"></script>
   </body>
 </html>

prototipo/projeto/templates/index.html

@@ -5,11 +5,7 @@
   <script src="https://code.highcharts.com/modules/exporting.js"></script>
   <script src="https://code.highcharts.com/modules/export-data.js"></script>
   <script src="https://code.highcharts.com/modules/accessibility.js"></script>
-  <script src="https://code.jquery.com/jquery-3.5.1.min.js"
-          integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
-          crossorigin="anonymous">
-  </script>
-<script src="{{ url_for('static', filename='visualizacoes.js') }}"></script>
+  <script src="{{ url_for('static', filename='visualizacoes.js') }}"></script>
 {% endblock %}
 
 {% block main %}

prototipo/projeto/templates/navbar.html

@@ -13,12 +13,8 @@
 
   <div id="navbarBasicExample" class="navbar-menu">
     <div class="navbar-start">
-      <a class="navbar-item" href="/">
-        Home
-      </a>
-
-      <a class="navbar-item">
-        Documentation
+      <a class="navbar-item" href="{{ url_for('admin.index') }}" target="_blank">
+        Admin
       </a>
 
       <div class="navbar-item has-dropdown is-hoverable">
@@ -30,15 +26,12 @@
           <a class="navbar-item">
             About
           </a>
-          <a class="navbar-item" href="{{ url_for('site.protected') }}">
-            Secret
-          </a>
           <a class="navbar-item">
-            Contact
+            Documentation
           </a>
           <hr class="navbar-divider">
-          <a class="navbar-item" href="">
-            Others
+          <a class="navbar-item">
+            Contact
           </a>
         </div>
       </div>