Merge branch 'master' of https://gitlab.doc.ic.ac.uk/edtech/scientia

README.md

package.json

src/components/App.tsx

src/components/atoms/AlertModal/index.tsx

src/components/atoms/FolderCard/index.tsx

src/components/atoms/IconButton/index.tsx

src/components/atoms/IconButton/style.module.scss

src/components/molecules/CategoryHeader/index.tsx

src/components/molecules/CategoryHeader/style.module.scss

src/components/molecules/CategoryList/index.tsx

src/components/molecules/ResourceDetailForm/index.tsx

.../SelectionView/components/SectionHeader/style.module.scss

src/components/pages/ModuleResources/components/ListView.tsx

...components/pages/ModuleResources/components/StaffView.tsx

...ts/pages/ModuleResources/components/UploadModal/index.tsx

.../ModuleResources/components/UploadModal/style.module.scss

src/components/pages/ModuleResources/index.tsx

src/components/pages/SettingsModal/index.tsx

src/constants/global.tsx

src/constants/routes.tsx