Skip to content

Make setting availabilities more intuitive #145

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

Draft
innopoop wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft

Make setting availabilities more intuitive #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8d1f62
Created the foundation for setting multiple overrides at one time
innopoop Jul 25, 2021
70b93d2
Allow for user to switch between different dates for setting availabi…
innopoop Jul 31, 2021
b8250e9
Bring edit overrides content back into a modal
innopoop Aug 1, 2021
a167c8f
Take care of the case where new availabilities are checked for unavai…
innopoop Aug 2, 2021
d68c2c3
Update refetch to only occur after a bulk save
innopoop Aug 3, 2021
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
16 changes: 8 additions & 8 deletions public/static/DeleteIcon.svg
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.
27 changes: 13 additions & 14 deletions src/components/Authentication/AuthenticationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
import React, { useState } from "react";
import React, { useEffect, useState } from "react";
import { Text, Modal } from "../atomic";
import Login from "./Login";
import Signup from "./Signup";
Expand All @@ -18,16 +18,17 @@ const AuthenticationModal = ({
const [isLogin, setIsLogin] = useState(false);
const router = useRouter();

const reset = () => {
setIsLogin(false);
onClose();
}
useEffect(() => {
if (isOpen) {
setIsLogin(false);
}
}, [isOpen]);

return (
<Modal isOpen={isOpen} onClose={reset}>
<Modal isOpen={isOpen} onClose={onClose}>
<div className="flex flex-col w-144">
<button
onClick={reset}
onClick={onClose}
className="cursor-pointer focus:outline-none self-end"
>
<img src="/static/Close.svg" className="h-4 w-4" />
Expand All @@ -36,8 +37,8 @@ const AuthenticationModal = ({
<div>
<div className="flex flex-col space-y-1">
{programName ? (
<Text h3 b>
Login to join <Text i>{programName}</Text>
<Text h3>
Login to join <Text b>{programName}</Text>
</Text>
) : (
<Text h3 b>
Expand All @@ -58,8 +59,8 @@ const AuthenticationModal = ({
<div>
<div className="flex flex-col">
{programName ? (
<Text h3 b>
Create an account to join <Text i>{programName}</Text>
<Text h3>
Create an account to join <Text b>{programName}</Text>
</Text>
) : (
<Text h3 b>
Expand All @@ -75,9 +76,7 @@ const AuthenticationModal = ({
</div>
<div className="h-6" />
<Signup
onSuccessfulGoogleSignup={() => {
location.reload();
}}
onSuccessfulGoogleSignup={onClose}
onSuccessfulEmailSignup={() => {
router.push({
pathname: "/verify",
Expand Down
Loading