From a281dbf1dda606262fadb616e3b6214cab19c5c2 Mon Sep 17 00:00:00 2001 From: emilyt Date: Sun, 14 Nov 2021 18:50:53 -0800 Subject: [PATCH 1/4] pulled from main to update branch --- .../__pycache__/model_mongodb.cpython-38.pyc | Bin 2266 -> 2266 bytes .../__pycache__/sample_backend.cpython-38.pyc | Bin 1912 -> 2328 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/backend/src/__pycache__/model_mongodb.cpython-38.pyc b/backend/src/__pycache__/model_mongodb.cpython-38.pyc index 2d570e7aa81ab23512185f1be87ca592ea236874..fdb3a96321e34d33773f85642aa67df7d80958a1 100755 GIT binary patch delta 20 acmca5cuSBwl$V!_0SIPIY~9Fxo&x|m76qOF delta 20 acmca5cuSBwl$V!_0SKmu7H{M}&jA26ss#!F diff --git a/backend/src/__pycache__/sample_backend.cpython-38.pyc b/backend/src/__pycache__/sample_backend.cpython-38.pyc index fd8a9160850e88a65e52bfd99440336e02060863..fe0bbdc3e08331668ee25a0d50f8670bd472a666 100644 GIT binary patch delta 1255 zcmZuw&u`O66rMMB9LI6eH2pyrT2xe^8$eqmgjPaq5o#q)ut3FuV99dwrfpg$j>gWe zf{JozuPapfvf5KQ@*i;E!~qG!k(0%FrS9Gl;sS3bMFhk|`DW(5=l6Z@&CG}L-_`QH zQpsU7-oM@tt`+yov+!>J{EY!J%!h@xQ+I#~5XD`nyTTIgE&xM&gSDVu67E(R3+P~R zgQNQw#}bzJ7)6c=_n?epPXH@8t}PWETOEm=z)9^H*PbczOdn-AhBJF7RGKROgva+- zeF9J5EX|W>uCdzO{=b(OYLGd%11UPmtq4Wt^kN}nKWxRx!~9Yp6I!HiVIlqBC=KpX zbqU)7gl#UDX~ho=MHoi@pOFl4 zfebNM-*S13@S(M&4mLf6SC>?;rAv?*TTw&WYO5};ED_XP-C#MU3>5|A1nGbL@w`-O zN0>EfK~<#h%wqbFu~0B^<6Z+>%|xD6(dvAMpe0YQ zw>mh~>^J(px)MG$;toZ{`T^?-W}pJ{JlUE`wi;>0y7@qBQ1tR=f|{ZECEij{7cj>`p`yXrT`ZNoM=ZjOf= z_^@~xeLlRgIi-l^_E6iS4)yjBGDx;(^iexcy$_hU9}&qBZ{L830`&%%3-E|80wDUmrczi+h5WP#M+TOsyyqg6jvK3Yg-HX^ZrR-wC@fX-s_1x;_tw zNkoH_ty{@N=67inje=Jr7Lf*&=BDysvOM5x$JhGO+FXAj?PpKL5H-Xb>&smXthD2B zNToFxbyybuSpneq8$b&)O9ePXn(mH>v_sb8((2Jv#P-`oX*0@`(;k>QewhP0&~i<2 zC9{;vxX48qv4(h@`HHY`oF=*?ZaOto73LPVM=feoSTtgU%#Sy$8^G8$!9hKiX~$l@YrR zdtC&emJrz|+uDPYXH9^XrLC}QYU4bu%D-A5(}B=4GFZv9RH>@C=RTZDH<&pJqy>%5 zTFkJ~IHh`$OpTT;D^TWi>Y2mScS=vey+0h0aYWaYeXbHP3;`q8#93^)@R)}A%ZA~2 MUKx3HcpI+!8*4JZ=Kufz From d137f6578efa62e2662b98abd4f8473ecbf4382a Mon Sep 17 00:00:00 2001 From: emilyt Date: Mon, 15 Nov 2021 09:34:43 -0800 Subject: [PATCH 2/4] treeview draft 1: created a static parent and two children --- backend/src/.cache | 2 +- frontend/package-lock.json | 176 +++++++++++++++++++++++++++++++++++-- frontend/package.json | 9 ++ frontend/src/MyApp.js | 41 ++++++++- 4 files changed, 217 insertions(+), 11 deletions(-) diff --git a/backend/src/.cache b/backend/src/.cache index feb13bace..92dec0545 100644 --- a/backend/src/.cache +++ b/backend/src/.cache @@ -1 +1 @@ -{"access_token": "BQA9_9inph0wpoqu3S2pLbLv9sgPjDnO7K0t-V35MktKAVbn94Knr9xjKyEH66yKJ7ZvJyIlZnQYj75qjiw", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1636143399} \ No newline at end of file +{"access_token": "BQBOwvcR9njuyI0Ow7bO_EiTiOuaFulALpKrWZ4GzMC5ugRpFElRVT5t3p6a_tpW_4G2UTpjXMeKUkiMO4g", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1636965255} \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 2a384938f..11621184a 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2652,14 +2652,82 @@ } }, "@typescript-eslint/parser": { - "version": "4.31.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz", - "integrity": "sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==", - "requires": { - "@typescript-eslint/scope-manager": "4.31.2", - "@typescript-eslint/types": "4.31.2", - "@typescript-eslint/typescript-estree": "4.31.2", - "debug": "^4.3.1" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.1.tgz", + "integrity": "sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.3.1", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/typescript-estree": "5.3.1", + "debug": "^4.3.2" + }, + "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz", + "integrity": "sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1" + } + }, + "@typescript-eslint/types": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.1.tgz", + "integrity": "sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz", + "integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz", + "integrity": "sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.3.1", + "eslint-visitor-keys": "^3.0.0" + } + }, + "eslint-visitor-keys": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "@typescript-eslint/scope-manager": { @@ -4284,6 +4352,11 @@ "wrap-ansi": "^6.2.0" } }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -4972,6 +5045,16 @@ "type": "^1.0.1" } }, + "d3-ease": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", + "integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==" + }, + "d3-hierarchy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", + "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==" + }, "damerau-levenshtein": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz", @@ -12688,6 +12771,66 @@ "webpack-dev-server": "3.11.1", "webpack-manifest-plugin": "2.2.0", "workbox-webpack-plugin": "5.1.4" + }, + "dependencies": { + "@typescript-eslint/parser": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", + "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", + "requires": { + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", + "debug": "^4.3.1" + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", + "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", + "requires": { + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0" + } + }, + "@typescript-eslint/types": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", + "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==" + }, + "@typescript-eslint/typescript-estree": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", + "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", + "requires": { + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0", + "debug": "^4.3.1", + "globby": "^11.0.3", + "is-glob": "^4.0.1", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", + "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", + "requires": { + "@typescript-eslint/types": "4.33.0", + "eslint-visitor-keys": "^2.0.0" + } + } } }, "react-spotify-player": { @@ -12706,6 +12849,17 @@ "nano-css": "^5.3.4" } }, + "react-tree-graph": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/react-tree-graph/-/react-tree-graph-6.0.1.tgz", + "integrity": "sha512-cyhLOqxP1bpbgkztjK9fdHshXuCvV0BqlyBUjkRVlDyfD0G3ukXTS09s+8r2oz5HPypb0Wiof/+z5x9IWXVFGQ==", + "requires": { + "clone": "^2.1.2", + "d3-ease": "^2.0.0", + "d3-hierarchy": "^2.0.0", + "prop-types": "^15.5.7" + } + }, "read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -14839,6 +14993,12 @@ "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", + "dev": true + }, "unbox-primitive": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index a9250b972..c0b3823ae 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,6 +12,7 @@ "react-scripts": "4.0.3", "react-spotify-player": "^1.0.4", "react-spotify-web-playback": "^0.9.1", + "react-tree-graph": "^6.0.1", "web-vitals": "^1.1.2" }, "scripts": { @@ -24,6 +25,10 @@ "extends": [ "react-app", "react-app/jest" + ], + "eslintIgnore": [ + "node_modules", + "build/*" ] }, "browserslist": { @@ -37,5 +42,9 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "@typescript-eslint/parser": "^5.3.1", + "typescript": "^4.4.4" } } diff --git a/frontend/src/MyApp.js b/frontend/src/MyApp.js index ec74e3d0d..543f3e91d 100644 --- a/frontend/src/MyApp.js +++ b/frontend/src/MyApp.js @@ -4,6 +4,44 @@ import Table from './Table'; import Form from './Form'; + +// import React from 'react'; +import Tree from 'react-tree-graph'; +import data from './data.ts'; +import 'react-tree-graph/dist/style.css' +import './App.css'; + +// const App: React.FC = (props: any) => { +// return ( +// +// ); +// } + +const App: React.FC = () => { + let data = { + name: 'Parent Artist', + children: [{ + name: 'Child Artist One' + }, { + name: 'Child Artist Two' + }] +}; + + return ( + + ); +} + +export default App; + + + function MyApp() { const [characters, setCharacters] = useState([]); @@ -79,5 +117,4 @@ function MyApp() { ); } - -export default MyApp; \ No newline at end of file +// export default MyApp; \ No newline at end of file From f9789fc353dc47b57c8086306f9b03c933f09edb Mon Sep 17 00:00:00 2001 From: emilyt Date: Fri, 19 Nov 2021 09:13:33 -0800 Subject: [PATCH 3/4] created static tree view --- backend/src/.cache | 2 +- frontend/src/MyApp.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/.cache b/backend/src/.cache index 92dec0545..414de4474 100644 --- a/backend/src/.cache +++ b/backend/src/.cache @@ -1 +1 @@ -{"access_token": "BQBOwvcR9njuyI0Ow7bO_EiTiOuaFulALpKrWZ4GzMC5ugRpFElRVT5t3p6a_tpW_4G2UTpjXMeKUkiMO4g", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1636965255} \ No newline at end of file +{"access_token": "BQDu5b9CCeqfrykgeC4mUP0KojCNLCJNzOE7r6JLTTPoVU5wi1fBCNWxwa_0QiELWYXeogNYmb3lUbqZdeA", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1637012366} \ No newline at end of file diff --git a/frontend/src/MyApp.js b/frontend/src/MyApp.js index 543f3e91d..fdf855823 100644 --- a/frontend/src/MyApp.js +++ b/frontend/src/MyApp.js @@ -10,6 +10,7 @@ import Tree from 'react-tree-graph'; import data from './data.ts'; import 'react-tree-graph/dist/style.css' import './App.css'; +import SpotifyPlayer from 'react-spotify-player' // const App: React.FC = (props: any) => { // return ( @@ -24,9 +25,11 @@ const App: React.FC = () => { let data = { name: 'Parent Artist', children: [{ - name: 'Child Artist One' + name: '[hello,hello]', + children: 'other artist' }, { - name: 'Child Artist Two' + name: 'Child Artist Two', + children: 'other artist' }] }; From 7a8e2ed1451dfc5b570d4ca3f64beb6b66c931e1 Mon Sep 17 00:00:00 2001 From: emilyt Date: Mon, 29 Nov 2021 15:24:23 -0800 Subject: [PATCH 4/4] fixed merge conflict with token on backend .cache --- backend/src/.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/.cache b/backend/src/.cache index 750778e40..ece086d52 100644 --- a/backend/src/.cache +++ b/backend/src/.cache @@ -1 +1 @@ -{"access_token": "BQD-MHeT6Qbdm64cZ7mBc9kJ2uzmEE3_Rs6-7NJh5mMQZ6_N38B3U-JuJz2qwmEIXLZIhFY-hqJCyPzjcoI", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1638063409} +{"access_tok/en": "BQDu5b9CCeqfrykgeC4mUP0KojCNLCJNzOE7r6JLTTPoVU5wi1fBCNWxwa_0QiELWYXeogNYmb3lUbqZdeA", "token_type": "Bearer", "expires_in": 3600, "expires_at": 1637012366}