Skip to content

Commit a7732f5

Browse files
committed
fixed native chapterjson location prop handling in upstream lib, updated lib, updated misc deps. improved ui for location input. location issue raised by #23
1 parent 5442f91 commit a7732f5

9 files changed

Lines changed: 1033 additions & 3518 deletions

File tree

package-lock.json

Lines changed: 961 additions & 3496 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chaptertool",
3-
"version": "0.7.1",
3+
"version": "0.7.2",
44
"description": "Manage and generate chapters for podcasts and other media via cli or web",
55
"keywords": [
66
"podcast",
@@ -23,14 +23,14 @@
2323
"main": "chaptertool.js",
2424
"bin": "chaptertool.js",
2525
"homepage": "https://github.com/Mtillmann/chaptertool",
26-
"scripts": {
27-
"sass-dev": "node-sass --recursive --watch src/scss --output static",
28-
"build": "rollup -c && terser static/app.js --compress ecma=2021 --output static/app.js && node-sass --recursive --output-style compressed src/scss --output static && node scripts/writeversion.js",
29-
"createIndexHTML": "node scripts/empuggen.js",
30-
"dev": "rollup -c -w",
31-
"lint": "eslint",
32-
"watch": "concurrently \"node-sass --recursive --watch src/scss --output static\" \"npm run dev\" \"nodemon --watch src/Server.js --exec node chaptertool.js serve\""
33-
},
26+
"scripts": {
27+
"sass-dev": "sass --watch src/scss:static",
28+
"build": "rollup -c && terser static/app.js --compress ecma=2021 -o static/app.js && sass --style=compressed src/scss:static && node scripts/writeversion.js",
29+
"createIndexHTML": "node scripts/empuggen.js",
30+
"dev": "rollup -c -w",
31+
"lint": "eslint",
32+
"watch": "concurrently \"npm run sass-dev\" \"npm run dev\" \"nodemon --watch src/Server.js --exec node chaptertool.js serve\""
33+
},
3434
"author": "Martin Tillmann<mtillmann@gmail.com>",
3535
"bugs": {
3636
"url": "https://github.com/Mtillmann/chaptertool/issues"
@@ -42,7 +42,7 @@
4242
],
4343
"license": "MIT",
4444
"dependencies": {
45-
"@mtillmann/chapters": "^0.1.8",
45+
"@mtillmann/chapters": "^0.2.2",
4646
"@zip.js/zip.js": "^2.7.32",
4747
"bootstrap": "^5.3.2",
4848
"bootstrap-icons": "^1.11.3",
@@ -63,10 +63,10 @@
6363
"alpinejs": "^3.13.4",
6464
"concurrently": "^8.2.2",
6565
"neostandard": "^0.12.1",
66-
"node-sass": "^9.0.0",
6766
"nodemon": "^3.0.3",
6867
"rollup": "^4.9.6",
6968
"rollup-plugin-copy": "^3.5.0",
69+
"sass": "^1.97.3",
7070
"terser": "^5.27.0"
7171
}
7272
}

src/scss/app.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ $bootstrap-icons-font: bootstrap-icons;
44
@import "../../node_modules/bootstrap/scss/bootstrap";
55
@import "../../node_modules/bootstrap-icons/font/bootstrap-icons.scss";
66

7+
.a{
8+
color:green;
9+
}
710

811
.shepherd-element {
912

src/views/partials/chapterEditPanel.pug

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ template(x-if="currentChapterIndex !== null")
9595
div.row.p-1.mb-1
9696
label.col-3.col-form-label(for="chapterGeoName") Name
9797
div.col-9
98-
input.form-control#chapterGeoName(x-model="data.chapters[currentChapterIndex].geo_name")
98+
input.form-control#chapterGeoName(x-model="data.chapters[currentChapterIndex].location.name")
9999
div.row.p-1.mb-1
100100
label.col-3.col-form-label(for="chapterGeoLL") Geo
101101
div.col-9
102-
input.form-control#chapterGeoLL(x-model="data.chapters[currentChapterIndex].geo_ll", placeholder="geo:lat,lon")
102+
input.form-control#chapterGeoLL(x-model="data.chapters[currentChapterIndex].location.geo", placeholder="geo:lat,lon")
103103
div.row.p-1.mb-1
104104
label.col-3.col-form-label(for="chapterGeoOSM") OSM
105105
div.col-9
106-
input.form-control#chapterGeoOSM(x-model="data.chapters[currentChapterIndex].geo_osm", placeholder="osm query string")
106+
input.form-control#chapterGeoOSM(x-model="data.chapters[currentChapterIndex].location.osm", placeholder="osm query string")

static/app.css

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/app.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/index.html

Lines changed: 46 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/version

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)