Hello,
Please, see the file attached. It is working but I am not sure if the changes I made is aligned with your exercise.
The Router is the DHCP server for vlan 20 (192.168.20.0/24) but I put the router and the switch in trunk using dot1q on the router side and trunk on the switch side.