Skip to content

Surprise #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KennethRuan wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Surprise #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bd9bdc
Updated banner
KennethRuan Aug 20, 2023
eb1f7a4
Changed banner
KennethRuan Aug 20, 2023
3af454a
merge
KennethRuan Aug 20, 2023
2a5c7a2
x
KennethRuan Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ditto/public/images/banner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ditto/public/images/banner2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ditto/public/images/banner3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ditto/public/images/home-banner2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 59 additions & 57 deletions ditto/src/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,65 +85,67 @@ export default function Home() {
return (
<div className="home font-sans">
<title>harbour</title>
<div className="header-wrapper">
<div className="header text-primary">
<h1 className="font-title font-thin">harbour</h1>
</div>
</div>

<div className="main-bar-wrapper">
<div className="main-bar font-bold">

<span className="text-gray-300 font-serif">Take me to a </span>

<form className="prompt-select">
<DropdownMenu
name={"setting"}
options={lessons.map((item) => item.setting)}
value={prompt}
disabled={true}
onSelect={setPrompt}
/>
<div className="regenPrompt bg-primary" onClick={regenHandle}></div>
</form>

<span className="text-gray-300 font-serif">to practice</span>

<DropdownMenu
name={"difficulty"}
options={difficulties}
value={difficulty}
onSelect={setDifficulty}
/>
<DropdownMenu
name={"language"}
options={languages}
value={language}
onSelect={setLanguage}
/>
</div>

{/* Fake form button that uses state to update url */}

{selectedModuleName &&
<Link href={`/lessons/${selectedModuleName}?lang=${natLangToCode.get(language)}`}>
<div className="text-white bg-primary flex flex-row gap-2 px-4 py-3 rounded text-xl items-center justify-center">
<p> Ahoy! </p>
<FontAwesomeIcon
icon={faSailboat}
className="text-lg text-white cursor-pointer"
<div className="header text-primary flex flex-col justify-end">

{/* <h1 className="font-title font-thin">harbour</h1> */}

<div className="main-bar-wrapper ">
<div className="bg-[rgba(0,0,0,0.8)] py-6 px-10 rounded-3xl">
<div className="main-bar font-bold ">

<span className="text-gray-300 font-serif">Take me to the </span>

<form className="prompt-select">
<DropdownMenu
name={"setting"}
options={lessons.map((item) => item.setting)}
value={prompt}
disabled={true}
onSelect={setPrompt}
/>
<div className="regenPrompt bg-primary" onClick={regenHandle}></div>
</form>

<span className="text-gray-300 font-serif">to practice</span>

<DropdownMenu
name={"difficulty"}
options={difficulties}
value={difficulty}
onSelect={setDifficulty}
/>
<DropdownMenu
name={"language"}
options={languages}
value={language}
onSelect={setLanguage}
/>
</div>
</Link>
}
</div>
<div className="footer-wrapper">
<div className="footer">
<span className="text-gray-600">Made with ♡ during Hackthe6ix 2023 by Justin, Kenneth, Nicole & Roseanna</span>
{/* <FontAwesomeIcon
icon={faGithub}
className="text-lg text-accent group-hover:text-[rgba(255,255,255,.25)] "
/> */}
{/* Fake form button that uses state to update url */}
{selectedModuleName &&
<Link href={`/lessons/${selectedModuleName}?lang=${natLangToCode.get(language)}`}>
<div className="text-white bg-primary flex flex-row gap-2 px-4 py-3 rounded text-xl items-center justify-center">
<p> Ahoy! </p>
<FontAwesomeIcon
icon={faSailboat}
className="text-lg text-white cursor-pointer"
/>
</div>
</Link>
}
</div>
</div>



<div className="footer-wrapper">
<div className="footer">
<span className="text-gray-600">Made with ♡ during Hackthe6ix 2023 by Justin, Kenneth, Nicole & Roseanna</span>
{/* <FontAwesomeIcon
icon={faGithub}
className="text-lg text-accent group-hover:text-[rgba(255,255,255,.25)] "
/> */}
</div>
</div>
</div>
</div>
Expand Down
15 changes: 8 additions & 7 deletions ditto/src/styles/main_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ background: linear-gradient(189deg, rgba(27,52,64,1) 20%, rgba(10,18,27,1) 100%)
}

.header {
background-image: url("/images/home-banner.png");
background-position:center;
background-image: url("/images/banner3.png");
background-position: center;
width: 100%;
height: 100%;
background-size: cover;
color: white;
text-align: center;
z-index: 999;
display: block;
position: relative;
// z-index: 999;
// display: block;
position: absolute;

}

Expand Down Expand Up @@ -88,11 +88,12 @@ background: linear-gradient(189deg, rgba(27,52,64,1) 20%, rgba(10,18,27,1) 100%)
flex-direction: column;
justify-content: center;
align-items: center;
height: 27.5%;
margin-bottom: 100px;
height: 20%;
}

.main-bar{
width: 100%;
// width: 100%;
display: flex;
flex-direction: row;
padding: 20px;
Expand Down