Skip to content

Commit

Permalink
Merge pull request #40 from bliutech/moreCSS
Browse files Browse the repository at this point in the history
finished formatting
  • Loading branch information
bliutech authored Jul 17, 2023
2 parents db22ab4 + 35edd56 commit 4123460
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 20 deletions.
Binary file added client/src/assets/sebrus2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions client/src/components/DropdownMenu.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import styles from "../styles/components/DropdownMenu.module.css";

import { useEffect, useState } from "react";
function DropdownMenu() {
const [selected, setSelected] = useState("");
Expand All @@ -22,7 +20,7 @@ function DropdownMenu() {
};

return (
<select id="myDropdown" onChange={handleChange}>
<select onChange={handleChange}>
<option value="">Select a dataset</option>
{dropDownOptions.map((option) => (
<option key={option.value} value={option.value}>
Expand Down
5 changes: 3 additions & 2 deletions client/src/pages/ContributePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function ImageUploader() {
let file = event.target.files[0];
if (file === undefined) {
alert("Please upload a file");
setImage();
return;
}
console.log(file);
Expand All @@ -39,7 +40,6 @@ function ImageUploader() {
return (
<div className={styles.contribute}>
<p className={styles.header}>Upload Images</p>
<br></br>
<div>
<DropdownMenu selected={selected} />
</div>
Expand All @@ -51,13 +51,14 @@ function ImageUploader() {
onChange={handleImageChange}
></input>
<p></p>
{image === "" ? null : <img className={styles.image} src={image} />}
<p></p>
<input
type="button"
value="Upload"
className={styles.uploader}
onClick={() => handleSubmit()}
></input>
{image === "" ? null : <img src={image} alt="Upload image" />}
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions client/src/pages/DashboardPage.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useState } from "react";
import { useCookies } from "react-cookie";
import styles from "../styles/pages/DashboardPage.module.css";

function DashboardPage() {
document.title = "Dashboard";
Expand Down
3 changes: 2 additions & 1 deletion client/src/pages/DatasetPage.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { useState } from "react";
import { useCookies } from "react-cookie";
import styles from "../styles/pages/DatasetPage.module.css";

function DatasetPage() {
document.title = "Datasets";
const [cookies, setCookie, removeCookie] = useCookies("");
const [auth, setAuth] = useState(false);

return <p></p>;
return <div className={styles.data}></div>;
}

export default DatasetPage;
24 changes: 12 additions & 12 deletions client/src/pages/HomePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ function HomePage() {
document.title = "GSET23BSG";

return (
<div>
<text className={styles.logo}>SeBRUS</text>
<br></br>
<br></br>
<div className="home-image-container">
<img
alt="filler"
width="300"
height="200"
src="https://media.istockphoto.com/id/953499010/photo/blockchain-technology-structure-defocused.jpg?s=1024x1024&w=is&k=20&c=5x3Mmp9kIsHraabTUGK9Lbm9fJZ0PkbqW0WE_oYTF64="
/>
</div>
<div className={styles.home}>
{/* <text className={styles.logo}>SeBRUS</text>
<br></br>
<br></br>
<div className="home-image-container">
<img
alt="filler"
width="300"
height="200"
src="https://media.istockphoto.com/id/953499010/photo/blockchain-technology-structure-defocused.jpg?s=1024x1024&w=is&k=20&c=5x3Mmp9kIsHraabTUGK9Lbm9fJZ0PkbqW0WE_oYTF64="
/>
</div> */}
</div>
);
}
Expand Down
10 changes: 8 additions & 2 deletions client/src/styles/pages/ContributePage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@
margin: 50px;
border-radius: 30px;
width: 40vw;
height: 100vh;
padding-bottom: 30px;
overflow-x: visible;
overflow-y:auto;
}

.header {
color: snow;
margin: 20px;
margin-top: 30px;
}

.image {
width:90%;
object-fit: contain;
}

.file {
margin-left: 70px;
}
Expand Down
Empty file.
10 changes: 10 additions & 0 deletions client/src/styles/pages/HomePage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,13 @@ a:visited:active {
font-family: "Cairo";
font-weight: 550;
}


.home {
width: 100vw;
height: 100vh;
background-image: url(../../assets/sebrus2.png);
/* background-repeat: no-repeat; */
background-size:100vw 100vh;
opacity: 0.7;
}

0 comments on commit 4123460

Please sign in to comment.