diff --git a/.circleci/config.yml b/.circleci/config.yml index d84776d..5c13d7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: - restore_cache: keys: - - deps-{{ checksum "elm/package.json" }} + - deps-{{ checksum "package.json" }} - deps- - run: @@ -18,7 +18,7 @@ jobs: - run: name: Install dependencies - working_directory: elm + working_directory: . command: | npm install @@ -36,28 +36,28 @@ jobs: - save_cache: paths: - - elm/node_modules - key: deps-{{ checksum "elm/package.json" }} + - node_modules + key: deps-{{ checksum "package.json" }} - run: name: Run static code analysis - working_directory: elm + working_directory: . command: | elm-analyse - run: name: Run tests - working_directory: elm + working_directory: . command: | mkdir -p test-reports /tmp/sysconfcpus/bin/sysconfcpus -n 2 npm test - store_artifacts: - path: elm/test-reports/ + path: test-reports/ destination: tr1 - store_test_results: - path: elm/test-reports/ + path: test-reports/ workflows: version: 2 diff --git a/.gitignore b/.gitignore index 66ae216..8a5f042 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +elm-stuff +node_modules +documentation.json package-lock.json diff --git a/elm/elm-analyse.json b/elm-analyse.json similarity index 100% rename from elm/elm-analyse.json rename to elm-analyse.json diff --git a/elm/elm-package.json b/elm-package.json similarity index 95% rename from elm/elm-package.json rename to elm-package.json index 1ccffa5..f3157b5 100644 --- a/elm/elm-package.json +++ b/elm-package.json @@ -1,5 +1,5 @@ { - "version": "1.0.0", + "version": "1.0.1", "summary": "Koivu", "repository": "https://github.com/allo-media/koivu.git", "license": "MIT", diff --git a/elm/.gitignore b/elm/.gitignore deleted file mode 100644 index 1fe367d..0000000 --- a/elm/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -elm-stuff -node_modules -documentation.json - diff --git a/elm/README.md b/elm/README.md deleted file mode 100644 index 5e402b2..0000000 --- a/elm/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Koivu -===== - -An interactive tree representation of [AlloMedia](https://www.allo-media.fr/)'s -Customer Path ([demo](https://allo-media.github.io/koivu/)). - -![](https://i.imgur.com/SU7mcqK.png) - -```elm -import Koivu -import Koivu.Tree as Tree -import Html - - -settings : Koivu.Settings -settings = - { autoNormalize = False - , globalQty = 100000 - , minNodeQty = 3000 - , maxChildren = 4 - , maxGlobalQty = 200000 - , maxLevels = 3 - , nodeWidth = 140 - , nodeHeight = 80 - , nodePadding = 10 - } - - -main : Program Never Koivu.Model Koivu.Msg -main = - Tree.demoTree - |> Koivu.setup settings - |> Html.program -``` - -## License - -MIT diff --git a/example/elm-package.json b/example/elm-package.json index e2a25ae..4b998de 100644 --- a/example/elm-package.json +++ b/example/elm-package.json @@ -5,7 +5,7 @@ "license": "MIT", "source-directories": [ "src", - "../elm/src" + "../src" ], "exposed-modules": [], "dependencies": { diff --git a/elm/package.json b/package.json similarity index 77% rename from elm/package.json rename to package.json index e0530d7..a7ecb3f 100644 --- a/elm/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "koivu-elm", - "version": "0.0.1", - "description": "Commands for the koivu Elm package", + "version": "1.0.0", + "description": "Commands for the koivu Elm package; do not publish!", "private": true, "scripts": { "install": "elm package install -y", diff --git a/elm/src/Koivu.elm b/src/Koivu.elm similarity index 100% rename from elm/src/Koivu.elm rename to src/Koivu.elm diff --git a/elm/src/Koivu/Internal/EditorConfig.elm b/src/Koivu/Internal/EditorConfig.elm similarity index 100% rename from elm/src/Koivu/Internal/EditorConfig.elm rename to src/Koivu/Internal/EditorConfig.elm diff --git a/elm/src/Koivu/Internal/NodeHtml.elm b/src/Koivu/Internal/NodeHtml.elm similarity index 100% rename from elm/src/Koivu/Internal/NodeHtml.elm rename to src/Koivu/Internal/NodeHtml.elm diff --git a/elm/src/Koivu/Internal/Settings.elm b/src/Koivu/Internal/Settings.elm similarity index 100% rename from elm/src/Koivu/Internal/Settings.elm rename to src/Koivu/Internal/Settings.elm diff --git a/elm/src/Koivu/Internal/SvgEditor.elm b/src/Koivu/Internal/SvgEditor.elm similarity index 100% rename from elm/src/Koivu/Internal/SvgEditor.elm rename to src/Koivu/Internal/SvgEditor.elm diff --git a/elm/src/Koivu/Tree.elm b/src/Koivu/Tree.elm similarity index 100% rename from elm/src/Koivu/Tree.elm rename to src/Koivu/Tree.elm diff --git a/elm/tests/Suite.elm b/tests/Suite.elm similarity index 100% rename from elm/tests/Suite.elm rename to tests/Suite.elm diff --git a/elm/tests/elm-package.json b/tests/elm-package.json similarity index 100% rename from elm/tests/elm-package.json rename to tests/elm-package.json