added org links on home page and removed add button on upload

DataManagementLab · Mar 2, 2024 · ae6282b · ae6282b
1 parent 4d1acd3
commit ae6282b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 11 deletions.
diff --git a/src/components/FileUpload/FileUpload.tsx b/src/components/FileUpload/FileUpload.tsx
@@ -10,6 +10,7 @@ import FileViewer from '../FileViewer/FileViewer';
 import { useSetLoadingScreen } from '../../providers/LoadingScreenProvider';
 import Organization from '../../types/Organization';
 import Icon from '../Icon/Icon';
+import Logger from '../../utils/Logger';
 
 interface Props {
 	organizationProp: Organization | undefined;
@@ -34,14 +35,18 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 		const selectedFiles = event.target.files;
 		if (selectedFiles === null) return;
 		setstagedFiles([...selectedFiles, ...Array.from(stagedFiles)]);
+		setTimeout(() => {
+			addFile([...selectedFiles, ...Array.from(stagedFiles)]);
+		}, 300);
 	};
 
-	const addFile = (force: boolean = false) => {
-		if (stagedFiles.length === 0) {
+	const addFile = (zfiles: File[], force: boolean = false) => {
+		if (zfiles.length === 0) {
+			Logger.log('No files to add');
 			return;
 		}
 		if (!force) {
-			for (const stagedFile of stagedFiles) {
+			for (const stagedFile of zfiles) {
 				for (const file of files) {
 					if (
 						file.name === stagedFile.name &&
@@ -51,7 +56,7 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 						showChoiceNotification(
 							'File upload',
 							`The file ${stagedFile.name} is already in the list. Do you want to add it anyway?`,
-							() => addFile(true),
+							() => addFile(zfiles, true),
 							() => {},
 							'Yes',
 							'No'
@@ -62,13 +67,13 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 			}
 		}
 
-		setFiles([...files, ...stagedFiles]);
+		setFiles([...files, ...zfiles]);
 		setstagedFiles([]);
 	};
 
-	const discardFiles = () => {
+	/* const discardFiles = () => {
 		setstagedFiles([]);
-	};
+	}; */
 
 	const removeFile = (index: number) => {
 		const newFiles = [...files];
@@ -166,14 +171,14 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 					multiple={true}
 				/>
 			</div>
-			<div className="hor mb">
+			{/* <div className="hor mb">
 				<button className="btn" onClick={() => addFile()}>
 					Add
 				</button>
 				<button className="btn" onClick={discardFiles}>
 					Discard
 				</button>
-			</div>
+			</div> */}
 			{files.map((file, index) => (
 				<li className="file" key={index}>
 					<div className="dot"></div>

diff --git a/src/views/Home/Home.scss b/src/views/Home/Home.scss
@@ -8,6 +8,9 @@
 	.helpIcon {
 		margin-left: 10px;
 	}
+	h2 {
+		margin-top: 70px;
+	}
 }
 
 .userStudy {

diff --git a/src/views/Home/Home.tsx b/src/views/Home/Home.tsx
@@ -38,7 +38,7 @@ function Home() {
 						Hi {username.slice(0, -2)}
 						<span className="db">{username.slice(-2)}</span> 👋
 					</h1>
-					<div className="userStudy">
+					{/* <div className="userStudy">
 						<h2>User Study</h2>
 						<p>
 							<b>
@@ -67,13 +67,47 @@ function Home() {
 								and download the file manually.
 							</i>
 						</p>
-					</div>
+					</div> */}
 					<h2>
 						T<span className="db">ip</span>
 					</h2>
 					<p>
 						<i>{getRandomTip()}</i>
 					</p>
+					<h2>
+						<span className="db">Or</span>ganization
+					</h2>
+					<p>
+						You can view your organizations{' '}
+						<span
+							onClick={() => {
+								navigate('/profile');
+							}}
+							style={{
+								cursor: 'pointer',
+								textDecoration: 'underline',
+							}}
+						>
+							here
+						</span>
+						.
+					</p>
+					<p>
+						Or you can create a new organization{' '}
+						<span
+							onClick={() => {
+								navigate('/organization/create');
+							}}
+							style={{
+								cursor: 'pointer',
+								textDecoration: 'underline',
+							}}
+						>
+							here
+						</span>
+						.
+					</p>
+
 					<h2>
 						Document <span className="db">Up</span>load{' '}
 						<i