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

Add flag to display showcase #7087

Merged
merged 12 commits into from
Jul 28, 2020
Merged

Add flag to display showcase #7087

merged 12 commits into from
Jul 28, 2020

Conversation

zoek1
Copy link
Contributor

@zoek1 zoek1 commented Jul 10, 2020

Description
  • Add ability to turn on showcase tab in admin.
  • If showcase is toggled on in admin, hide all tabs except Projects and Showcase.
  • Editor should be able to remove a spotlight (add a link to remove)

image
image

Add showcase to hackathon list

image

Refers/Fixes

#7083

Testing

https://www.loom.com/share/4d89bf4775d9415d98d66360840785e4

@codecov
Copy link

codecov bot commented Jul 10, 2020

Codecov Report

Merging #7087 into master will increase coverage by 0.03%.
The diff coverage is 34.37%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7087      +/-   ##
==========================================
+ Coverage   26.29%   26.33%   +0.03%     
==========================================
  Files         300      300              
  Lines       29393    29424      +31     
  Branches     4322     4327       +5     
==========================================
+ Hits         7729     7748      +19     
- Misses      21393    21404      +11     
- Partials      271      272       +1     
Impacted Files Coverage Δ
app/app/urls.py 86.20% <ø> (ø)
...perftools/management/commands/create_page_cache.py 0.00% <0.00%> (ø)
app/dashboard/models.py 48.54% <28.57%> (-0.10%) ⬇️
app/dashboard/admin.py 60.44% <50.00%> (-0.16%) ⬇️
app/dashboard/router.py 39.35% <66.66%> (+0.48%) ⬆️
app/dashboard/utils.py 42.57% <0.00%> (+0.35%) ⬆️
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 d6b795a...92edf5c. Read the comment docs.

Copy link
Contributor

@PixelantDesign PixelantDesign left a comment

Choose a reason for hiding this comment

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

looks great! Thanks for the quick turn around!

@octavioamu
Copy link
Contributor

Nice, just one point, turning off all the others tabs will be a problem, mostly for sponsors trying to find their prizes cc @PixelantDesign

@octavioamu
Copy link
Contributor

@zoek1 The code looks good but I really feel the only tab need to turn off is the guide, the rest should be there, so I can keep chatting with people on townsquare or chat, see the participants tabs, I want to see the others participants not only the winners and for sure keep the activity on townsquare.

@octavioamu
Copy link
Contributor

  • this is the card of a finished hackathon, prizes are still important but maybe we can add the showcase link there
    image

@PixelantDesign
Copy link
Contributor

PixelantDesign commented Jul 14, 2020

yes agree @octavioamu
trying to simplify things, lets roll outwith the tabs on and see how we feel

@octavioamu
Copy link
Contributor

octavioamu commented Jul 14, 2020

@zoek1 can you do that changes?

  • Turn off only guide an register button on the prize explorer
  • Add the button to showcase on the pass hackathon list

@octavioamu
Copy link
Contributor

Thanks @zoek1

@PixelantDesign
Copy link
Contributor

how are we looking on this ticket? could we get into Monday deploy? @octavioamu @danlipert @thelostone-mc ?

@androolloyd
Copy link
Contributor

@zoek1 travis seems to be complaining about the import order, and needs the base branch merged in

Copy link
Contributor

@androolloyd androolloyd left a comment

Choose a reason for hiding this comment

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

Fix up travis and lgtm.

Copy link
Contributor

@androolloyd androolloyd left a comment

Choose a reason for hiding this comment

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

Fix up travis and lgtm.

@PixelantDesign
Copy link
Contributor

@danlipert @octavioamu @thelostone-mc could we have a review please? thanks!

@PixelantDesign
Copy link
Contributor

could we get this in Monday's deploy? @danlipert @octavioamu @thelostone-mc

