Skip to content
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

fix bugs #334

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix bugs #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/assets/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,12 @@ h2 {
.map-list {
position: relative;
width: 100vw;
height: calc(200vh - 70px);
height: 100vh;
z-index: 2;
background: white;
padding-top: 10px;
}

.map-list::-webkit-scrollbar {
display: none;
}
Expand Down
23 changes: 23 additions & 0 deletions src/components/dashboard/TextComponent/SimpleEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,32 @@ export function SimpleEditor(
return null;
}

const handleTitleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
setEditorState({
...editorState,
title: event.target.value,
});
};

return (
<div className="editor" style={{width: "100%"}}>
<div style={{ marginBottom: "16px" }}>
<label htmlFor="editor-title" style={{ display: "block", marginBottom: "8px" }}>
Title
</label>
<input
id="editor-title"
value={editorState.title}
onChange={handleTitleChange}
placeholder="Title"
style={{
width: "25%",
padding: "8px",
borderRadius: "4px",
border: "1px solid #ccc",
}}
/>
</div>
<BubbleMenu
className="bubble-menu-light"
tippyOptions={{ duration: 150 }}
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/TimeTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const TimeTable = (props) => {

const selectFormatter = (cell, row, index) => (
<FormCheck
type="radio"
type="checkbox"
label={days[index].day}
checked={days[index].selected}
onClick={() => {
Expand Down
22 changes: 16 additions & 6 deletions src/components/home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@ function Home({ firebaseAuth, firestore }) {
<span id="head-logo">
<b>MapScout</b> <img src={logo} alt="logo" />
</span>
<a href="https://www.netlify.com">
<img
src="https://www.netlify.com/v3/img/components/netlify-dark.svg"
alt="Deploys by Netlify"
/>
</a>
<div
style={{
display: "flex",
Expand Down Expand Up @@ -282,6 +276,22 @@ function Home({ firebaseAuth, firestore }) {
))}
</div>
</div>
<div
style={{
display: "flex",
justifyContent: "center",
alignItems: "center",
padding: "2rem 0",
}}
>
<a href="https://www.netlify.com">
<img
src="https://www.netlify.com/v3/img/components/netlify-dark.svg"
alt="Deploys by Netlify"
style={{ maxWidth: "100%" }}
/>
</a>
</div>
</div>
<Modal
show={showEmailModal}
Expand Down
4 changes: 2 additions & 2 deletions src/components/map/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ const Map = (props) => {
}}
>
{!showInfo && renderTagControl()}
<div style={{ "height": "calc(100% - 43px)", "overflowY": "scroll" }}>
<div style={{ "height": "100%", "overflowY": "scroll" }}>
<div
className={classNames("tag-row padder", {
"result-tutorial": isEmpty(activeProviders),
Expand Down Expand Up @@ -1123,7 +1123,7 @@ const Map = (props) => {
activeProviders[selectedIndex] &&
(
<div className="containerInfo d-flex flex-column" style={{ height: "80vh" }}>
<div className="padder d-flex flex-column" style={{ height: "calc(200vh - 70px)", overflowY: 'scroll' }}>
<div className="padder d-flex flex-column" style={{ height: "calc(200vh - 70px)" }}>
<div className="content d-flex flex-column">
<ProviderInfo item={activeProviders[selectedIndex]} categories={categories} />
<div className="mt-2">
Expand Down
4 changes: 2 additions & 2 deletions src/utils/Localization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const localizationStrings = new LocalizedStrings({
signOut: "Sign Out",
searchProviderName: "Search provider name",
searchZipcode: "Search locations",
hideLabel: "Hide map",
showLabel: "Hide map",
hideLabel: "Show map",
showLabel: "Show map",
languagesLabel: "Languages",
agesLabel: "Ages",
insuranceLabel: "Insurance",
Expand Down