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

src/components/App.tsx

@@ -28,7 +28,7 @@ class App extends React.Component<{}, AppState> {
       toggledLeft: false,
       toggledRight: false,
 			showSettings: false,
-			fileView: localStorage.getItem("fileView") || "folder",
+			fileView: localStorage.getItem("fileView") || "card",
     };
   }
 
@@ -100,7 +100,7 @@ class App extends React.Component<{}, AppState> {
           show={this.state.showSettings}
 					onHide={() => this.setState({ showSettings: false })}
 					fileView={this.state.fileView}
-					onCardViewClick={() => this.setFileView("folder")}
+					onCardViewClick={() => this.setFileView("card")}
 					onListViewClick={() => this.setFileView("list")}
         />
 

src/components/pages/ModuleResources/index.tsx

@@ -241,7 +241,7 @@ class ModuleResources extends React.Component<ResourcesProps, ResourceState> {
 
     const view = () => {
       switch(this.props.view) {
-        case "folder": return (
+        case "card": return (
           <>
             <FoldersView
               folders={this.folders()}