Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review1 #181

Merged
merged 79 commits into from
Jul 22, 2023
Merged

Review1 #181

merged 79 commits into from
Jul 22, 2023

Conversation

wincowgerDEV
Copy link
Collaborator

I think this is ready to merge now y'all! Thanks for all the hard work. I think the only thing we have left for the review is finishing the automated tests.

Changes

Primarily addressing these issues.

  1. [Bug]: References #109
  2. [Feature]: Need to be more explicit about data sharing #122
  3. [Feature]: Better deployment and use instructions #107

Purpose

Addressing requests from reviewers for the publication.

Approach

Updated the manuscript and documentation.

Learning

Received comments from reviewers openjournals/joss-reviews#5136, created issues for each, and addressed them.

@wincowgerDEV
my workflow
f79b68a
@wincowgerDEV
example templates for manuscript.
dcdf30a
@wincowgerDEV
manuscript info
756f28c
@wincowgerDEV
update citations
d6b503b
@wincowgerDEV
cleanup text
6e3ff73
@wincowgerDEV
cite
d249780
@wincowgerDEV
update readme
e5a3fb2
@wincowgerDEV
contribute
f24c5f6
@wincowgerDEV
add website badge
3122002
@wincowgerDEV
update web link
968b751
@wincowgerDEV
Update README.md
bf04070
@wincowgerDEV
Update README.md
f053598
@wincowgerDEV
add video link
ef37cc0
@wincowgerDEV
auto update
4f46bd0
@wincowgerDEV
Merge branch 'manuscript' of https://github.com/code4sac/trash-ai int…
6050002 
…o manuscript
@wincowgerDEV
utility files device specific
11f5eaa
@wincowgerDEV
move the pdf generator to workflows
f97c3d7
@wincowgerDEV
test error in paper.bib
99cde81
@wincowgerDEV
test citation style
b458d55
@wincowgerDEV
add citations
1140afc
@wincowgerDEV
add a few more citations
b8cbe58
@wincowgerDEV
try without space
80dc434
@wincowgerDEV
add all
acd67ec
@wincowgerDEV
no spaces allowed in citation names
ce4de09
@wincowgerDEV
add demo images
41dd5a1
@wincowgerDEV
Update paper.md
cbae5af
@wincowgerDEV
give images some space
d1075f3
@wincowgerDEV
image captions
11b2c2e
@wincowgerDEV
add mention of wade
4b2a454
@wincowgerDEV
update authors and acknowledgements
4ff318f
@wincowgerDEV
https://github.com/code4sac/trash-ai/pull/69#discussion_r1033145379
640e465
@wincowgerDEV
https://github.com/code4sac/trash-ai/pull/69#discussion_r1033146187
3273b24
@wincowgerDEV
https://github.com/code4sac/trash-ai/pull/69#discussion_r1024726101
a582b32
@wincowgerDEV
add submitted badge
81454c0
@wincowgerDEV
update dois
52380b0
@wincowgerDEV
Update paper.md
2527ec1 
#122
@wincowgerDEV
Update paper.md
c659948 
add Elizabeth to ack
@wincowgerDEV
Update paper.md
e46d927 
add funder possibility lab
@wincowgerDEV
Update paper.md
ed979f1 
add funder.
@wincowgerDEV
Update README.md
0417b28
@wincowgerDEV
add r code for analyzing data
690e469
@wincowgerDEV
remove unnecessary code.
61f40b9
@wincowgerDEV
merge with production
4f6e1fb 
Merge branch 'production' of https://github.com/code4sac/trash-ai into Review1

# Conflicts:
#	README.md
@wincowgerDEV
remove spaces
c3c3a39 
Merge branch 'manuscript' of https://github.com/code4sac/trash-ai into Review1

