diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 00000000..44ac4e96 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,29 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm start & sleep 5 && npm test + - name: Upload tests report(cypress mochaawesome merged HTML report) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: reports diff --git a/README.md b/README.md index 0adab1fe..2b00cc56 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Tree from object -Write a function `createTree(element, data)` that creates a nested list of `ul/li` from an object. -Use keys as list items. +Write a function `createTree(element, data)` that creates a nested list of `ul/li` from an object. +Use keys as list items. `element` - is a DOM element @@ -11,7 +11,7 @@ Use keys as list items. ![screenshot of the tree](example/object-tree.png) 1. Replace `` with your GitHub username in the link - - [DEMO LINK](https://.github.io/js_tree-from-object-DOM/) + - [DEMO LINK](https://PAVLO111.github.io/js_tree-from-object-DOM/) 2. Follow [this instructions](https://github.com/mate-academy/js_task-DOM-guideline) - Run `npm run test` command to test your code; - Run `npm run test:only -- -n` to run fast test ignoring linter; diff --git a/src/index.html b/src/index.html index 3496ee13..5f1acb9b 100644 --- a/src/index.html +++ b/src/index.html @@ -9,6 +9,11 @@ /> +<<<<<<< HEAD +======= + + +>>>>>>> temp-fix diff --git a/src/scripts/main.js b/src/scripts/main.js index 2cdcd10c..3894e1cd 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -18,10 +18,31 @@ const food = { }, }; +const rootTree = document.createElement('ul'); + +rootTree.id = 'tree'; +document.body.append(rootTree); + const tree = document.querySelector('#tree'); function createTree(element, data) { - // WRITE YOUR CODE HERE + for (const key in data) { + const firstList = document.createElement('li'); + + firstList.textContent = key; + + element.append(firstList); + + const testLength = Object.keys(data[key]).length; + + if (testLength > 0) { + const ul = document.createElement('ul'); + + firstList.append(ul); + + createTree(ul, data[key]); + } + } } createTree(tree, food);