arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 06:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Dependency update

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-15 10:10:33 +00:00
parent 366a14408b
commit b8ea3d3d42
6 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
RIGS/static/js/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

0
RIGS/static/js/asteroids.min.js → RIGS/static/js/src/asteroids.min.js vendored
View File

0
RIGS/static/js/interaction.js → RIGS/static/js/src/interaction.js
View File

23
gulpfile.js
View File

@@ -17,7 +17,11 @@ var { exec } = require("child_process");
sass.compiler = require('node-sass'); sass.compiler = require('node-sass');
function sass() { function sass() {
return gulp.src(["RIGS/scss/**/*.scss", "node_modules/fullcalendar/dist/fullcalendar.css", 'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.min.css', 'node_modules/autocompleter/autocompleter.min.css', 'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css']) return gulp.src(["RIGS/scss/**/*.scss",
"node_modules/fullcalendar/dist/fullcalendar.css",
'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.min.css',
'node_modules/autocompleter/autocompleter.min.css',
'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'])
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe(flatten()) .pipe(flatten())
.pipe(sass().on('error', sass.logError)) .pipe(sass().on('error', sass.logError))
@@ -29,8 +33,21 @@ function sass() {
} }
function scripts() { function scripts() {
return gulp.src([//'RIGS/static/js/**/.js', return gulp.src(['RIGS/static/js/src/**/.js',
'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/popper.js/**/popper.js', 'node_modules/moment/min/moment.min.js', 'node_modules/@fortawesome/fontawesome-free/js/all.js', 'node_modules/jquery/dist/jquery.js', 'node_modules/fullcalendar/dist/fullcalendar.js', 'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.min.js', 'node_modules/konami.js', 'node_modules/autocompleter/autocompleter.min.js', 'node_modules/@activix/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js']) 'node_modules/jquery/dist/jquery.js',
'node_modules/ravenjs/ravenjs.js', //TODO Upgrade to Sentry
/* Bootstrap Plugins */
'node_modules/bootstrap/js/dist/dropdown.js',
'node_modules/bootstrap/js/dist/collapse.js',
'node_modules/bootstrap/js/dist/modal.js',
'node_modules/@fortawesome/fontawesome-free/js/all.js',
'node_modules/popper.js/**/popper.js',
'node_modules/moment/min/moment.min.js',
'node_modules/fullcalendar/dist/fullcalendar.js',
'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.min.js',
'node_modules/konami/konami.js',
'node_modules/autocompleter/autocompleter.min.js',
'node_modules/@activix/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'])
.pipe(flatten()) .pipe(flatten())
.pipe(terser()) .pipe(terser())
.pipe(gulp.dest('RIGS/static/js')) .pipe(gulp.dest('RIGS/static/js'))

1
package.json
View File

@@ -17,6 +17,7 @@
"konami": "^1.6.2", "konami": "^1.6.2",
"moment": "^2.24.0", "moment": "^2.24.0",
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"ravenjs": "^1.1.1",
"transform": "^1.1.2" "transform": "^1.1.2"
}, },
"devDependencies": { "devDependencies": {

20
templates/base.html
View File

@@ -21,7 +21,8 @@
{% block css %} {% block css %}
{% endblock %} {% endblock %}
<script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script> <script src="{% static 'js/jquery.js' %}"></script>
<script src="{% static 'js/ravenjs.js' %}"></script>
<script>Raven.config('{% sentry_public_dsn %}').install()</script> <script>Raven.config('{% sentry_public_dsn %}').install()</script>
{% block preload_js %} {% block preload_js %}
{% endblock %} {% endblock %}
@@ -84,13 +85,6 @@
<div class="modal fade" id="modal" role="dialog" tabindex=-1></div> <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
<script src="{% static 'js/jquery.js' %}"></script>
<script src="{% static 'js/interaction.js' %}"></script>
<script src="{% static 'js/konami.js' %}"></script>
<script src="{% static 'js/moment.js' %}"></script>
<script src="{% static 'js/popper.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/all.js' %}"></script>
<script> <script>
Date.prototype.getISOString = function () { Date.prototype.getISOString = function () {
var yyyy = this.getFullYear().toString(); var yyyy = this.getFullYear().toString();
@@ -99,6 +93,16 @@
return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding
}; };
</script> </script>
<!---script src="{% static "js/jquery.cookie.js" %}"></script--->
<script src="{% static 'js/alert.js' %}"></script>
<script src="{% static 'js/collapse.js' %}"></script>
<script>
$('.navbar-collapse').addClass('collapse')
</script>
<script src="{% static 'js/dropdown.js' %}"></script>
<script src="{% static 'js/modal.js' %}"></script>
<script src="{% static 'js/konami.js' %}"></script>
<script src="{% static 'js/all.js' %}"></script> <!---FontAwesome--->
<script> <script>
jQuery(document).ready(function () { jQuery(document).ready(function () {
jQuery(document).on('click', '.modal-href', function (e) { jQuery(document).on('click', '.modal-href', function (e) {