From a63498826b97cc2e67b7dba3dba314a61f44dafe Mon Sep 17 00:00:00 2001 From: notnull Date: Wed, 26 Jun 2019 06:07:28 -0400 Subject: [PATCH] add todo notes --- _tasks-mockup.org | 10 ++++++++++ package-lock.json | 5 +++++ package.json | 1 + src/components/profile.js | 41 ++++++++++++++++++++++++++++++++------- 4 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 _tasks-mockup.org diff --git a/_tasks-mockup.org b/_tasks-mockup.org new file mode 100644 index 0000000..6370b28 --- /dev/null +++ b/_tasks-mockup.org @@ -0,0 +1,10 @@ +* tasks-mockup + +** project task view +- should not show project button, but should show user button +- later, should be able to group by users -- need button for grouping +** user task view +- no user button but should show the project button +- should be able to group by project +** user project view +- just show the user projects diff --git a/package-lock.json b/package-lock.json index d7b795a..5c9e655 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2405,6 +2405,11 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "bootstrap-imageupload": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/bootstrap-imageupload/-/bootstrap-imageupload-1.1.3.tgz", + "integrity": "sha1-qe48TOjc3zigGfchDloerb1jr44=" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index 47975ea..d5156d0 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "axios": "^0.19.0", + "bootstrap-imageupload": "^1.1.3", "http-proxy-middleware": "^0.19.1", "react": "^16.8.6", "react-dom": "^16.8.6", diff --git a/src/components/profile.js b/src/components/profile.js index b9a2e41..38fa42c 100644 --- a/src/components/profile.js +++ b/src/components/profile.js @@ -1,22 +1,46 @@ import React from 'react' +function uploadImage() {} + function Profile(props) { const user = props.user - user['projects'] = [1, 10] // TODO + user['createdAt'] = '2019-06-23T10:59:10' + user['username'] = user.name || 'Me' + user['display_name'] = user.name || 'Me' + user['avatar'] = user.avatar || '/img/default-user-image.png' + user['projects'] = [1] + + // file upload + // https://www.npmjs.com/package/bootstrap-imageupload + //$('#my-imageupload').imageupload() + return (
  • Name: + {user.username} +
  • +
  • + Display name - avatar +
  • +
  • + Avatar: + avatar +
  • created: @@ -24,11 +48,14 @@ function Profile(props) {
  • projects: - {user.projects && - user.projects.map(userProject => { - const project = props.projects.find(p => p.id === userProject) + {user.projects.length > 0 && + user.projects.map(id => { + const project = props.projects.find(p => p.id === id) return ( - props.selectProject(userProject)}> + props.selectProject(id)} + > {project.name} )