# Conflicts:
#	.gitignore
#	README.md
#	docs/localdev.md
#	paper.bib
#	paper.md
@wincowgerDEV
trying to fix the unexpected period issue, not sure where it is comin…
1bde625 
…g from.
@wincowgerDEV
revert bib to test
bb1c099
@wincowgerDEV
add dois
9c0863c
@wincowgerDEV
Merge branch 'production' of https://github.com/code4sac/trash-ai int…
bcea1f3 
…o Review1
@wincowgerDEV
update paper acknowledgments and links.
03b50dd
@wincowgerDEV
add comments.
4d2f090
@wincowgerDEV
remove empty line
f7faa35
@wincowgerDEV
Update about.vue
132b997 
update about
@wincowgerDEV
Update about.vue
ece837a 
add tutorial
@wincowgerDEV
Update README.md
84f1cc0 
update video
@wincowgerDEV
Update paper.md
4a9caf1 
update video
@wincowgerDEV wincowgerDEV added the reviewer comment feedback from manuscript reviewers, should be prioritized label Jul 8, 2023
@feydan feydan merged commit 402e595 into aws/trashai-staging Jul 22, 2023
feydan added a commit that referenced this pull request Aug 5, 2023
@feydan @dependabot
@Zesky665 @shollingsworth @wincowgerDEV
Merging latest staging into production (#188)
fbba50e 
* Adding a link to Running-man-01/trashai_nbs project

* Bump vm2 from 3.9.17 to 3.9.19 in /infra (#162)

Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.17 to 3.9.19.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](patriksimek/vm2@3.9.17...3.9.19)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump vite from 3.2.5 to 3.2.7 in /infra (#165)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.2.5 to 3.2.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump vite from 3.0.4 to 3.2.7 in /frontend (#164)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.0.4 to 3.2.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fixing build and fixing local (#170)

* Add testing instructions and auto tests (#171)

* Adding a link to Running-man-01/trashai_nbs project (#168)

* update frontend app doc

* Add manual instructions.

* Added test-ids

* Add test-ids to the navigation tabs

* Add smoke test draft

* Add placeholder file

* Add photos for manual testing instructions

* Upgrade node version

* Remove cypress

* Add test ids to summary page

* Jest + Puppeteer setup

* Add smoke test

* Added back manual instructions

* Add images for manual instructions

* Add instruction for running auto tests

---------

Co-authored-by: Dan Fey <[email protected]>

* Adding schema files to download (#173)

* adding schema files to the zip download

* revert yarn change

* fixing list

* indentation

* 124 summary csv files (#175)

* aAdding summary csv reports

* adding comments

* fixing off by 1 error in summary counts (#177)

* Consistent csv delimiter (#179)

* Only using comma delimited for summary csv files and automatically quoting all string fields in the csv

* Simplifying generateSummaryFiles and removing array mutation

* fixing unit test

* only run typescript tests with test-ts

* Updated babel and dev package to run tests

---------

Co-authored-by: Steven Hollingsworth <[email protected]>

* Fixed broken yarn.lock

* Review1 (#181)

* my workflow

* example templates for manuscript.

* manuscript info

* update citations

* cleanup text

* cite

* update readme

* contribute

* add website badge

* update web link

* Update README.md

* Update README.md

* add video link

* auto update

* utility files device specific

* move the pdf generator to workflows

* test error in paper.bib

* test citation style

* add citations

* add a few more citations

* try without space

* add all

* no spaces allowed in citation names

* add demo images

* Update paper.md

* give images some space

* image captions

* add mention of wade

* update authors and acknowledgements

* Updated with Dan's Recs

* Mary Comments

#69 (comment)

* SteveO comments

#69 (review)

* Walter's comments

#69 (review)

* Create config.yml

* Create bug.yml

* Create feature.yml

* hyperlink

* Update bug.yml

* Update feature.yml

* Added in Kristiina and Kris's comments

* Update README.md

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* #69 (comment)

* add kris's comments

* add WSL2 link

* Update paper.md

* add acknowledgements

* #69 (comment)

* #69 (comment)

* #69 (comment)

* add submitted badge

* update dois

* Update paper.md

#122

* Update paper.md

add Elizabeth to ack

* Update paper.md

add funder possibility lab

* Update paper.md

add funder.

* Update README.md

* add r code for analyzing data

* remove unnecessary code.

* trying to fix the unexpected period issue, not sure where it is coming from.

* revert bib to test

* add dois

* update paper acknowledgments and links.

* add comments.

* remove empty line

* Update about.vue

update about

* Update about.vue

add tutorial

* Update README.md

update video

* Update paper.md

update video

* Bump word-wrap from 1.2.3 to 1.2.4 in /frontend (#187)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump word-wrap from 1.2.3 to 1.2.4 in /infra (#186)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /frontend (#185)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /infra (#184)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump tough-cookie from 4.1.2 to 4.1.3 in /infra (#182)

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /backend (#183)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zesky665 <[email protected]>
Co-authored-by: Steven Hollingsworth <[email protected]>
Co-authored-by: Win Cowger, PhD <[email protected]>
@wincowgerDEV wincowgerDEV mentioned this pull request Aug 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feydan feydan feydan approved these changes

Assignees
No one assigned
Labels
reviewer comment feedback from manuscript reviewers, should be prioritized
Projects
TrashAI
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wincowgerDEV @feydan