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

Triplicate conferences hacking the hashtag #7

Merged
merged 20 commits into from Aug 21, 2023
Merged

Triplicate conferences hacking the hashtag #7

merged 20 commits into from Aug 21, 2023

Conversation

antopalidi
Copy link
Member

@antopalidi antopalidi commented Aug 16, 2023 •
edited

fixes #5

microstudi
microstudi requested changes Aug 17, 2023
View reviewed changes
Copy link
Contributor

@microstudi microstudi left a comment

Choose a reason for hiding this comment

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

Nice job.
I've left you a comment to search for the conferences as the current one probably won't work properly.
We also need some system spec checking that it works properly.

Once this is done, we need to check in the conferences if they are corner cases where conferences that should not appear are there.

Also, we don't want the menu if there are not conferences of some type!

app/controllers/concerns/conferences_controller_override.rb Outdated Show resolved Hide resolved
config/secrets.yml Outdated Show resolved Hide resolved
config/initializers/custom_menu.rb Outdated Show resolved Hide resolved
microstudi
microstudi requested changes Aug 18, 2023
View reviewed changes
Copy link
Contributor

@microstudi microstudi left a comment •
edited

Choose a reason for hiding this comment

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

Thanks Anna,
this is almost done!

I've left you some comments with details.
A major thing that we should do is to assume that the "default" list of conferences do not show the ones with the filtering hashtags.
This also means that we only need 2 duplications, not 3 (we assume that the "global" conferences will go to the standard "conferences" menu).

We also need to handle the highlighted conferences respecting the filters

.rspec Outdated Show resolved Hide resolved
config/secrets.yml Outdated Show resolved Hide resolved
config/secrets.yml Outdated Show resolved Hide resolved
config/secrets.yml Outdated Show resolved Hide resolved
config/application.rb Outdated Show resolved Hide resolved
config/application.rb Outdated Show resolved Hide resolved
spec/system/conferences_spec.rb Outdated Show resolved Hide resolved
spec/system/conferences_spec.rb Show resolved Hide resolved
app/models/concerns/conference_override.rb Show resolved Hide resolved
microstudi
microstudi requested changes Aug 21, 2023
View reviewed changes
Copy link
Contributor

@microstudi microstudi left a comment

Choose a reason for hiding this comment

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

I found some details, please see to it

config/initializers/conferences_hacks.rb Show resolved Hide resolved
config/initializers/conferences_hacks.rb Outdated Show resolved Hide resolved
config/locales/en.yml Outdated Show resolved Hide resolved
app/models/concerns/conference_override.rb Outdated Show resolved Hide resolved
spec/models/conference_override_spec.rb Outdated Show resolved Hide resolved
@microstudi microstudi merged commit aa6ab6f into main Aug 21, 2023
1 check passed
@microstudi microstudi mentioned this pull request Sep 6, 2023
Closed
4 tasks
@antopalidi antopalidi self-assigned this Sep 7, 2023
microstudi added a commit that referenced this pull request Mar 5, 2024
@antopalidi @microstudi
Triplicate conferences hacking the hashtag (#7)
21226b7 
* add custom menu items

* controller override, add routes

* change add item menu

* Apply suggestions from code review

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* add options if to add_item

* add rspec, refactoring

* fix lint

* promoted conferences override, add tests

* remove global config from secret, refactoring controller's methods

* change tests

* add controller spec

* fix robocop

* move initializers and overrides to initializers folder

* refactoring model and tests

* Update config/locales/en.yml

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* fix initializers

* fix initialize

* gitignore

* add actions

* add config

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
microstudi added a commit that referenced this pull request Mar 6, 2024
@ElviaBth @microstudi @antopalidi
Upgrade 0.28 (#25)
f155e10 
* Triplicate conferences hacking the hashtag (#7)

* add custom menu items

* controller override, add routes

* change add item menu

* Apply suggestions from code review

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* add options if to add_item

* add rspec, refactoring

* fix lint

* promoted conferences override, add tests

* remove global config from secret, refactoring controller's methods

* change tests

* add controller spec

* fix robocop

* move initializers and overrides to initializers folder

* refactoring model and tests

* Update config/locales/en.yml

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* fix initializers

* fix initialize

* gitignore

* add actions

* add config

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* change color pallete in the css (#13)

* remove additional logo (#12)

* Filter conferences by colors (#14)

* Replace hashtags, Remove menu "triplication"

* Replace hashtags

* show buttons for existing conferences

* refactoring

* add original to deface

* cells override

* use a query string

* add tests

* add controller spec

* add spec checksums

* change default links color

* active links

* styles

* add promo video content block (#15)

* add promo video content block

* fix active processes cell

* fix var css

* update newsletter. add translations

* Create a new home content block with partner logos (#16)

* add content block

* add logos

* add logos

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* add partners to dockerfile

* fix dockerfile

* rebuild 1st partner

* filter order & small fixes

* filter order

* fix promoted conferences (#17)

* fix promoted conferences

* css corrections

* fix specs

* fix logos

* fix apostrophes

* add premsa i programa

* new program

* copy fix

* prevent non conferences to use hashtag hack

* add omniauth decidim

* update mailer styles

* update pwa

* latests fixes

* add missing envs

* Sort conferences (#19)

* sort conferences

* refactoring

* fix order

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* fix order again

* override image size media

* update agenda

* update newsletter & logos

* fix logos

* Add datetime in conferences cards (#24)

* fix test

* add datetime

* add start_time and start_date method

* fix overrides spec

* add chromedriver-version

* use start and end date

* add date format

* remove start and end time methods

* add system test

* pass rubocop

* add spec system test

* modify system test date fotmat

* modify system test date format

* update newsletter

* update news

* change decidim version

* remove social share button

* update package.json dependencies

* add tailwind.config to .gitignore

* update rubocop.yml

* update migrations code

* add missing mixin

* remove _decidim-settings.scss

* enable Custom HTML Header snippets

* include conference Override

* add Module Paginable to conference controllerOverride

* fix lib and system specs

* fix controller specs

* remove PR#24 changes

* assign main-footer color

* apply styles to active-processes section

* apply styles to newsletter button

* style sub_hero text description

* add styles to sub_hero button

* replace mini-footer with deface

* adjust mini-footer styles

* fix styles loader error

* replace main-footer with deface

* fix styles

* fix test

* add homepage footer spec

* add final newline to spec

* modify chromedriver setup

* add chromedriver-version

* set up chromedriver

* pass rubocop

* update newletter

* modify some content_blocks styles

* fix partner_logos content_blocks styles

* fix conferences filter

* remove participatory space floting help

* fix filter conferences bg class

* setup chromedriver

* bundle gems

* change chromedriver version

* change chromedriver version

* add chrome version to workflow

* fix test

* add cards filter-conferences border-color

* remove few old partners logo

* add locales_languages to mobile menu

* set partner logos size

* fix dockerfile

* fix dockerfile

* fix migrations

* fix migrations

* add awesome preview

* add margn bottom to navbar

* add .rspec-failures to gitignore

* remove cta-buttom override

* fix hero content-block-button

* change color menu

* modify item color menu

* design fixes

* update texts

* fix fonts and cells

* newsletter template

* logos sizes

* standarize footer

* prevent sql files to be commited

* add scripts with cookie conf

* update logo

* fix logos

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
Co-authored-by: Anna Topalidi <60363870+antopalidi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@microstudi microstudi microstudi requested changes

Assignees

@antopalidi antopalidi

Labels
⬆️ 0.28
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Triplicate conferences hacking the hashtag
3 participants
@antopalidi @microstudi @paarals