Merge branch 'dev' into feat/edit-user-connection
Showing
- package.json 2 additions, 0 deletionspackage.json
- src/App.test.tsx 0 additions, 9 deletionssrc/App.test.tsx
- src/App.tsx 39 additions, 16 deletionssrc/App.tsx
- src/components/layout/AdminLayout.tsx 44 additions, 0 deletionssrc/components/layout/AdminLayout.tsx
- src/components/layout/TeacherLayout.tsx 43 additions, 0 deletionssrc/components/layout/TeacherLayout.tsx
- src/components/layout/index.tsx 0 additions, 24 deletionssrc/components/layout/index.tsx
- src/components/modals/material.tsx 569 additions, 181 deletionssrc/components/modals/material.tsx
- src/components/modals/module.tsx 40 additions, 17 deletionssrc/components/modals/module.tsx
- src/components/navbar/LogoutPopup.tsx 36 additions, 8 deletionssrc/components/navbar/LogoutPopup.tsx
- src/components/navbar/Navbar.tsx 25 additions, 7 deletionssrc/components/navbar/Navbar.tsx
- src/components/navbar/items/items.tsx 56 additions, 42 deletionssrc/components/navbar/items/items.tsx
- src/components/navbar/sidenav/sidenav.tsx 2 additions, 2 deletionssrc/components/navbar/sidenav/sidenav.tsx
- src/index.tsx 1 addition, 7 deletionssrc/index.tsx
- src/pages/Home.tsx 3 additions, 3 deletionssrc/pages/Home.tsx
- src/pages/Login.tsx 1 addition, 1 deletionsrc/pages/Login.tsx
- src/pages/Materials.tsx 214 additions, 93 deletionssrc/pages/Materials.tsx
- src/pages/Register.tsx 2 additions, 3 deletionssrc/pages/Register.tsx
- src/pages/admin/AdminRegister.tsx 188 additions, 18 deletionssrc/pages/admin/AdminRegister.tsx
- src/pages/admin/PremiumCourses.tsx 2 additions, 4 deletionssrc/pages/admin/PremiumCourses.tsx
- src/react-app-env.d.ts 0 additions, 1 deletionsrc/react-app-env.d.ts
Please register or sign in to comment