update App.js, Input.js, src/components/PopupCard/index.js and src/components/UploadFile/index.js

master
mahdi 3 years ago
parent da7b9258ef
commit ca1248c989
  1. 2
      src/App.js
  2. 8
      src/components/AnimatedInput/Input.js
  3. 32
      src/components/PopupCard/index.js
  4. 2
      src/components/UploadFile/index.js

@ -207,7 +207,7 @@ function App() {
{/* <ProfilePicNextToEachOther /> */} {/* <ProfilePicNextToEachOther /> */}
{/* ----------------------------$$$ end---------------------------- */} {/* ----------------------------$$$ end---------------------------- */}
<FileManager /> {/* <FileManager /> */}
{/* <GridListTable /> */} {/* <GridListTable /> */}

@ -4,7 +4,7 @@ import { useState } from "react";
import fixNumbers from "./fixNumbers"; import fixNumbers from "./fixNumbers";
const FormFields = ({ const Input = ({
defaultValue, defaultValue,
set, set,
label, label,
@ -23,7 +23,7 @@ const FormFields = ({
<div <div
onClick={onClick} onClick={onClick}
className={ className={
"h-full flex flex-row items-center rounded border mx-1 relative " + "h-full w-full flex flex-row items-center rounded border mx-1 relative " +
borderClassname + borderClassname +
(value ? "bg-white border rounded" : "bg-transparent") (value ? "bg-white border rounded" : "bg-transparent")
} }
@ -72,8 +72,8 @@ const FormFields = ({
); );
}; };
export default FormFields; export default Input;
FormFields.defaultProps = { Input.defaultProps = {
// borderClassname: "border-[#E0E0E0]", // borderClassname: "border-[#E0E0E0]",
}; };

@ -13,9 +13,11 @@ import OutlineInput from "../OutlineInput";
import OutlineTextarea from "../OutlineTextarea"; import OutlineTextarea from "../OutlineTextarea";
import ButtonNewDesign from "../ButtonNewDesign"; import ButtonNewDesign from "../ButtonNewDesign";
import ProfilePicNextToEachOther from "../ProfilePicNextToEachOther"; import ProfilePicNextToEachOther from "../ProfilePicNextToEachOther";
import Input from "../AnimatedInput/Input";
const PopupCard = ({ selectedChecklist }) => { const PopupCard = ({ selectedChecklist }) => {
const [activeInput, setActiveInput] = useState(false); // const [activeInput, setActiveInput] = useState(false);
const [checklist, setChecklist] = useState(0); const [checklist, setChecklist] = useState(0);
return ( return (
@ -35,17 +37,18 @@ const PopupCard = ({ selectedChecklist }) => {
className="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 w-full md:inset-0 h-modal md:h-full justify-center items-center" className="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 w-full md:inset-0 h-modal md:h-full justify-center items-center"
> >
<div className="relative p-4 w-full h-full md:h-auto"> <div className="relative p-4 w-full h-full md:h-auto">
<div className="w-7/12 mx-auto relative bg-white rounded-lg shadow dark:bg-gray-700"> <div className="max-w-[920px] mx-auto relative bg-white rounded-lg shadow dark:bg-gray-700">
<div className="flex justify-between items-start p-5 rounded-t"> <div className="flex justify-between items-start p-5 rounded-t">
{/* cancle icon */} {/* cancle icon */}
<CancleIcon backgroundColor={"bg-[#F8F8F8]"} icon={cancleIcon} /> <CancleIcon backgroundColor={"bg-[#F8F8F8]"} icon={cancleIcon} />
</div> </div>
{/* modalBody */} {/* modalBody */}
<div className="w-11/12 mx-auto"> <div className="mx-5">
{/* top */} {/* top */}
<div className="flex flex-row "> <div className="flex flex-row">
{/* right */} {/* right */}
<OutlineInput <Input />
{/* <OutlineInput
divWidth="w-1/2" divWidth="w-1/2"
textClr={activeInput ? "text-[#22577E]" : "text-[#06BACE]"} textClr={activeInput ? "text-[#22577E]" : "text-[#06BACE]"}
borderClr={activeInput ? "#22577E" : "#06BACE"} borderClr={activeInput ? "#22577E" : "#06BACE"}
@ -53,26 +56,11 @@ const PopupCard = ({ selectedChecklist }) => {
outlineTitleClr={activeInput ? "#22577E" : "#06BACE"} outlineTitleClr={activeInput ? "#22577E" : "#06BACE"}
onFocus={() => setActiveInput(true)} onFocus={() => setActiveInput(true)}
onBlur={() => setActiveInput(false)} onBlur={() => setActiveInput(false)}
/> /> */}
{/* divider */} {/* divider */}
<div className="border border-[#DBDBDB77] rounded mx-5"></div> <div className="border border-[#DBDBDB77] rounded mx-5"></div>
{/* left */} {/* left */}
<div date-rangepicker className="flex items-center w-1/2"> <Input />
<div className="relative w-full">
<img
src={calender}
className="absolute top-3 left-2"
alt=""
/>
<input
name="start"
type="text"
className="w-full border-2 border-blue-400 rounded-md text-sm h-12
focus:outline-none focus:border-[#22577E] focus:ring-1 focus:ring-[#22577E]"
placeholder="چهارشنبه 10 فروردین 1401 بماند به یادگار"
/>
</div>
</div>
</div> </div>
{/* divider */} {/* divider */}
<div className="border border-[#DBDBDB77] rounded my-5"></div> <div className="border border-[#DBDBDB77] rounded my-5"></div>

@ -48,7 +48,7 @@ export default class UploadFile extends Component {
{/* ? upload input File */} {/* ? upload input File */}
<div className="relative bg-white w-full flex flex-col items-center px-4 py-7 rounded-lg border-2 border-dashed border-blue-300 mt-5"> <div className="relative bg-white w-full flex flex-col items-center px-4 py-7 rounded-lg border-2 border-dashed border-blue-300 mt-5">
<div className=" "> <div className=" ">
<img src={file} className="" /> <img src={file} className="" alt="" />
<input <input
onChange={this.uploadFile} onChange={this.uploadFile}
type="file" type="file"

Loading…
Cancel
Save