Did I do the Wrong Thing at the Dance?

So we just had our big dance recently, I was going to ask the girl I have been in love with for seven years to go with me, as I did the year before(she said no) , but long before I could do that one of my close female friends asked me, and I didn't want to lose the chance so I said yes, long time later the girl I love told me she was going to ask me if the other girl didnt ask me, and keep in mind these two hate eachother. Anyways, at the dance, the first person I slow danced with was the girl I love, not my date to the dance, although my date didn't see. My date also knows I lover the other girl just for the record. Nearing the end of the dance I had danced with my Date twice and a bunch of jumping around dancing countless times. Then I thought it might be the last song so I went looking for my date who had got caught up with her girly friends, as I looked I found the girl I love who had her arms open and wanted to dance with me, so of course I couldn't say no to the love of my life, but during our first rotation I saw that my date had been looking for me and she was staring at us, jaw dropped. She couldn't tell I saw her though. Then I saw her talking to her best girl friend and I figured she was talking about what just happened, so when she walked away I asked her friend, and that was indeed what she was talking about. Thankfully, it Wasn't the last song though so I danced with my date for the last song, and even though I hated the poppy song(You're Amazing by Bruno Mars) I put a smile on and sang it with her because she loves it. So do you guys think it was right of me to dance with the girl I love? And do you think what I did after with my date should make everything okay? Or is there more to be done?