Luminosity and beam-beam tune shifts with crossing angle and hourglass effects in e$^+$-e$^-$ colliders