Upgrade Cpu or Gpu first?

I'm considering whether to upgrade my processor (Ryzen 5 2600x) or my graphics card (GTX 1070 ti aero) first. I mainly play Fortnite and Rainbow. As a graphics card I would probably get a 3060 ti or 3070, but I'm not entirely sure about the processor.

I would almost start with the processor. Not that a 3070 would not run well with a 2600x but with a 3600 (or higher) it would be much better.

Also the question is what kind of power supply you have.

I would upgrade the graphics card, because if you have a good processor now you have 70% a bottleneck, plus the 2600x is really good