about summary refs log tree commit diff
path: root/laravel
diff options
context:
space:
mode:
Diffstat (limited to 'laravel')
-rw-r--r--laravel/package-lock.json4
-rw-r--r--laravel/package.json3
l---------laravel/public/js/ccharter1
-rw-r--r--laravel/resources/js/jsonly.js (renamed from laravel/public/js/jsonly.js)0
-rw-r--r--laravel/resources/js/page.js (renamed from laravel/public/js/page.js)0
-rw-r--r--laravel/resources/views/song.blade.php2
-rw-r--r--laravel/webpack.mix.js3
7 files changed, 11 insertions, 2 deletions
diff --git a/laravel/package-lock.json b/laravel/package-lock.json
index 55fbe12..b4109b2 100644
--- a/laravel/package-lock.json
+++ b/laravel/package-lock.json
@@ -1892,6 +1892,10 @@
             "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
             "dev": true
         },
+        "ccharter": {
+            "version": "git+ssh://git@github.com/earboxer/ccharter.git#809c781bd557f24cc184b66b33651ee16d488dac",
+            "from": "git+ssh://git@github.com/earboxer/ccharter.git"
+        },
         "chalk": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
diff --git a/laravel/package.json b/laravel/package.json
index d355e2b..91430ae 100644
--- a/laravel/package.json
+++ b/laravel/package.json
@@ -22,5 +22,8 @@
         "sass-loader": "^7.1.0",
         "vue": "^2.6.10",
         "vue-template-compiler": "^2.6.10"
+    },
+    "dependencies": {
+        "ccharter": "git+ssh://git@github.com/earboxer/ccharter.git"
     }
 }
diff --git a/laravel/public/js/ccharter b/laravel/public/js/ccharter
deleted file mode 120000
index 895021d..0000000
--- a/laravel/public/js/ccharter
+++ /dev/null
@@ -1 +0,0 @@
-../../../ccharter/scripts/
\ No newline at end of file
diff --git a/laravel/public/js/jsonly.js b/laravel/resources/js/jsonly.js
index 4f5d6c8..4f5d6c8 100644
--- a/laravel/public/js/jsonly.js
+++ b/laravel/resources/js/jsonly.js
diff --git a/laravel/public/js/page.js b/laravel/resources/js/page.js
index b7a89f7..b7a89f7 100644
--- a/laravel/public/js/page.js
+++ b/laravel/resources/js/page.js
diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php
index d1d70fb..c486ffc 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -81,7 +81,7 @@
 <script src='/js/page.js'></script>
 <!--<script src='/js/app.js'></script>-->
 <script src='/js/jsonly.js'></script>
-<script src='/js/ccharter/ccharter.js'></script>
+<script src='/js/ccharter.js'></script>
 <!--<script src="https://api.reftagger.com/v2/RefTagger.js"></script>
 <script>
     var refTagger = {
diff --git a/laravel/webpack.mix.js b/laravel/webpack.mix.js
index faa1736..440c4a7 100644
--- a/laravel/webpack.mix.js
+++ b/laravel/webpack.mix.js
@@ -13,5 +13,8 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
    .sass('resources/sass/app.scss', 'public/css')
+   .copy('node_modules/ccharter/scripts/ccharter.js', 'public/js/ccharter.js')
+   .copy('resources/js/jsonly.js', 'public/js/jsonly.js')
+   .copy('resources/js/page.js', 'public/js/page.js')
    .copy('resources/js/toc-filter.js', 'public/js/toc-filter.js')
    .copy('resources/css/song.css', 'public/css/song.css');