Merge branch 'dev' of...

client/package-lock.json

client/package.json

client/src/App.test.tsx

client/src/App.tsx

client/src/Main.tsx

client/src/actions/login.ts

client/src/actions/types.ts

client/src/actions/user.ts

client/src/index.css

client/src/index.tsx

client/src/pages/admin/AdminPage.test.tsx

client/src/pages/admin/AdminPage.tsx

client/src/pages/admin/components/CompetitionManager.tsx

client/src/pages/login/LoginPage.test.tsx

client/src/pages/login/LoginPage.tsx

client/src/pages/login/components/AdminLogin.test.tsx

client/src/pages/login/components/AdminLogin.tsx

client/src/pages/login/components/CompetitionLogin.tsx

client/src/pages/login/components/styled.tsx

client/src/pages/login/styled.tsx