My wife is way better at cataloging our images than I am, but we use Dropbox for everything.

All images get put into a folder by event and year. We have IFTTT save all Facebook images and Instargram images into Dropbox as well.

For viewing, we use iPhoto mostly.