diff --git a/.gitignore b/.gitignore index 8201a33..0d80623 100644 --- a/.gitignore +++ b/.gitignore @@ -7,14 +7,14 @@ Notes.md .swp # hacky upload script -lib/pushToMongoManually.js +packages/webpage/lib/pushToMongoManually.js # convenience old folder -pages/.old/* -pages/.old +packages/webpage/pages/.old/* +packages/webpage/pages/.old # dependencies -/node_modules +**/node_modules /.pnp .pnp.js @@ -22,11 +22,11 @@ pages/.old /coverage # next.js -/.next/ -/out/ +**/.next/ +**/out/ # production -/build +**/build # misc .DS_Store diff --git a/README.md b/packages/webpage/README.md similarity index 100% rename from README.md rename to packages/webpage/README.md diff --git a/data/listOfMoralGoods.json b/packages/webpage/data/listOfMoralGoods.json similarity index 100% rename from data/listOfMoralGoods.json rename to packages/webpage/data/listOfMoralGoods.json diff --git a/data/listOfOpenPhil2018AIRiskGrants.json b/packages/webpage/data/listOfOpenPhil2018AIRiskGrants.json similarity index 100% rename from data/listOfOpenPhil2018AIRiskGrants.json rename to packages/webpage/data/listOfOpenPhil2018AIRiskGrants.json diff --git a/data/listOfResearchOutputs.json b/packages/webpage/data/listOfResearchOutputs.json similarity index 100% rename from data/listOfResearchOutputs.json rename to packages/webpage/data/listOfResearchOutputs.json diff --git a/data/results/research/comparisons/finn-moorhouse.json b/packages/webpage/data/results/research/comparisons/finn-moorhouse.json similarity index 100% rename from data/results/research/comparisons/finn-moorhouse.json rename to packages/webpage/data/results/research/comparisons/finn-moorhouse.json diff --git a/data/results/research/comparisons/gavin-leech-complete.json b/packages/webpage/data/results/research/comparisons/gavin-leech-complete.json similarity index 100% rename from data/results/research/comparisons/gavin-leech-complete.json rename to packages/webpage/data/results/research/comparisons/gavin-leech-complete.json diff --git a/data/results/research/comparisons/gavin-leech.json b/packages/webpage/data/results/research/comparisons/gavin-leech.json similarity index 100% rename from data/results/research/comparisons/gavin-leech.json rename to packages/webpage/data/results/research/comparisons/gavin-leech.json diff --git a/data/results/research/comparisons/jaime-sevilla.json b/packages/webpage/data/results/research/comparisons/jaime-sevilla.json similarity index 100% rename from data/results/research/comparisons/jaime-sevilla.json rename to packages/webpage/data/results/research/comparisons/jaime-sevilla.json diff --git a/data/results/research/comparisons/linch-zhang.json b/packages/webpage/data/results/research/comparisons/linch-zhang.json similarity index 100% rename from data/results/research/comparisons/linch-zhang.json rename to packages/webpage/data/results/research/comparisons/linch-zhang.json diff --git a/data/results/research/comparisons/misha-yagudin.json b/packages/webpage/data/results/research/comparisons/misha-yagudin.json similarity index 100% rename from data/results/research/comparisons/misha-yagudin.json rename to packages/webpage/data/results/research/comparisons/misha-yagudin.json diff --git a/data/results/research/comparisons/ozzie-gooen.json b/packages/webpage/data/results/research/comparisons/ozzie-gooen.json similarity index 100% rename from data/results/research/comparisons/ozzie-gooen.json rename to packages/webpage/data/results/research/comparisons/ozzie-gooen.json diff --git a/data/results/research/visualizations/gooen.png b/packages/webpage/data/results/research/visualizations/gooen.png similarity index 100% rename from data/results/research/visualizations/gooen.png rename to packages/webpage/data/results/research/visualizations/gooen.png diff --git a/data/results/research/visualizations/leech.png b/packages/webpage/data/results/research/visualizations/leech.png similarity index 100% rename from data/results/research/visualizations/leech.png rename to packages/webpage/data/results/research/visualizations/leech.png diff --git a/data/results/research/visualizations/moorhouse.png b/packages/webpage/data/results/research/visualizations/moorhouse.png similarity index 100% rename from data/results/research/visualizations/moorhouse.png rename to packages/webpage/data/results/research/visualizations/moorhouse.png diff --git a/data/results/research/visualizations/sevilla.png b/packages/webpage/data/results/research/visualizations/sevilla.png similarity index 100% rename from data/results/research/visualizations/sevilla.png rename to packages/webpage/data/results/research/visualizations/sevilla.png diff --git a/data/results/research/visualizations/yagudin.png b/packages/webpage/data/results/research/visualizations/yagudin.png similarity index 100% rename from data/results/research/visualizations/yagudin.png rename to packages/webpage/data/results/research/visualizations/yagudin.png diff --git a/data/results/research/visualizations/zhang.png b/packages/webpage/data/results/research/visualizations/zhang.png similarity index 100% rename from data/results/research/visualizations/zhang.png rename to packages/webpage/data/results/research/visualizations/zhang.png diff --git a/lib/comparisonView.js b/packages/webpage/lib/comparisonView.js similarity index 99% rename from lib/comparisonView.js rename to packages/webpage/lib/comparisonView.js index 28b704b..9b5ac34 100644 --- a/lib/comparisonView.js +++ b/packages/webpage/lib/comparisonView.js @@ -253,6 +253,9 @@ export default function ComparisonView({ listOfElementsForView }) { } function mergeSort({ array, comparisons }) { + console.log("mergesort"); + console.log({ array, comparisons }); + console.log("/console"); if (array == "No comparison found; unable to proceed") { return "No comparison found; unable to proceed"; } diff --git a/lib/comparisonsChanger.js b/packages/webpage/lib/comparisonsChanger.js similarity index 100% rename from lib/comparisonsChanger.js rename to packages/webpage/lib/comparisonsChanger.js diff --git a/lib/d3experiment.js b/packages/webpage/lib/d3experiment.js similarity index 100% rename from lib/d3experiment.js rename to packages/webpage/lib/d3experiment.js diff --git a/lib/datasetChanger.js b/packages/webpage/lib/datasetChanger.js similarity index 100% rename from lib/datasetChanger.js rename to packages/webpage/lib/datasetChanger.js diff --git a/lib/displayAsMarkdown.js b/packages/webpage/lib/displayAsMarkdown.js similarity index 100% rename from lib/displayAsMarkdown.js rename to packages/webpage/lib/displayAsMarkdown.js diff --git a/lib/displayElement.js b/packages/webpage/lib/displayElement.js similarity index 100% rename from lib/displayElement.js rename to packages/webpage/lib/displayElement.js diff --git a/lib/findPaths.js b/packages/webpage/lib/findPaths.js similarity index 100% rename from lib/findPaths.js rename to packages/webpage/lib/findPaths.js diff --git a/lib/labeledGraph.js b/packages/webpage/lib/labeledGraph.js similarity index 100% rename from lib/labeledGraph.js rename to packages/webpage/lib/labeledGraph.js diff --git a/lib/pushToMongo.js b/packages/webpage/lib/pushToMongo.js similarity index 100% rename from lib/pushToMongo.js rename to packages/webpage/lib/pushToMongo.js diff --git a/lib/squiggleWrapper.js b/packages/webpage/lib/squiggleWrapper.js similarity index 100% rename from lib/squiggleWrapper.js rename to packages/webpage/lib/squiggleWrapper.js diff --git a/lib/submitButton.js b/packages/webpage/lib/submitButton.js similarity index 100% rename from lib/submitButton.js rename to packages/webpage/lib/submitButton.js diff --git a/lib/utils.js b/packages/webpage/lib/utils.js similarity index 100% rename from lib/utils.js rename to packages/webpage/lib/utils.js diff --git a/package-lock.json b/packages/webpage/package-lock.json similarity index 100% rename from package-lock.json rename to packages/webpage/package-lock.json diff --git a/package.json b/packages/webpage/package.json similarity index 100% rename from package.json rename to packages/webpage/package.json diff --git a/pages/_app.js b/packages/webpage/pages/_app.js similarity index 100% rename from pages/_app.js rename to packages/webpage/pages/_app.js diff --git a/pages/api/hello.js b/packages/webpage/pages/api/hello.js similarity index 100% rename from pages/api/hello.js rename to packages/webpage/pages/api/hello.js diff --git a/pages/index.js b/packages/webpage/pages/index.js similarity index 100% rename from pages/index.js rename to packages/webpage/pages/index.js diff --git a/pages/openphil-2018-ai-risk.js b/packages/webpage/pages/openphil-2018-ai-risk.js similarity index 100% rename from pages/openphil-2018-ai-risk.js rename to packages/webpage/pages/openphil-2018-ai-risk.js diff --git a/pages/research.js b/packages/webpage/pages/research.js similarity index 100% rename from pages/research.js rename to packages/webpage/pages/research.js diff --git a/postcss.config.js b/packages/webpage/postcss.config.js similarity index 100% rename from postcss.config.js rename to packages/webpage/postcss.config.js diff --git a/public/favicon.ico b/packages/webpage/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to packages/webpage/public/favicon.ico diff --git a/public/vercel.svg b/packages/webpage/public/vercel.svg similarity index 100% rename from public/vercel.svg rename to packages/webpage/public/vercel.svg diff --git a/styles/globals.css b/packages/webpage/styles/globals.css similarity index 100% rename from styles/globals.css rename to packages/webpage/styles/globals.css diff --git a/tailwind.config.js b/packages/webpage/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to packages/webpage/tailwind.config.js