From 76aef784a411e2517a79be137153815e3c731d24 Mon Sep 17 00:00:00 2001
From: Jake Rosenberg <jrosenberg@wireless-10-147-79-51.public.utexas.edu>
Date: Mon, 24 Jul 2023 18:05:10 -0500
Subject: [PATCH] Fix vendoring for staticfiles

---
 .../templates/designsafe/apps/applications/index.j2             | 1 -
 .../apps/workspace/templates/designsafe/apps/workspace/index.j2 | 1 -
 designsafe/settings/common_settings.py                          | 1 -
 designsafe/static/scripts/applications/app.js                   | 1 +
 designsafe/static/scripts/workspace/app.js                      | 1 +
 designsafe/static/styles/ng-designsafe-ef.css                   | 2 +-
 6 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2 b/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2
index 2fd2877de..35a9cb048 100644
--- a/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2
+++ b/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2
@@ -25,7 +25,6 @@
 <script type="text/javascript" src="{% static 'vendor/objectpath/lib/ObjectPath.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/schema-form.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/bootstrap-decorator.js' %}"></script>
-<script type="text/javascript" src="{% static 'vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-xeditable/dist/js/xeditable.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/codemirror/lib/codemirror.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-ui-codemirror/src/ui-codemirror.js' %}"></script>
diff --git a/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2 b/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2
index 4215ed1e7..f8a4e8a45 100644
--- a/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2
+++ b/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2
@@ -40,7 +40,6 @@
 <script type="text/javascript" src="{% static 'vendor/objectpath/lib/ObjectPath.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/schema-form.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/bootstrap-decorator.js' %}"></script>
-<script type="text/javascript" src="{% static 'vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-xeditable/dist/js/xeditable.js' %}"></script>
 <script src="{% static 'vendor/angular-ui-codemirror/src/ui-codemirror.js' %}"></script>
 {% endaddtoblock %}
diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py
index eeef4f457..51a4e0f00 100644
--- a/designsafe/settings/common_settings.py
+++ b/designsafe/settings/common_settings.py
@@ -248,7 +248,6 @@
     ('vendor/font-awesome', os.path.join(BASE_DIR, 'node_modules', 'font-awesome')),
     ('vendor/angular-toastr', os.path.join(BASE_DIR, 'node_modules', 'angular-toastr')),
     ('vendor/slick-carousel', os.path.join(BASE_DIR, 'node_modules', 'slick-carousel')),
-    ('vendor/angular-drag-and-drop-lists', os.path.join(BASE_DIR, 'node_modules', 'angular-drag-and-drop-lists')),
     ('vendor/angular-xeditable', os.path.join(BASE_DIR, 'node_modules', 'angular-xeditable')),
     ('vendor/leaflet-measure', os.path.join(BASE_DIR, 'node_modules', 'leaflet-measure')),
     ('vendor/exif-js', os.path.join(BASE_DIR, 'node_modules', 'exif-js')),
diff --git a/designsafe/static/scripts/applications/app.js b/designsafe/static/scripts/applications/app.js
index 276825b40..296107524 100644
--- a/designsafe/static/scripts/applications/app.js
+++ b/designsafe/static/scripts/applications/app.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import angular from 'angular';
 import _ from 'underscore';
+import dndlists from 'angular-drag-and-drop-lists';
 
 import './services/apps-wizard-service';
 
diff --git a/designsafe/static/scripts/workspace/app.js b/designsafe/static/scripts/workspace/app.js
index d64a2bd80..d7366e80b 100644
--- a/designsafe/static/scripts/workspace/app.js
+++ b/designsafe/static/scripts/workspace/app.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import angular from 'angular';
 import _ from 'underscore';
+import dndlists from 'angular-drag-and-drop-lists';
 
 
 import { agaveFilePicker } from '../workspace/directives/agave-file-picker';
diff --git a/designsafe/static/styles/ng-designsafe-ef.css b/designsafe/static/styles/ng-designsafe-ef.css
index 0784c0818..76805e73d 100644
--- a/designsafe/static/styles/ng-designsafe-ef.css
+++ b/designsafe/static/styles/ng-designsafe-ef.css
@@ -755,7 +755,7 @@ a[ng-click]:hover {
 
 @font-face {
 font-family: 'DesignSafe-Apps';
-    src: url('/static/fonts/DesignSafe-App-Icons.ttf') format('truetype');
+    src: url('/static/fonts/Tools-and-Applications-Icons.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }