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.

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

Combine Start Work & Project Creation Forms #6661

Merged
merged 18 commits into from
Jun 4, 2020

Conversation

zoek1
Copy link
Contributor

@zoek1 zoek1 commented May 15, 2020

Description
  • Build the form to capture the two scenarios outlined in the mockups (hacking solo, hacking as a team).
  • Allow users to designate whether they are looking to accept team members
    On looking for a skill, we should pre populate the tags that we use on the funder form (front end, backend, design, etc)
  • Project name, logo, summary, plan, repo should be editable
    until you submit work
  • Hackers should be able to edit their project details via that same modal

DEMO:
https://www.loom.com/share/430a1a6963ee487ab4f3c580d5b6c64d

Refers/Fixes

#6444

Testing

image

image

ETC bounties
https://www.loom.com/share/d68910dfeadd4c7b9858aff2419358ee

@zoek1 zoek1 changed the title Combine Start Work & Project Creation Forms DONT MERGE Combine Start Work & Project Creation Forms May 15, 2020
@zoek1 zoek1 marked this pull request as draft May 15, 2020 09:59
@zoek1 zoek1 changed the title DONT MERGE Combine Start Work & Project Creation Forms Combine Start Work & Project Creation Forms May 15, 2020
@PixelantDesign
Copy link
Contributor

PixelantDesign commented May 19, 2020

Looking good! Could we see a video of the form working?

@zoek1 zoek1 marked this pull request as ready for review May 20, 2020 07:25
@codecov
Copy link

codecov bot commented May 20, 2020

Codecov Report

Merging #6661 into master will increase coverage by 0.02%.
The diff coverage is 14.28%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6661      +/-   ##
==========================================
+ Coverage   26.67%   26.69%   +0.02%     
==========================================
  Files         293      293              
  Lines       27878    27889      +11     
  Branches     4113     4114       +1     
==========================================
+ Hits         7436     7445       +9     
- Misses      20176    20178       +2     
  Partials      266      266              
Impacted Files Coverage Δ
app/dashboard/views.py 10.67% <0.00%> (-0.03%) ⬇️
app/dashboard/models.py 49.30% <100.00%> (+0.01%) ⬆️
app/dashboard/tip_views.py 14.39% <0.00%> (ø)
app/dashboard/embed.py 31.60% <0.00%> (+3.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6129577...7c28c89. Read the comment docs.

@thelostone-mc
Copy link
Member

@zoek1 could you throw in video to help @PixelantDesign validate the flow ?

@zoek1
Copy link
Contributor Author

zoek1 commented May 21, 2020

I just posted the video demo in the descriptions @PixelantDesign @thelostone-mc :)

@PixelantDesign
Copy link
Contributor

looks great!

@PixelantDesign
Copy link
Contributor

@alexvotofuture @connoroday what do you think?

@alexvotofuture
Copy link
Contributor

Awesome, @zoek1. Looks like it functions exactly as we expected. Thank you for the work on this!

Copy link
Contributor

@octavioamu octavioamu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking really good, left some comments

let logo = $(this)[0]['logo'].files[0];
let data = $(this).serializeArray();

submitInterest(document.result['pk'], '', self, () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this will be an empty interest on the activity.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced the empty string with the project description

@@ -601,7 +601,12 @@ var show_interest_modal = function() {
modalBody.load(modalUrl, ()=> {
let actionPlanForm = $('#action_plan');
let issueMessage = $('#issue_message');
let data = $('.team-users').data('initial') ? $('.team-users').data('initial').split(', ') : [];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is missing the projects changes for ETC bounties

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thelostone-mc
Copy link
Member

@zoek once you address @octavioamu comments ~ Could you throw in a demo for hackathons bounty creation flow for ETC
Add ETC as a mainnet token via http://localhost:8000/_administrationeconomy/token/ -> create an ETC bounty and make sure the start + project creation works

@zoek1 zoek1 requested a review from octavioamu June 3, 2020 07:59
@zoek1 zoek1 marked this pull request as ready for review June 3, 2020 08:00
@PixelantDesign
Copy link
Contributor

Thanks for the video @zoek1! I see the ETC bounty there!

@@ -4716,6 +4716,7 @@ class HackathonProject(SuperModel):
)
looking_members = models.BooleanField(default=False)
chat_channel_id = models.CharField(max_length=255, blank=True, null=True)
extra = JSONField(default=dict, blank=True, null=True)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add in helpt text to explain this better In a follow up PR

let logo = elements['logo'].files[0];
let summary = elements['summary'].value;
let data = $(this).serializeArray();

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ update to const

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done :)

@willsputra willsputra mentioned this pull request Jun 4, 2020
@thelostone-mc thelostone-mc merged commit d605be4 into gitcoinco:master Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Gitcoin Hackathon Gitcoin Hackathon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants