Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions resources/js/Pages/Auth/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ export default function Login({ canResetPassword, status }) {
return (
<AuthLayout>
<div className="layout:box-container landing-rounded-lg relative mx-auto w-3/4 bg-white pb-20 sm:pb-44">
<div className="mx-auto -mb-12 mt-12 w-full max-w-2xl p-4">
<div className="mx-auto mt-12 -mb-12 w-full max-w-2xl p-4">
<Head title="login" />
<img
className="w-1/3 pb-12"
src="https://storage.googleapis.com/staging-sst-01-staging-static/edvise-logo.svg"
alt="Edvise Logo"
/>

<div className="pb-8 text-2xl">Welcome! Log in to get started:</div>
<h1 className="mb-6 text-2xl">Welcome! Log in to get started:</h1>

<div className="mb-4 rounded-md border border-blue-200 bg-blue-50 p-3">
<p className="text-sm text-blue-800">
Expand Down Expand Up @@ -109,7 +109,7 @@ export default function Login({ canResetPassword, status }) {
<div className="flex items-center justify-end">
<Link
href={route('password.request')}
className="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
className="rounded-md text-sm text-gray-600 underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none"
>
Forgot your password?
</Link>
Expand Down
26 changes: 13 additions & 13 deletions resources/js/Pages/FileUpload.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default function FileUpload() {
);
}
return (
<div className="flex flex-col gap-y-24 pl-24 pr-24">
<div className="flex flex-col gap-y-24 pr-24 pl-24">
<BigSuccessAlert
mainMsg="Prediction initiated!"
msgDetails={
Expand Down Expand Up @@ -139,7 +139,7 @@ export default function FileUpload() {
}
if (!startPrediction) {
return (
<div className="flex flex-col gap-y-24 pl-24 pr-24">
<div className="flex flex-col gap-y-24 pr-24 pl-24">
<BigSuccessAlert mainMsg="Batch creation successful!"></BigSuccessAlert>
<div className="flex w-full items-end justify-end">
<button
Expand Down Expand Up @@ -197,7 +197,7 @@ export default function FileUpload() {
);
}
return (
<div className="flex flex-col pl-24 pr-24">
<div className="flex flex-col pr-24 pl-24">
<BigSuccessAlert
mainMsg="Data validation successful!"
msgDetails="Your data has been successfully validated. You can now proceed to name the folder and confirm the upload."
Expand Down Expand Up @@ -259,15 +259,15 @@ export default function FileUpload() {
Data can be uploaded to train a model or start an inference run for
new dashboard results.
</div>
<div className="flex w-full items-center justify-center pl-24 pr-24 pt-12">
<div className="flex w-full items-center justify-center pt-12 pr-24 pl-24">
<label
id="drop-zone"
className="flex min-h-32 w-full cursor-pointer flex-col items-center justify-center rounded-3xl border-2 border-dashed border-[#f79222] bg-gray-50 hover:bg-gray-100"
onDragOver={dragOverImageChange}
onDragLeave={dragLeaveChange}
onDrop={dropHandle}
>
<div className="flex flex-col items-center justify-center gap-y-2 pb-6 pt-5">
<div className="flex flex-col items-center justify-center gap-y-2 pt-5 pb-6">
<DocumentDuplicateIcon
aria-hidden="true"
className="size-6 shrink-0 text-gray-500"
Expand Down Expand Up @@ -331,15 +331,15 @@ export default function FileUpload() {
<button onClick={() => remove(f.name)}>
<TrashIcon
aria-hidden="true"
className="inline-block flex size-5 shrink-0 align-middle"
className="flex inline-block size-5 shrink-0 align-middle"
/>
</button>
</div>
</li>
))}
</label>
</div>
<div className="mx-auto flex w-full py-12 pl-24 pr-24">
<div className="mx-auto flex w-full py-12 pr-24 pl-24">
{files == undefined || files.length == 0 ? (
validationButtonDisable(true)
) : (
Expand Down Expand Up @@ -603,7 +603,7 @@ export default function FileUpload() {
type="text"
name="batchName"
id="batchName"
className="mt-1 w-full rounded-full border border-gray-300 p-2 shadow-sm focus:outline-none focus:ring-2 focus:ring-[#f79222]"
className="mt-1 w-full rounded-full border border-gray-300 p-2 shadow-sm focus:ring-2 focus:ring-[#f79222] focus:outline-none"
value={batchName}
onChange={e => setBatchName(e.target.value)}
placeholder="Inference Run 2024 Fall Cohort 1"
Expand All @@ -616,13 +616,13 @@ export default function FileUpload() {
<div className="flex w-full flex-row items-end justify-between pt-24">
<Link
href={route('file-upload')}
className="-ml-24 mb-4 rounded-full bg-gray-300 px-3 px-6 py-2 text-black"
className="mb-4 -ml-24 rounded-full bg-gray-300 px-3 px-6 py-2 text-black"
>
Back
</Link>
<div className="-mr-24 flex">
<button
className="mb-4 mr-4 rounded-full border border-[#f79222] bg-white px-3 px-6 py-2 font-semibold text-[#f79222]"
className="mr-4 mb-4 rounded-full border border-[#f79222] bg-white px-3 px-6 py-2 font-semibold text-[#f79222]"
onClick={() => {
// Also start the prediction so set it to true.
createBatch(true);
Expand Down Expand Up @@ -759,7 +759,7 @@ export default function FileUpload() {
<AppLayout
title="Upload Data"
renderHeader={() => (
<h2 className="text-xl font-semibold leading-tight text-gray-800">
<h2 className="text-xl leading-tight font-semibold text-gray-800">
FileUpload
</h2>
)}
Expand All @@ -768,11 +768,11 @@ export default function FileUpload() {
className="mx-12 mb-12 flex w-full flex-col rounded-3xl bg-white p-8"
id="main_area"
>
<div className="text-center text-5xl font-light">Upload Data</div>
<h1 className="text-center text-5xl font-light">Upload Data</h1>
<Steppers
currentStep={currentStep}
stepsDict={steps}
className="pb-12 pt-24"
className="pt-24 pb-12"
/>

{currentStep === 1
Expand Down