------------------------------------------------------------
commit c3b7d8592ebfcf033a5b68c64b1edc88b2fcc085
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Oct 19 13:56:16 2024 -1000
diff --git a/404.scroll b/404.scroll
index 710b3f9b8..f6927b445 100644
--- a/404.scroll
+++ b/404.scroll
@@ -14,5 +14,5 @@ If you think there's a bug on our site, please email help@cancerdb.com or open a
https://github.com/breck7/CancerDB/issues open an issue
center
-viewSourceButton
+editButton
scrollVersionLink
diff --git a/blog/header.scroll b/blog/header.scroll
index 47f4a1e46..e941c2440 100644
--- a/blog/header.scroll
+++ b/blog/header.scroll
@@ -2,7 +2,7 @@ importOnly
baseUrl https://cancerdb.com/blog/
replace BASE_URL ..
rssFeedUrl feed.xml
-viewSourceBaseUrl https://github.com/breck7/CancerDB/blob/main/blog/
+editBaseUrl https://github.com/breck7/CancerDB/blob/main/blog/
../header.scroll
keyboardNav
diff --git a/code/conceptPage.scroll b/code/conceptPage.scroll
index 71fefa006..b62fc7718 100644
--- a/code/conceptPage.scroll
+++ b/code/conceptPage.scroll
@@ -9,7 +9,7 @@ replaceJs TEMPLATE
}
tags All
testStrict
-viewSourceBaseUrl https://github.com/breck7/CancerDB/blob/main/concepts/
+editBaseUrl https://github.com/breck7/CancerDB/blob/main/concepts/
measures.parsers
diff --git a/footer.scroll b/footer.scroll
index 163d8c381..d712d260a 100644
--- a/footer.scroll
+++ b/footer.scroll
@@ -2,7 +2,7 @@ importOnly
buildHtml
replaceJs DAYS_SINCE_INITIAL_COMMIT Math.floor(dayjs().diff(dayjs("2022-9-05"), "day", true))
-viewSourceLink
+editLink
stumpNoSnippet
div
class trueBaseThemeFooter
diff --git a/header.scroll b/header.scroll
index 24bddfffd..7001a71f7 100644
--- a/header.scroll
+++ b/header.scroll
@@ -31,4 +31,4 @@ stumpNoSnippet
a Download
href BASE_URL/download.html
-viewSourceButton
+editButton
diff --git a/package.json b/package.json
index 00e5e3c9c..a5d6f834c 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"author": "Breck Yunits et al.",
"homepage": "https://cancerdb.com",
"devDependencies": {
- "scroll-cli": "^142.0.1",
+ "scroll-cli": "^143.0.0",
"scrollsdk": "^87.0.0"
}
}
diff --git a/pages/header.scroll b/pages/header.scroll
index ec5834129..51557d091 100644
--- a/pages/header.scroll
+++ b/pages/header.scroll
@@ -2,7 +2,7 @@ importOnly
baseUrl https://cancerdb.com/pages/
buildTxt
replace BASE_URL ..
-viewSourceBaseUrl https://github.com/breck7/CancerDB/blob/main/pages/
+editBaseUrl https://github.com/breck7/CancerDB/blob/main/pages/
keyboardNav
../header.scroll
diff --git a/rootHeader.scroll b/rootHeader.scroll
index 5c8d5c9a7..bb4dfe3a1 100644
--- a/rootHeader.scroll
+++ b/rootHeader.scroll
@@ -1,6 +1,6 @@
importOnly
replace BASE_URL .
-viewSourceBaseUrl https://github.com/breck7/CancerDB/blob/main/
+editBaseUrl https://github.com/breck7/CancerDB/blob/main/
// Set the base url. Without this trick, browsing the site locally would require serving it via localhost to get relative url paths to work since we reuse the header and footer in nested folders. (There could be a better way to do this.)
------------------------------------------------------------
commit 571c69790fbdaa1fddf0361c2771c2619473c837
Author: ffff:107.192.105.77 <ffff:107.192.105.77@cancerdb.com>
Date: Tue Oct 15 16:40:08 2024 +0000
Updated index.scroll
diff --git a/index.scroll b/index.scroll
index 13e5a0685..ac5fd5e1b 100644
--- a/index.scroll
+++ b/index.scroll
@@ -1,17 +1,17 @@
-title CancerDB
-
-rootHeader.scroll
-
-# CancerDB: Datasets about Cancer
-
-center
-Newest posts
- blog/index.html
- class headerLink
-Cancer in the United States: Heatmap visualizations
- blog/cancer-heatmaps.html
-blog/cancerHeatmap.jpg
- width 300px
- blog/cancer-heatmaps.html
-
-footer.scroll
+title CancerDB
+
+rootHeader.scroll
+
+# CancerDB: Datasets about Cancer
+
+center
+Newest posts
+ blog/index.html
+ class headerLink
+Cancer in the United States: Heatmap visualizations
+ blog/cancer-heatmaps.html
+blog/cancerHeatmap.jpg
+ width 300px
+ blog/cancer-heatmaps.html
+
+footer.scroll
------------------------------------------------------------
commit 5406c7363f96e83816bb02353f441e3fda3ca50a
Author: Breck Yunits <breck7@gmail.com>
Date: Mon Oct 14 21:24:52 2024 -0700
diff --git a/.github/workflows/wws.yaml b/.github/workflows/wws.yaml
deleted file mode 100644
index 469dd9afd..000000000
--- a/.github/workflows/wws.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Adapted from https://github.com/JamesIves/github-pages-deploy-action
-name: Build and Deploy Scroll
-on:
- push:
- branches:
- - main
-jobs:
- build-and-deploy:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout 🛎️
- uses: actions/checkout@v2.3.1
- - name: Install and Build
- run: |
- npm install .
- npm run build
- # The line below is needed if you have *.html in your gitignore file
- rm .gitignore
- - name: Deploy 🚀
- uses: JamesIves/github-pages-deploy-action@4.1.4
- with:
- branch: wws # The branch the action should deploy to.
- folder: .
diff --git a/cli.js b/cli.js
deleted file mode 100755
index 1727e75cf..000000000
--- a/cli.js
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env node
-
-const path = require("path")
-const { Utils } = require("scrollsdk/products/Utils.js")
-const { ScrollSetCLI } = require("scroll-cli/ScrollSetCLI.js")
-
-class CancerDBCli extends ScrollSetCLI {
- baseFolder = __dirname
- conceptsFolder = path.join(__dirname, "concepts")
- parsersFile = path.join(__dirname, "code", "measures.parsers")
- scrollSetName = "cancerdb"
- compiledConcepts = "./cancerdb.json"
-}
-
-module.exports = { CancerDBCli }
-
-if (!module.parent)
- Utils.runCommand(new CancerDBCli(), process.argv[2], process.argv[3])
diff --git a/package.json b/package.json
index 73be53bdc..00e5e3c9c 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
"author": "Breck Yunits et al.",
"homepage": "https://cancerdb.com",
"devDependencies": {
- "lodash": "^4.17.21",
"scroll-cli": "^142.0.1",
"scrollsdk": "^87.0.0"
}
------------------------------------------------------------
commit 2723f96a9ebcd4a5b99b0ed588e41aed769a8177
Author: Breck Yunits <breck7@gmail.com>
Date: Mon Oct 14 21:22:14 2024 -0700
diff --git a/code/measures.parsers b/code/measures.parsers
index 0a075bc6f..3aec41296 100644
--- a/code/measures.parsers
+++ b/code/measures.parsers
@@ -26,7 +26,7 @@ abstractYearMeasureParser
abstractAnnualPopulationCountParser
atoms yearAtom countAtom
- uniqueFirstAtom
+ uniqueCue
abstractAnnualPopulationCountMapParser
catchAllParser abstractAnnualPopulationCountParser
description A map of counts, one per year.
@@ -435,7 +435,7 @@ referenceParser
abstractRelationshipParser
extends abstractConceptIdsMeasureParser
relatedParser
- crux related
+ cue related
extends abstractRelationshipParser
description What concepts are related?
parentOrganizationParser
diff --git a/package.json b/package.json
index faee82def..73be53bdc 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"homepage": "https://cancerdb.com",
"devDependencies": {
"lodash": "^4.17.21",
- "scroll-cli": "^136.4.0",
+ "scroll-cli": "^142.0.1",
"scrollsdk": "^87.0.0"
}
}
------------------------------------------------------------
commit 9a9b3511e334be797c5bf1ad9c878b5b46064dfc
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 08:55:42 2024 -1000
diff --git a/package.json b/package.json
index fdcefc4f0..faee82def 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"homepage": "https://cancerdb.com",
"devDependencies": {
"lodash": "^4.17.21",
- "scroll-cli": "^136.3.0",
+ "scroll-cli": "^136.4.0",
"scrollsdk": "^87.0.0"
}
}
------------------------------------------------------------
commit 72e80bceed2e313242d3acd4c05b52bb2e38849d
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 08:55:32 2024 -1000
diff --git a/index.scroll b/index.scroll
index 2f707cbb2..13e5a0685 100644
--- a/index.scroll
+++ b/index.scroll
@@ -4,19 +4,14 @@ rootHeader.scroll
# CancerDB: Datasets about Cancer
+center
Newest posts
- center
- link blog/index.html
+ blog/index.html
class headerLink
-
Cancer in the United States: Heatmap visualizations
- style text-align:center;
- link blog/cancer-heatmaps.html
- center
-
-center
+ blog/cancer-heatmaps.html
blog/cancerHeatmap.jpg
width 300px
- link blog/cancer-heatmaps.html
+ blog/cancer-heatmaps.html
footer.scroll
------------------------------------------------------------
commit 2c5d384b95ca99a426b1670c058158b254a6b001
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 06:58:19 2024 -1000
diff --git a/code/conceptPage.scroll b/code/conceptPage.scroll
index add135e20..71fefa006 100644
--- a/code/conceptPage.scroll
+++ b/code/conceptPage.scroll
@@ -2,7 +2,8 @@ importOnly
replace BASE_URL ..
replaceJs TEMPLATE
{
- const code = codeAtStart.replace("import ../code/conceptPage.scroll\n", "");
+ const code = codeAtStart.replace("../code/conceptPage.scroll\n", "");
+ const particle = new Particle(codeAtStart)
const template = `title ${particle.get("name")}\nprintTitle\ncode\n ${code.replace(/\n/g, "\n ")}`;
template;
}
------------------------------------------------------------
commit 039eb0a750fdc39680beec3b4512f15a238cdc84
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 06:55:21 2024 -1000
diff --git a/index.scroll b/index.scroll
index d1b899756..2f707cbb2 100644
--- a/index.scroll
+++ b/index.scroll
@@ -4,17 +4,19 @@ rootHeader.scroll
# CancerDB: Datasets about Cancer
-<center>
-
Newest posts
+ center
link blog/index.html
class headerLink
Cancer in the United States: Heatmap visualizations
style text-align:center;
link blog/cancer-heatmaps.html
-<a href="blog/cancer-heatmaps.html"><img src="blog/cancerHeatmap.jpg" width="300px"/></a>
+ center
-</center>
+center
+blog/cancerHeatmap.jpg
+ width 300px
+ link blog/cancer-heatmaps.html
footer.scroll
------------------------------------------------------------
commit 508dd65ed1a310075c1acc009f50d99984241f89
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 06:53:27 2024 -1000
diff --git a/404.scroll b/404.scroll
index d05b8e01e..710b3f9b8 100644
--- a/404.scroll
+++ b/404.scroll
@@ -4,6 +4,7 @@ title Page not found
rootHeader.scroll
printTitle
thinColumns 1
+theme gazette
Sorry, the url you requested was not found.
diff --git a/gazette.scroll b/gazette.scroll
deleted file mode 100644
index ad6f5fe6d..000000000
--- a/gazette.scroll
+++ /dev/null
@@ -1,3 +0,0 @@
-buildCss gazette.css
-
-gazetteCss
------------------------------------------------------------
commit 8f3b13be64072b853edd08633a5235a087722056
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 28 06:08:26 2024 -1000
diff --git a/package.json b/package.json
index ad7c388ee..fdcefc4f0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"homepage": "https://cancerdb.com",
"devDependencies": {
"lodash": "^4.17.21",
- "scroll-cli": "^133.3.0",
+ "scroll-cli": "^136.3.0",
"scrollsdk": "^87.0.0"
}
}