move assets para sapl-frontend

7 years ago · 1fdec8c214
39 changed files with 91 additions and 82 deletions
--- a/sapl-frontend/package.json
+++ b/sapl-frontend/package.json
@ -17,7 +17,9 @@
    "vue-router": "^3.0.1",
    "vuex": "^3.0.1",
    "webpack": "^4.28.4",
-    "webpack-bundle-tracker": "^0.4.2-beta"
+    "webpack-bundle-tracker": "^0.4.2-beta",
+
+    "sapl-oficial-theme": "../../sapl-oficial-theme"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "^3.3.0",
--- a/sapl-frontend/src/assets/audio/ring.mp3
+++ b/sapl-frontend/src/assets/audio/ring.mp3
--- a/sapl-frontend/src/assets/img/arrow.png
+++ b/sapl-frontend/src/assets/img/arrow.png
--- a/sapl-frontend/src/assets/img/authenticated.png
+++ b/sapl-frontend/src/assets/img/authenticated.png
--- a/sapl-frontend/src/assets/img/avatar.png
+++ b/sapl-frontend/src/assets/img/avatar.png
--- a/sapl-frontend/src/assets/img/beta.png
+++ b/sapl-frontend/src/assets/img/beta.png
--- a/sapl-frontend/src/assets/img/brasao_transp.gif
+++ b/sapl-frontend/src/assets/img/brasao_transp.gif
--- a/sapl-frontend/src/assets/img/down_arrow_select.jpg
+++ b/sapl-frontend/src/assets/img/down_arrow_select.jpg
--- a/sapl-frontend/src/assets/img/etiqueta.png
+++ b/sapl-frontend/src/assets/img/etiqueta.png
--- a/sapl-frontend/src/assets/img/favicon.ico
+++ b/sapl-frontend/src/assets/img/favicon.ico
--- a/sapl-frontend/src/assets/img/file.png
+++ b/sapl-frontend/src/assets/img/file.png
--- a/sapl-frontend/src/assets/img/hand-note.png
+++ b/sapl-frontend/src/assets/img/hand-note.png
--- a/sapl-frontend/src/assets/img/icon_comissoes.png
+++ b/sapl-frontend/src/assets/img/icon_comissoes.png
--- a/sapl-frontend/src/assets/img/icon_delete_white.png
+++ b/sapl-frontend/src/assets/img/icon_delete_white.png
--- a/sapl-frontend/src/assets/img/icon_materia_legislativa.png
+++ b/sapl-frontend/src/assets/img/icon_materia_legislativa.png
--- a/sapl-frontend/src/assets/img/icon_mesa_diretora.png
+++ b/sapl-frontend/src/assets/img/icon_mesa_diretora.png
--- a/sapl-frontend/src/assets/img/icon_normas_juridicas.png
+++ b/sapl-frontend/src/assets/img/icon_normas_juridicas.png
--- a/sapl-frontend/src/assets/img/icon_parlamentares.png
+++ b/sapl-frontend/src/assets/img/icon_parlamentares.png
--- a/sapl-frontend/src/assets/img/icon_pautas.png
+++ b/sapl-frontend/src/assets/img/icon_pautas.png
--- a/sapl-frontend/src/assets/img/icon_plenarias.png
+++ b/sapl-frontend/src/assets/img/icon_plenarias.png
--- a/sapl-frontend/src/assets/img/icon_relatorios.png
+++ b/sapl-frontend/src/assets/img/icon_relatorios.png
--- a/sapl-frontend/src/assets/img/icon_save_white.png
+++ b/sapl-frontend/src/assets/img/icon_save_white.png
--- a/sapl-frontend/src/assets/img/lexml.gif
+++ b/sapl-frontend/src/assets/img/lexml.gif
--- a/sapl-frontend/src/assets/img/logo.png
+++ b/sapl-frontend/src/assets/img/logo.png
--- a/sapl-frontend/src/assets/img/logo_cc.png
+++ b/sapl-frontend/src/assets/img/logo_cc.png
--- a/sapl-frontend/src/assets/img/logo_interlegis.png
+++ b/sapl-frontend/src/assets/img/logo_interlegis.png
--- a/sapl-frontend/src/assets/img/manual.png
+++ b/sapl-frontend/src/assets/img/manual.png
--- a/sapl-frontend/src/assets/img/pdflogo.png
+++ b/sapl-frontend/src/assets/img/pdflogo.png
--- a/sapl-frontend/src/assets/img/perfil.png
+++ b/sapl-frontend/src/assets/img/perfil.png
--- a/sapl-frontend/src/assets/img/search-gray.png
+++ b/sapl-frontend/src/assets/img/search-gray.png
--- a/sapl-frontend/src/assets/img/search.png
+++ b/sapl-frontend/src/assets/img/search.png
--- a/sapl-frontend/src/assets/img/user.png
+++ b/sapl-frontend/src/assets/img/user.png
--- a/sapl-frontend/src/theme/main.js
+++ b/sapl-frontend/src/theme/main.js
@ -1,5 +1,9 @@
-import "./scss/app.scss";
+//import "./scss/app.scss";
+//import 'bootstrap';
+
+import "sapl-oficial-theme/src/main";

 //eslint-disable-next-line
 let theme_lib = THEME_CUSTOM
 console.log(theme_lib);
+
--- a/sapl-frontend/vue.config.js
+++ b/sapl-frontend/vue.config.js
@ -1,4 +1,5 @@
 const webpack = require('webpack')
+const path = require('path')

 const BundleTracker = require('webpack-bundle-tracker')
 const dotenv = require('dotenv')
@ -24,10 +25,13 @@ module.exports = {
      .public('')
      .host('localhost')
      .port(8080)
-      .hotOnly(true)
-      .watchOptions({ poll: 1000 })
+      .hot(true)
+      .watchOptions({ poll: true })
+      .watchContentBase( true )
      .https(false)
      .headers({ 'Access-Control-Allow-Origin': '\*' })
+      .contentBase( [path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets')] )
+

    config.entryPoints.delete('app')
    
--- a/sapl/settings.py
+++ b/sapl/settings.py
@ -269,6 +269,9 @@ WEBPACK_LOADER = {
        'CACHE': not DEBUG,
        'BUNDLE_DIR_NAME': 'bundle/dist/',
        'STATS_FILE': FRONTEND_DIR.child('webpack-stats.json'),
+        'POLL_INTERVAL': 0.1,
+        'TIMEOUT': None,
+        'IGNORE': [r'.+\.hot-update.js', r'.+\.map']
    }
 }

@ -282,7 +285,7 @@ STATIC_ROOT = PROJECT_DIR.child("collected_static")

 STATICFILES_DIRS = (
    # BASE_DIR.child("static"),
-    FRONTEND_DIR.child('bundle').child('dist'),
+    FRONTEND_DIR.child('dist'),
 )


--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@ -2,6 +2,7 @@
 {% load i18n staticfiles menus %}
 {% load common_tags %}
 {% load render_bundle from webpack_loader %}
+{% load webpack_static from webpack_loader %}

 <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
 <!--[if gt IE 8]><!-->
@ -13,7 +14,7 @@
    <title>{% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    {% block head_content %}
-      <link rel="icon" href="{% static 'img/favicon.ico' %}"  type="image/png" >
+      <link rel="icon" href="{% webpack_static 'img/favicon.ico' %}"  type="image/png" >

      {# Styles #}
      {% comment "" %}
@ -39,47 +40,41 @@

      {% if not request|has_iframe %}
      {% block navigation %}
-      <nav class="navbar navbar-inverse navbar-static-top">
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
          <div class="container">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
+          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
          </button>
-          </div>
-          <div id="navbar" class="navbar-collapse collapse">
-
+          <div class="collapse navbar-collapse" id="navbarNav">
              {% block sections_navbar %} {% navbar 'navbar.yaml' %}{% endblock sections_navbar %}

              <ul class="nav navbar-nav navbar-right" id="autenticacao">
-              <li class="dropdown pesquisa">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="{% static 'img/search.png' %}"><span class="caret"></span></a>
+                <li class="nav-item dropdown pesquisa">
+                  <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="{% webpack_static 'img/search.png' %}"><span class="caret"></span></a>
                    <ul class="dropdown-menu">
-                    <li class="nav__sub-item">
+                      <li class="dropdown-item">
                        <form class="navbar-form search-form" method="get" action="http://sapl3.interlegis.leg.br/generico/lexml_pesquisar">
                          <input type="text" class="form-control" placeholder="Pesquisar no LexML" />
                        </form>
                      </li>
                    </ul>
                </li>
-              <li><a href="/sistema/ajuda"><img src="{% static 'img/manual.png' %}"></a></li>
+                <li class="nav-item"><a class="nav-link"href="/sistema/ajuda"><img src="{% webpack_static 'img/manual.png' %}"></a></li>
                {% if not user.is_authenticated %}
-                <li><a href="{% url 'sapl.base:login' %}"><img src="{% static 'img/user.png' %}"></a></li>
+                  <li class="nav-item"><a class="nav-link" href="{% url 'sapl.base:login' %}"><img src="{% webpack_static 'img/user.png' %}"></a></li>
                {% else %}
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img height="30" width="30" src="{% static 'img/authenticated.png' %}"><span class="caret"></span></a>
+                  <li class="nav-item dropdown">
+                      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img height="30" width="30" src="{% webpack_static 'img/authenticated.png' %}"><span class="caret"></span></a>
                    </a>
                    <ul class="dropdown-menu">
-                    <li><a>{{user.username}}</a></li>
+                      <li class="dropdown-item"><a>{{user.username}}</a></li>
                      {% if 'parlamentares.can_vote' in request.user.get_all_permissions %}
-                      <li><a href="" onclick="window.open('{% url 'sapl.painel:voto_individual' %}','Voto Individual','width=1000, height=800, scrollbars=yes')";>
+                        <li class="dropdown-item"><a href="" onclick="window.open('{% url 'sapl.painel:voto_individual' %}','Voto Individual','width=1000, height=800, scrollbars=yes')";>
                          Votar Matéria
                        </a></li>
                      {% endif %}
-                    <li><a href="{% url 'sapl.base:alterar_senha' %}">Alterar senha</a></li>
-                    <li><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
+                      <li class="dropdown-item"><a href="{% url 'sapl.base:alterar_senha' %}">Alterar senha</a></li>
+                      <li class="dropdown-item"><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
                    </ul>
                  </li>
                {% endif %}
@ -96,7 +91,7 @@
        <div class="container">
          <div class="navbar-header">
            <a class="navbar-brand" href="/">
-              <img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}"
+              <img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% webpack_static 'img/logo.png' %}{% endif %}"
              alt="Logo" class="img-responsive" >
              <span class="vcenter">
                {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #}
@ -187,7 +182,7 @@

              <a class="footer__logo" href="#">
                <a href="http://www.interlegis.leg.br/">
-                  <img src="{% static 'img/logo_interlegis.png' %}" alt="{% trans 'Logo do Interlegis' %} ">
+                  <img src="{% webpack_static 'img/logo_interlegis.png' %}" alt="{% trans 'Logo do Interlegis' %} ">
                </a>
              </a>
              <p>
@ -199,7 +194,7 @@
            </div>
            <div class="col-md-4">
              <a class="footer__logo" href="#">
-                <img src="{% static 'img/logo_cc.png' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
+                <img src="{% webpack_static 'img/logo_cc.png' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
              </a>
              <p>
                <small>
--- a/sapl/templates/index.html
+++ b/sapl/templates/index.html
@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n staticfiles %}
+{% load webpack_static from webpack_loader %}

 {% block title %}

@ -10,13 +11,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_mesa_diretora.png' %}" alt="Mesa Diretora">
+                    <img src="{% webpack_static 'img/icon_mesa_diretora.png' %}" alt="Mesa Diretora">
                </div>
                <h2>Mesa Diretora</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_mesa_diretora.png' %}">
+                    <img src="{% webpack_static 'img/icon_mesa_diretora.png' %}">
                    <h2>Mesa Diretora</h2>
                </div>
                <p>
@ -33,13 +34,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_comissoes.png' %}" alt="Comissões">
+                    <img src="{% webpack_static 'img/icon_comissoes.png' %}" alt="Comissões">
                </div>
                <h2>Comissões</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_comissoes.png' %}">
+                    <img src="{% webpack_static 'img/icon_comissoes.png' %}">
                    <h2>Comissões</h2>
                </div>
                <p>
@ -56,13 +57,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_parlamentares.png' %}" alt="Parlamentares">
+                    <img src="{% webpack_static 'img/icon_parlamentares.png' %}" alt="Parlamentares">
                </div>
                <h2>Parlamentares</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_parlamentares.png' %}">
+                    <img src="{% webpack_static 'img/icon_parlamentares.png' %}">
                    <h2>Parlamentares</h2>
                </div>
                <p>
@ -79,13 +80,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_pautas.png' %}" alt="Pautas das Sessões">
+                    <img src="{% webpack_static 'img/icon_pautas.png' %}" alt="Pautas das Sessões">
                </div>
                <h2>Pautas das Sessões</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_pautas.png' %}">
+                    <img src="{% webpack_static 'img/icon_pautas.png' %}">
                    <h2>Pautas das<br>Sessões</h2>
                </div>
                <p>
@ -103,13 +104,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_plenarias.png' %}" alt="Sessão Plenária">
+                    <img src="{% webpack_static 'img/icon_plenarias.png' %}" alt="Sessão Plenária">
                </div>
                <h2>Sessão Plenária</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_plenarias.png' %}">
+                    <img src="{% webpack_static 'img/icon_plenarias.png' %}">
                    <h2>Sessão Plenária</h2>
                </div>
                <p>
@ -128,13 +129,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_materia_legislativa.png' %}" alt="Matérias Legislativas">
+                    <img src="{% webpack_static 'img/icon_materia_legislativa.png' %}" alt="Matérias Legislativas">
                </div>
                <h2>Matérias Legislativas</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_materia_legislativa.png' %}">
+                    <img src="{% webpack_static 'img/icon_materia_legislativa.png' %}">
                    <h2>Matérias<br>Legislativas</h2>
                </div>
                <p>
@ -151,13 +152,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
+                    <img src="{% webpack_static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
                </div>
                <h2>Normas Jurídicas</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_normas_juridicas.png' %}">
+                    <img src="{% webpack_static 'img/icon_normas_juridicas.png' %}">
                    <h2>Normas Jurídicas</h2>
                </div>
                <p>
@ -172,13 +173,13 @@
        <div class="homeBlock">
            <div class="homeFront">
                <div class="homeIcon">
-                    <img src="{% static 'img/icon_relatorios.png' %}" alt="Relatórios">
+                    <img src="{% webpack_static 'img/icon_relatorios.png' %}" alt="Relatórios">
                </div>
                <h2>Relatórios</h2>
            </div>
            <div class="homeContent">
                <div class="homeTitle">
-                    <img src="{% static 'img/icon_relatorios.png' %}">
+                    <img src="{% webpack_static 'img/icon_relatorios.png' %}">
                    <h2>Relatórios</h2>
                </div>
                <p>
--- a/sapl/templates/menus/nav.html
+++ b/sapl/templates/menus/nav.html
@ -1,25 +1,25 @@
 {% load i18n %}
 {% if menu %}

-  <ul class="nav navbar-nav">
+  <ul class="navbar-nav">
    {% for item in menu %}
      {% if item.children %}
-        <li class="dropdown">
-          <a class="dropdown-toggle"href="#fakeLink"  data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle"href="#fakeLink"  data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
            {{ item.title }}
             <span class="caret"></span>
          </a>
          <ul class="dropdown-menu" role="menu">
            {% for subitem in item.children %}
                {% if subitem.url %}
-                  <li><a href="{{ subitem.url }}">{{ subitem.title }}</a></li>
+                  <li class="dropdown-item"><a href="{{ subitem.url }}">{{ subitem.title }}</a></li>
                {% endif %}
            {% endfor %}
          </ul>
        </li>
      {% else %}
        {% if item.url %}
-          <li><a href="{{ item.url }}">{% trans item.title %}</a></li>
+          <li class="nav-item"><a class="nav-link" href="{{ item.url }}">{% trans item.title %}</a></li>
        {% endif %}
      {% endif %}
    {% endfor %}
--- a/sapl/templates/menus/subnav.html
+++ b/sapl/templates/menus/subnav.html
@ -2,25 +2,25 @@
 {% load i18n %}

 {% if menu %}
-<ul class="nav nav-pills navbar-right">
+<ul class="navbar-nav">
  {% for item in menu %}
    {% if item.children %}
-      <li class="dropdown {{item.active}}">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#fakeLink">
+      <li class="nav-item dropdown {{item.active}}">
+        <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#fakeLink">
          {% trans item.title %}
          <span class="fa-chevron-down fa"></span>
        </a>
        <ul class="dropdown-menu" role="menu">
          {% for subitem in item.children %}
              {% if subitem.url %}
-                <li class="{{subitem.active}}"><a href="{{ subitem.url }}">{% trans subitem.title %}</a></li>
+                <li class="dropdown-item{{subitem.active}}"><a href="{{ subitem.url }}">{% trans subitem.title %}</a></li>
              {% endif %}
          {% endfor %}
        </ul>
      </li>
    {% else %}
      {% if item.url %}
-        <li class="{{item.active}}"><a href="{{ item.url }}">{% trans item.title %}</a></li>
+        <li class="nav-item {{item.active}}"><a class="nav-link" href="{{ item.url }}">{% trans item.title %}</a></li>
      {% endif %}
    {% endif %}
  {% endfor %}