More misguided attempts to get the UI working. Since there were no ru…

…nbooks, I have no idea what works and what doesn't. Time to dig in and modernize everything
rgeyer · Sep 5, 2019 · 388dd16 · 388dd16
1 parent c097cee
commit 388dd16
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -12,7 +12,7 @@ gulp.task('mycyclediary', function () {
 
 gulp.task('yarn', function () {
   return gulp.src(['./package.json', './yarn.lock'])
-    .pipe(gulp.dest('./mycyclediary_dot_com/dist'))
+    .pipe(gulp.dest('./mycyclediary_dot_com/static/dist'))
     .pipe(yarn({ production: true }));
 });
 

diff --git a/mycyclediary_dot_com/apps/angular/javascripts.html b/mycyclediary_dot_com/apps/angular/javascripts.html
@@ -1,11 +1,11 @@
 {% load staticfiles %}
 
-<script type="text/javascript" src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
-<script type="text/javascript" src="{% static 'bower_components/bootstrap/dist/js/bootstrap.js' %}"></script>
+<script type="text/javascript" src="{% static 'dist/node_modules/jquery/dist/jquery.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'dist/node_modules/bootstrap/dist/js/bootstrap.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'dist/node_modules/bootstrap-material-design/dist/js/bootstrap-material-design.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'bower_components/underscore/underscore.js' %}"></script>
 
-<script type="text/javascript" src="{% static 'bower_components/angular/angular.js' %}"></script>
+<script type="text/javascript" src="{% static 'dist/node_modules/angular/angular.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'bower_components/angular-route/angular-route.js' %}"></script>
 <script type="text/javascript" src="{% static 'bower_components/angular-cookies/angular-cookies.js' %}"></script>
 <script type="text/javascript" src="{% static 'bower_components/angular-resource/angular-resource.js' %}"></script>

diff --git a/mycyclediary_dot_com/apps/angular/stylesheets.html b/mycyclediary_dot_com/apps/angular/stylesheets.html
@@ -1,17 +1,17 @@
 {% load staticfiles %}
 
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap-material-design/dist/css/material.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap-material-design/dist/css/ripples.min.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/ngDialog/css/ngDialog.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/ngDialog/css/ngDialog-theme-default.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/bootstrap/dist/css/bootstrap.min.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/bootstrap-material-design/dist/css/bootstrap-material-design.min.css' %}" />
+<!-- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap-material-design/dist/css/ripples.min.css' %}" /> -->
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/ng-dialog/css/ngDialog.min.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/ng-dialog/css/ngDialog-theme-default.min.css' %}" />
 
 <link rel="stylesheet" type="text/css" href="{% static 'lib/snackbarjs/snackbar.min.css' %}" />
 
 <link rel="stylesheet" type="text/css" href="{% static 'stylesheets/styles.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/angular-datatables/dist/css/angular-datatables.min.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/datatables/media/css/jquery.dataTables.min.css' %}" />
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/angular-material/angular-material.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/angular-datatables/dist/css/angular-datatables.min.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/datatables.net-dt/css/jquery.dataTables.min.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'dist/node_modules/angular-material/angular-material.min.css' %}" />
 
 
 <style>

diff --git a/package.json b/package.json
@@ -16,10 +16,13 @@
   "dependencies": {
     "angular": "^1.7.8",
     "angular-datatables": "^v0.6.0",
+    "angular-material": "^1.1.20",
+    "bootstrap": "^4.3.1",
     "bootstrap-material-design": "^4.1.2",
     "gulp": "^4.0.0",
     "gulp-ng-annotate": "^0.3.3",
-    "gulp-uglify": "^1.0.1"
+    "gulp-uglify": "^1.0.1",
+    "ng-dialog": "^1.4.0"
   },
   "devDependencies": {
     "gulp-yarn": "^2.0.0"

diff --git a/yarn.lock b/yarn.lock
@@ -43,6 +43,11 @@ angular-datatables@^v0.6.0:
     datatables.net-dt "^1.10.11"
     jquery ">=1.11.0"
 
+angular-material@^1.1.20:
+  version "1.1.20"
+  resolved "https://registry.yarnpkg.com/angular-material/-/angular-material-1.1.20.tgz#138def4a4f3982fddfa7788c9775e663f12cba85"
+  integrity sha512-R2jILX9g7AVvEZbIMqEp8mkjlH/iSrDG150pCSzL7+6PHdi4dYuyXNRtYlpYKe+72Q4fIV4YBYSxepNob3hU9A==
+
 angular@>=1.7.0, angular@^1.7.8:
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.8.tgz#b77ede272ce1b261e3be30c1451a0b346905a3c9"
@@ -300,6 +305,11 @@ bootstrap-material-design@^4.1.2:
   resolved "https://registry.yarnpkg.com/bootstrap-material-design/-/bootstrap-material-design-4.1.2.tgz#d6f282f1248c6ce2959c69ca86afe113ee128e88"
   integrity sha512-hKeUkOM6g2DqpktvEMHrIDpQ5qupV4DSeKlJSJ60tLFQ+8tPlszVCa3JVLTV+ZFbJRMb0UA6UWTsnjW57kYNeg==
 
+bootstrap@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2044,6 +2054,11 @@ ng-annotate@~0.13.0:
     stringset "~0.2.1"
     tryor "~0.1.2"
 
+ng-dialog@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ng-dialog/-/ng-dialog-1.4.0.tgz#3f81330e7caac614e99fbceb76f304bf820c413e"
+  integrity sha1-P4EzDnyqxhTpn7zrdvMEv4IMQT4=
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"