@danlipert danlipert merged commit 0745546 into gitcoinco:master Jul 28, 2020
walidmujahid added a commit to walidmujahid/web that referenced this pull request Jul 28, 2020
walidmujahid added a commit to walidmujahid/web that referenced this pull request Aug 3, 2020
danlipert pushed a commit that referenced this pull request Aug 4, 2020
* add nav

* finish new hackthon section;move subscription section

* update hackathon card

* add tribes section

* add featured hackathon section in header

* style: center text;change margins

* style: remove gutter width;resize image

* style: add image height;remove margins from featured image

* add customisable width/height for featured logo

* style: handle smaller screens

* fix: recreate migrations

* add no-featured-hackathon section

* TODO: filtering tribes

TODO: if no hackathon is ongoing, default to tribes who participated in
the most number of hackathons.
TODO: if no hackathon going, show tribes that most recently
listed their bounties.

* style: update margins

* fix: stop changing featured bool on each save

* style: fix tribes grid and columns

add rows to help space elements out properly and fix grid sizes.

* fix: duplicate listing of same tribe

* handle showing tribes from most recent finsihed hackathon

* feat: set a default tab on hackathons list

if current hackathons exists, the tab is defaulted to current.
if there are no current hackathons, the default tab is upcoming.
otherwise, the default tab is finish.

* refactor: make variables plural

* show top four tribes if no current or upcoming hackathon exists

* fix migrations

* refactor: move repetitive code into `get_hackathon_events`

* rename get_hackathon_events to get_hackathon_event

* refactor tribes filtering

* move functions to dashboard.utils

`get_hackathon_event`, `get_tribe`, `tribe_fields`,
and `hackathons_funded`

* fix migrations

* fix: missing import

* fix: recreate migrations

* Fix styles and index errors

* Remove unused images and fix extension

* feat: add workshops

* fix: misspelled attribute

* add speaker avatar;finish workshops section

* fix: recreate migrations

needed merges and create missing migrations for commit:
c6510fd

* remove uneeded margin

* update copy

* fix: recreate migrations

* fix: padding and copy position

* fix: recreate migrations

* fix:recreate migrations

* add back prize amount and number of hackers

* fix: recreate migrations

* fix subscription sextion layout

* fix hackathon section

better adjust to changes introduced in:
#6722
#6766

* fix: card-logo larger than card-header for some images

* add back deleted curly

* fix: skip overhead of dropdown of profile instances

* adjust workshop layout

- remove `workshop-cover` class -was made an ID in error
- set a `width` for speaker avatar
- set width for workshop title instead of using a column

* remove cover_max_width from HackathonWorkshop model

* recreate migrations

* adjust layout for hackathon card prize amount and builders row

* recreate migrations

* receate migrations

* recreate migrations

* recreate migrations

* recreate migrations

* refactor: use bootstrap position-relative class

* refactor: remove commented lines

* recreate migrations

* recreate mgrations

* remove featured hackathon

* remove workshops section

* remove tribe sections and trbe util functions

* updste header background, logo and details

* remove value of prizes and number of builders from card

* recreate migrations

* use footer colour

* update subscription section

* update tab section

add a third item to the tab tuple to act as title in views.
previous version (title, count)
new version (id, title, count)

done so I do not have rework it too much. This way, the title can be variable
and can be renamed fairly simply while the the id remains constant.

* update form button padding

* add hackathon summary to model and template

* remove lines in pre_save signal pertaining to removal of featured hackathon from model

* fix display of hackathon summary

* decrease padding to keep buttons on same line

* maek hackathon summary font smaller

* set secondary buttons

* add sponsors list to hackathon card

* remove count from tabs

* adjust tablist sizing on smaller screens

* remove styles and refactor

* increase width of cards, logo sizes, and handle sizes for smaller screens

* update cards

* add showcase button

* recreate migrations

* recreate migrations

* remove unused files

* style: revert to previous style

* style: add line

* style: use `let`

* use zoek1's updates

changes from PR #7087 :

0745546#diff-704cfd344337eee34d60c4265c814b3f

* recreate migrations

Co-authored-by: Miguel Angel G <[email protected]>
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.

7 participants