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 microcosms to the website #2390

Open
wants to merge 71 commits into
base: master
from

Conversation

@openbrian
Copy link

openbrian commented Oct 13, 2019

Microcosms is a feature to support (local) groups of mappers and the events they participate in.

At this time the PR is just for early feedback and discussion.

All of this code is tested using cucumber. To test run bundle install; bundle exec rake cucumber.

Please submit bugs and feature requests at this repo https://github.com/openstreetmap/openstreetmap-website.

openbrian added 30 commits Aug 26, 2019
…button is available to non-signed in users which should redirect to login.
Also convert event_attendance controller to event_attendances (plural).

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
diff --git a/app/assets/stylesheets/event_attendances.scss b/app/assets/stylesheets/event_attendances.scss
diff --git a/app/controllers/event_attendances_controller.rb b/app/controllers/event_attendances_controller.rb
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
diff --git a/app/helpers/event_attendances_helper.rb b/app/helpers/event_attendances_helper.rb
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/features/member.feature b/features/member.feature
diff --git a/test/controllers/event_attendances_controller_test.rb b/test/controllers/event_attendances_controller_test.rb
@openbrian

This comment has been minimized.

Copy link
Author

openbrian commented Oct 15, 2019

Is this code up for testing somewhere?

@mmd-osm Not yet. But it will be soon. I need to rip out hard coded things for my SotM US presentation.

I created a separate branch to add oauth via osm.org, so people's OSM account will get them into this demo site. I'll create a "deployment" branch and merge these branches together before deploying to my server.

I want to use Docker, but not sure that work is ready to use yet.

Let me know if you all are interested in that omniauth branch. I can push in a separate PR. It's much like the previous one added for wikipedia.

@mmd-osm

This comment has been minimized.

Copy link
Contributor

mmd-osm commented Oct 15, 2019

@tomhughes : I wonder if https://github.com/openbrian/osm-microcosms could be safely deployed on the dev instance already, and if not, what parts would still need some work.

@openbrian : I wouldn't spend too much time on pulling in users from osm.org via oauth, at least in the current development phase. Creating some new test account on the (or some) dev instance looks perfectly fine to me.

Dev site deployments get updated automatically once you push some new commits. That's really helpful for a fast review cycle.

openbrian added 21 commits Oct 15, 2019
…hat is already installed.
… manually. When rake dumped the database they were removed from the file. Despite PR #2383, at this time, the statements should still be in the file.
@tomhughes

This comment has been minimized.

Copy link
Member

tomhughes commented Oct 27, 2019

Please don't pollute the commit history with nonsense - if the previous build failed then adding some whitespace to trigger a new one isn't going to fix anything.

If you need help understanding why the build is failing then please ask instead of randomly moving lines around and inserting whitespace.

Likewise if you really need a new build triggering then ask as I can trigger a rebuild without polluting the commit history.

@openbrian

This comment has been minimized.

Copy link
Author

openbrian commented Oct 27, 2019

I understand the builds are isolated and deterministic. I just activated Travis builds for my fork (https://travis-ci.org/openbrian/osm-microcosms/).

@mmd-osm

This comment has been minimized.

Copy link
Contributor

mmd-osm commented Nov 6, 2019

As I was setting up a local Docker container, I thought we could add a few screenshots to highlight how microcosms look like at the moment. So here we go:

List of all microcosms

all_microcosms

Details for one microcosm

single_microcosm

Creating a new microcosm

new_microcosm

Microcosm member list

microcosm_members

Edit microcosm member list

edit_membership

List of events

list of events

Creating a new microcosm event

creating_new_event
creating_new_event2

Joining a microcosm event

join_event

@openbrian

This comment has been minimized.

Copy link
Author

openbrian commented Nov 6, 2019

Beautiful, aside from all the hard coded thing 🙄 I've been busy lately with upgrading my server, but when I get back into OSM, I'll be undoing the hard coded things and resolving more issues from above. Thanks @mmd-osm .

See https://xkcd.com/2224/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.