mirror/Anthias
1
0
Fork 0
mirror of https://github.com/Screenly/Anthias.git synced 2025-12-23 22:38:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(workflow): place Webpack-generated static files in ./static/dist (#2130)

Browse Source
This commit is contained in:
Nico Miguelino
2024-11-18 12:58:01 -08:00
committed by GitHub
parent 7d99b0bc71
commit 47947f4210
9 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -56,8 +56,3 @@ db.sqlite3
# Django
staticfiles/
# Static files
static/js/anthias.js*
static/js/settings.js*
static/css/anthias.css*

7
docker/Dockerfile.server.j2
View File

@@ -38,11 +38,8 @@ WORKDIR /usr/src/app
{% if environment == 'production' %}
COPY --from=node-builder \
/app/static/css/ \
/usr/src/app/static/css/
COPY --from=node-builder \
/app/static/js/*.js* \
/usr/src/app/static/js/
/app/static/dist/ \
/usr/src/app/static/dist/
{% endif %}
ENV GIT_HASH={{ git_hash }}

2
static/spec/runner.html
View File

@@ -23,7 +23,7 @@
<script src="/static/js/bootstrap-datepicker.js"></script>
<script src="/static/js/bootstrap-timepicker.js"></script>
<script src="/static/js/moment.js"></script>
<script src="../js/anthias.js"></script>
<script src="../dist/js/anthias.js"></script>
</head>

2
templates/head.html
View File

@@ -32,7 +32,7 @@
<meta content="/static/favicons/mstile-310x150.png" name="msapplication-wide310x150logo"/>
<meta content="/static/favicons/mstile-310x310.png" name="msapplication-square310x310logo"/>
<link href="{% static 'css/anthias.css' %}" type="text/css" rel="stylesheet"/>
<link href="{% static 'dist/css/anthias.css' %}" type="text/css" rel="stylesheet"/>
<link href="{% static 'fontawesome/css/all.css' %}" rel="stylesheet"/>

2
templates/hotspot.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8"/>
<title>Hotspot Page</title>
<link href="/static/css/anthias.css" rel="stylesheet"/>
<link href="/static/dist/css/anthias.css" rel="stylesheet"/>
<link href="https://fonts.googleapis.com/css?family=Plus Jakarta Sans" rel="stylesheet">
<link rel="icon" href="/static/favicons/favicon.ico">
<style type="text/css">

2
templates/index.html
View File

@@ -35,7 +35,7 @@
var wsAddresses = JSON.parse(document.getElementById('ws_addresses').textContent);
</script>
<script src="{% static 'js/anthias.js' %}"></script>
<script src="{% static 'dist/js/anthias.js' %}"></script>
<script src="{% static 'js/main.js' %}"></script>
<script id="asset-row-template" type="text/template">

2
templates/settings.html
View File

@@ -11,7 +11,7 @@
<script src="{% static 'js/jquery.fileupload.js' %}"></script> <!-- needs jqueryui.widget -->
<script src="{% static 'js/bootstrap-datepicker.js' %}"></script>
<script src="{% static 'js/settings.js' %}"></script>
<script src="{% static 'dist/js/settings.js' %}"></script>
{% endblock %}
{% block content %}

2
templates/splash-page.html
View File

@@ -6,7 +6,7 @@
{% load static %}
<meta charset="utf-8"/>
<title>Welcome to Anthias</title>
<link href="{% static 'css/anthias.css' %}" rel="stylesheet"/>
<link href="{% static 'dist/css/anthias.css' %}" rel="stylesheet"/>
<link href="https://fonts.googleapis.com/css?family=Plus Jakarta Sans" rel="stylesheet">
<link rel="icon" href="/static/favicons/favicon.ico">
<style type="text/css">

5
webpack.common.js
View File

@@ -7,8 +7,9 @@ module.exports = {
"settings": "./static/js/settings.coffee",
},
output: {
path: path.resolve(__dirname, "static"),
filename: "js/[name].js"
path: path.resolve(__dirname, "static/dist"),
filename: "js/[name].js",
clean: true,
},
plugins: [
new MiniCssExtractPlugin({