Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install DAP by npm #14

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/templates/app/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
{% if isAnalyticsEnabled %}
<script type="text/javascript" src="{% static 'app/scripts/analytics.js' %}" async></script>
{% endif%}
<script async type="text/javascript" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=USDA&subagency=ARS-NAL" id="_fed_an_ua_tag"></script>
</head>

<body class="padtop {% block bodyclass %}{% endblock %}">
Expand Down
1 change: 1 addition & 0 deletions i5k/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@
'app/scripts/respond.src.js',
'app/scripts/underscore.js',
'app/scripts/error.js',
'app/scripts/Universal-Federated-Analytics-Min.js'
),
'output_filename': 'app/scripts/app-layout.min.js',
},
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"marked": "^0.3.19",
"underscore": "^1.7.0",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.1"
"webpack-cli": "^3.1.1",
"Universal-Federated-Analytics-Min.js": "digital-analytics-program/gov-wide-code#master",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not have a trailing comma here.

}
}
1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const appScriptConfig = {
{ from: path.join(nodeModules, '/bootstrap/dist/js/bootstrap.js'), to: appScripts},
{ from: path.join(nodeModules, '/underscore/underscore.js'), to: appScripts},
{ from: path.join(nodeModules, '/Respond.js/dest/respond.src.js'), to: appScripts},
{ from: path.join(nodeModules, '/gov-wide-code-master/Universal-Federated-Analytics-Min.js'), to: appScripts},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css.map'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.eot'), to: appFonts},
Expand Down