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

Hackathons List Page #6297

Merged
merged 92 commits into from
Aug 4, 2020
Merged

Conversation

walidmujahid
Copy link
Contributor

@walidmujahid walidmujahid commented Mar 25, 2020

Demo Video : https://youtu.be/pYi6Ul-Uvc0
Updsted Design - Copied checklist: #7096 (comment)

  • make the top header span across the page
  • Contact Sales section that was on the right side, is now below and CTA is Become a Sponsor linking to the same form.
  • Remove Tribes section
  • Remove Workshops
  • Update overall buttons so there is a primary and secondary focus
  • on the hackathon card, add space for a few lines of text that gitcoin admin can enter in manually using an Edit button.
  • add small sponsor logos to each hackathon

Happening Now tab:
happening

  • When hackathon is completed - show projects and showcase buttons

Completed tab:
completed

closes #7096


previous version **Updated Demo Video - Full page with recent changes to hackathon section - 2020-06-11: https://youtu.be/rSdZAFy8gAc** Demo video - workshops section various device widths - 2020-06-09: https://youtu.be/WB7YmUwbBc4 Demo video - Workshops - 2020-06-07: https://youtu.be/C2M6hholtZc Demo of Progress from 2020-04-06 05:26: https://youtu.be/wKL6WvQ3Sbs

Main change on front end is update to margins for the boxes in the header.

Currently:

The boxes in the header can feature hackathons and the process to feature is shown in the video. When there is no featured hackathon, the header looksl like this:

123497

The next section is the list of hackathons categorised as 'current', 'upcoming', and 'finished'. Each category can be navigated via the respective tabs. The 'current' tab is the default tab and if there are no 'current' hackathons then the 'upcoming' tab is the default if there are any, otherwise, the 'finished' tab is the default.

Next is the Tribes section where it shows all tribes that have posted prizes for all current hackathons. If there are no current hackathons but there exists upcoming hackathons, then tribes who had posted prizes in the most recently active hackathon are shown. If there are neither current nor upcoming hackathons, then the top four tribes are shown in order of the number of hackathons the respective tribes participated in.

Workshops will be added in a separate PR. Workshops added.


Need to:

  • refactor code

#6211

@codecov
Copy link

codecov bot commented Mar 27, 2020

Codecov Report

Merging #6297 into master will increase coverage by 0.02%.
The diff coverage is 36.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6297      +/-   ##
==========================================
+ Coverage   26.22%   26.24%   +0.02%     
==========================================
  Files         296      296              
  Lines       29277    29294      +17     
  Branches     4323     4329       +6     
==========================================
+ Hits         7677     7689      +12     
- Misses      21329    21334       +5     
  Partials      271      271              
Impacted Files Coverage Δ
app/dashboard/views.py 10.41% <0.00%> (-0.08%) ⬇️
app/dashboard/utils.py 42.17% <50.00%> (-0.05%) ⬇️
app/dashboard/admin.py 60.82% <100.00%> (+0.38%) ⬆️
app/dashboard/models.py 48.68% <100.00%> (+0.14%) ⬆️
app/townsquare/views.py 9.50% <0.00%> (-1.06%) ⬇️
app/app/urls.py 85.96% <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 483f70c...0c3e3cd. Read the comment docs.

@walidmujahid walidmujahid force-pushed the hackathon-project-page branch 5 times, most recently from 5a4fe46 to 3bc2faf Compare April 2, 2020 21:08
@walidmujahid walidmujahid force-pushed the hackathon-project-page branch 6 times, most recently from aae78f3 to 18ab1cc Compare April 10, 2020 17:51
@walidmujahid walidmujahid force-pushed the hackathon-project-page branch from 12c2c1d to d6667d6 Compare April 13, 2020 15:51
@walidmujahid
Copy link
Contributor Author

@walidmujahid walidmujahid force-pushed the hackathon-project-page branch from 134dac3 to 16b171a Compare April 15, 2020 12:02
@walidmujahid walidmujahid changed the title [WIP] - Hackathon Project Page Hackathon Project Page Apr 15, 2020
@androolloyd
Copy link
Contributor

androolloyd commented Apr 16, 2020

@walidmujahid You'll have to recreate your migrations. They are failing as is in Travis.

If you have any issues, message me on Gitcoin Chat and I can help.

@walidmujahid walidmujahid force-pushed the hackathon-project-page branch from 7987ded to a3e313d Compare April 16, 2020 17:11
@walidmujahid
Copy link
Contributor Author

@androolloyd Okay, the migration problem is fixed.

@walidmujahid walidmujahid force-pushed the hackathon-project-page branch from a3e313d to d00a709 Compare April 18, 2020 00:58
@walidmujahid
Copy link
Contributor Author

I will update this with most recent master and recreate migrations.

Has this been reveiwed @androolloyd? What changes are there that I need to make?

@androolloyd
Copy link
Contributor

I will have a look @walidmujahid

@walidmujahid walidmujahid force-pushed the hackathon-project-page branch from 90bef2f to 0c3e3cd Compare August 3, 2020 18:10
@danlipert danlipert merged commit 4f25869 into gitcoinco:master Aug 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hackathon List Page Update
10 participants