Skip to content

Commit

Permalink
Merge bc311b6 into 6d28be8
Browse files Browse the repository at this point in the history
  • Loading branch information
rodfersou committed Sep 26, 2018
2 parents 6d28be8 + bc311b6 commit cf345f1
Show file tree
Hide file tree
Showing 19 changed files with 335 additions and 273 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ parts/
src/collective.cover/
var/
dist/
src/brasil/gov/portal/browser/viewlets/static/
13 changes: 13 additions & 0 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ parts +=
precompile
pylint
rebuild_i18n-sh
staticresources

# XXX: avoid downloading wrong versions of IDG packages
# we are still working on pre-releases
Expand All @@ -30,6 +31,7 @@ environment-vars =
recipe = plone.recipe.codeanalysis[recommended]
directory = ${buildout:directory}/src/brasil/gov/portal
clean-lines = True
clean-lines-exclude = ${:directory}/browser/viewlets/static
csslint = True
csslint-bin = bin/csslint
flake8-ignore = E501,P001,S001,T000,P002
Expand Down Expand Up @@ -59,6 +61,17 @@ compile-mo-files = true
recipe = zc.recipe.egg
eggs = pylint < 2.0

[node]
recipe = gp.recipe.node
version = 8.11.2
npms = npm yarn
scripts = npm yarn

[staticresources]
recipe = sc.recipe.staticresources
name = brasil.gov.portal
short_name = brasilgovportal

[versions]
# Como no extends de versões do release do IDG, logo acima, eu pino
# esse pacote, preciso "despiná-lo" aqui para que ele não seja
Expand Down
4 changes: 4 additions & 0 deletions src/brasil/gov/portal/browser/viewlets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ def render(self):
if self.available:
return self.index()
return u''


class ResourcesViewlet(ViewletBase):
"""This viewlet inserts static resources on page header."""
14 changes: 14 additions & 0 deletions src/brasil/gov/portal/browser/viewlets/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,18 @@
layer="brasil.gov.portal.interfaces.IBrasilGov"
/>

<!-- Registra pasta de elementos estaticos -->
<browser:resourceDirectory
name="brasil.gov.portal"
directory="static"
/>

<browser:viewlet
name="brasil.gov.portal.resources"
manager="plone.app.layout.viewlets.interfaces.IHtmlHead"
class=".ResourcesViewlet"
template="static/resources.pt"
permission="zope2.Public"
/>

</configure>
3 changes: 3 additions & 0 deletions src/brasil/gov/portal/browser/viewlets/static/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.. note::
Content on this folder is generated automatically by `webpack <https://webpack.js.org/>`_.
Check package documentation for more information.
6 changes: 0 additions & 6 deletions src/brasil/gov/portal/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,4 @@
<include package=".controlpanel" />
<include package=".migration" zcml:condition="installed transmogrify.dexterity" />

<!-- Registra pasta de elementos estaticos -->
<browser:resourceDirectory
name="brasil.gov.portal"
directory="static"
/>

</configure>
267 changes: 0 additions & 267 deletions src/brasil/gov/portal/static/js/main.js

This file was deleted.

5 changes: 5 additions & 0 deletions webpack/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules/
yarn.lock
npm-debug.log
app/img/sprite.png
app/scss/_sprite.scss
18 changes: 18 additions & 0 deletions webpack/app/brasilgovportal.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import BugFix from './js/bugfix.js';
import SearchSuggestions from './js/search_suggestions.js';


// https://hacks.mozilla.org/2015/04/es6-in-depth-iterators-and-the-for-of-loop/
jQuery.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];


$(() => {
new BugFix();
new SearchSuggestions();
});


export default {
BugFix,
SearchSuggestions,
}
1 change: 1 addition & 0 deletions webpack/app/brasilgovportal.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'scss/sprite';

0 comments on commit cf345f1

Please sign in to comment.