From c0ff5a418f4f91f89cbc276d020e9724c47ca4d6 Mon Sep 17 00:00:00 2001 From: sallybaker Date: Wed, 10 Feb 2021 23:40:07 +1000 Subject: [PATCH 1/3] ignore local dev environment settings --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6e7858a..8f4ff36 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ website/data/boundaries.geojson website/secrets.js node_modules/* -package-lock.json \ No newline at end of file +package-lock.json +Dockerfile +docker-commands.txt -- 2.39.5 From 0af9558adf559c2312f13de3d7e9c56aa7bb71dc Mon Sep 17 00:00:00 2001 From: sallybaker Date: Wed, 10 Feb 2021 23:40:56 +1000 Subject: [PATCH 2/3] add website to library services pop-up --- website/load-map.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/load-map.js b/website/load-map.js index 2868002..464813f 100644 --- a/website/load-map.js +++ b/website/load-map.js @@ -458,6 +458,8 @@ Promise.all([boundaries, branchesCsv, ikcCsv, mechanics, nslaBranches]) (!props.standard_loan_weeks || props.standard_loan_weeks == "?" ? `Unknown` : `${props.standard_loan_weeks} weeks`) + `
Software : ` + (!props.ILS || props.ILS == "?" ? `Unknown` : `${props.ILS}`) + + `
Website: ` + + (!props.website || props.website == "?" ? `Unknown` : `` + `${props.website}` + ``) + `

` ).openPopup() } -- 2.39.5 From 13a6e801f9b6e6a09fe70d6ab340af8896630006 Mon Sep 17 00:00:00 2001 From: Library Map Bot Date: Wed, 10 Feb 2021 13:47:37 +0000 Subject: [PATCH 3/3] merge csv data to topo --- contributors.txt | 2 ++ website/sources/index.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contributors.txt b/contributors.txt index 7ef67ae..4870c80 100644 --- a/contributors.txt +++ b/contributors.txt @@ -8,3 +8,5 @@ Stephanie Schwarze Sally Molly Michaela Olde +hughrun +sallybaker diff --git a/website/sources/index.html b/website/sources/index.html index 3673059..406e153 100644 --- a/website/sources/index.html +++ b/website/sources/index.html @@ -43,6 +43,8 @@
  • Sally
  • Molly
  • Michaela Olde
  • +
  • hughrun
  • +
  • sallybaker
  • Visualisation

    -- 2.39.5