Skip to content

Commit

Permalink
removed various warnings, didnt touch add product
Browse files Browse the repository at this point in the history
  • Loading branch information
@hayat-tamboli
hayat-tamboli committed Dec 1, 2021
1 parent 0b71d8b commit c95be9e
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 91 deletions.
51 changes: 24 additions & 27 deletions src/components/sidebar/sidebar.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ class Sidebar extends Component {
<div
className={
"inline-flex items-center justify-start w-full h-12 pl-2 pr-16 pt-2 pb-2.5 rounded-lg " +
(this.props.place == 1 ? "bg-purple-100" : "")
(this.props.place === "1" ? "bg-purple-100" : "")
}
>
<div className="flex space-x-8 items-center justify-start">
<DashboardIcon
className="h-5 "
stroke={this.props.place == 1 ? "#5E48E8" : "#8C8CA2"}
stroke={this.props.place === "1" ? "#5E48E8" : "#8C8CA2"}
/>
<p
className={
"text-sm font-medium " +
(this.props.place == 1
(this.props.place === "1"
? "text-indigo-600 "
: "text-gray-400")
}
Expand All @@ -50,18 +50,18 @@ class Sidebar extends Component {
<div
className={
"inline-flex items-center justify-start w-full h-12 pl-2 pr-16 pt-2 pb-2.5 rounded-lg " +
(this.props.place == 2 ? "bg-purple-100" : "")
(this.props.place === "2" ? "bg-purple-100" : "")
}
>
<div className="inline-flex space-x-8 items-center justify-start">
<BoxIcon
className="h-5 "
stroke={this.props.place == 2 ? "#5E48E8" : "#8C8CA2"}
stroke={this.props.place === "2" ? "#5E48E8" : "#8C8CA2"}
/>
<p
className={
"text-sm font-medium " +
(this.props.place == 2
(this.props.place === "2"
? "text-indigo-600 "
: "text-gray-400")
}
Expand All @@ -76,19 +76,18 @@ class Sidebar extends Component {
<div
className={
"inline-flex items-center justify-start w-full h-12 pl-2 pr-16 pt-2 pb-2.5 rounded-lg " +
(this.props.place == 3 ? "bg-purple-100" : "")
(this.props.place === "3" ? "bg-purple-100" : "")
}
>
<div className="inline-flex space-x-8 items-center justify-start">
<FileTextIcon className="h-5 " stroke={
this.props.place == 3
? "#5E48E8"
: "#8C8CA2"
}/>
<FileTextIcon
className="h-5 "
stroke={this.props.place === "3" ? "#5E48E8" : "#8C8CA2"}
/>
<p
className={
"text-sm font-medium " +
(this.props.place == 3
(this.props.place === "3"
? "text-indigo-600 "
: "text-gray-400")
}
Expand All @@ -103,19 +102,18 @@ class Sidebar extends Component {
<div
className={
"inline-flex items-center justify-start w-full h-12 pl-2 pr-16 pt-2 pb-2.5 rounded-lg " +
(this.props.place == 4 ? "bg-purple-100" : "")
(this.props.place === "4" ? "bg-purple-100" : "")
}
>
<div className="inline-flex space-x-8 items-center justify-start">
<UsersIcon className="h-5 " stroke={
this.props.place == 4
? "#5E48E8"
: "#8C8CA2"
}/>
<UsersIcon
className="h-5 "
stroke={this.props.place === "4" ? "#5E48E8" : "#8C8CA2"}
/>
<p
className={
"text-sm font-medium " +
(this.props.place == 4
(this.props.place === "4"
? "text-indigo-600 "
: "text-gray-400")
}
Expand All @@ -130,19 +128,18 @@ class Sidebar extends Component {
<div
className={
"inline-flex items-center justify-start w-full h-12 pl-2 pr-16 pt-2 pb-2.5 rounded-lg " +
(this.props.place == 5 ? "bg-purple-100" : "")
(this.props.place === "5" ? "bg-purple-100" : "")
}
>
<div className="inline-flex space-x-8 items-center justify-start">
<TruckIcon className="h-5 " stroke={
this.props.place == 5
? "#5E48E8"
: "#8C8CA2"
}/>
<TruckIcon
className="h-5 "
stroke={this.props.place === "5" ? "#5E48E8" : "#8C8CA2"}
/>
<p
className={
"text-sm font-medium " +
(this.props.place == 5
(this.props.place === "5"
? "text-indigo-600 "
: "text-gray-400")
}
Expand Down
28 changes: 1 addition & 27 deletions src/routes/auth/signup.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,11 @@
import React, { useState } from "react";
import React from "react";
import { Link } from "react-router-dom";
import "../../index.css";
import logo from "../../assets/fulllogo.png";
import illustration from "../../assets/signup.svg";
import google from "../../assets/google.svg";
import SignupForm from "../../components/forms/SignupForm";
// import { useDispatch, useSelector } from "react-redux";
// import { AuthActions } from "../../redux/actions";

const Signup = () => {
// const handleFormSubmit = (e) => {
// e.preventDefault();

// let email = e.target.elements.email?.value;
// let password = e.target.elements.password?.value;

// console.log(email, password);
// };
// const token = useSelector((state) => state.auth.user.token);
// const [email, setEmail] = useState("");
// const [password, setPassword] = useState("");
// const [companyName, setCompanyName] = useState("");
// const [location, setLocation] = useState("");
// // const [loading, setLoading] = useState(false);

// const dispatch = useDispatch();
// const submit = () => {
// // setLoading(true);
// console.log({ email, password, companyName, location });
// dispatch(AuthActions.signup({ email, password, companyName, location }));
// // <Redirect to="/dash/" />;
// };

return (
<div className="lg:flex">
{/* {token ? <Redirect to="/dash/" /> : null} */}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/delivery/createintegration.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ const CreateIntegration = () => {
<span class="ml-2 text-xs">
Give permission to access the data from the third party site and
provide with the neccesary services.{" "}
<a href="#" className="text-secondary">
<button className="text-secondary">
Click here to read terms and conditions.
</a>
</button>
</span>
</label>
</div>
Expand Down
33 changes: 6 additions & 27 deletions src/routes/notifications.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ class Notifications extends React.Component {
<th scope="col" className="relative px-6 py-3">
<span className="sr-only">order this item</span>
</th>
<th scope="col" className="relative px-6 py-3">
<span className="sr-only">done</span>
</th>
</tr>
</thead>
{this.props.isLoading ? (
Expand All @@ -56,7 +53,6 @@ class Notifications extends React.Component {
<Loader size="75" />
</td>
<td></td>
<td></td>
</tr>
</tbody>
) : (
Expand Down Expand Up @@ -88,19 +84,12 @@ class Notifications extends React.Component {
Out of stock
</span>
</td>
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<a href="/delivery">
<button className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8 flex">
Order this item
</button>
</a>
</td>
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<a
href="#"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8"
href="/delivery"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8 flex"
>
done
Order this item
</a>
</td>
</tr>
Expand Down Expand Up @@ -132,22 +121,12 @@ class Notifications extends React.Component {
Low stock
</span>
</td>
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<a href="/delivery">
<button
href="/delivery"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8 flex"
>
Order this item
</button>
</a>
</td>
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<a
href="#"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8"
href="/delivery"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8 flex"
>
done
Order this item
</a>
</td>
</tr>
Expand Down
22 changes: 14 additions & 8 deletions src/routes/vendors/vendors.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Vendor extends React.Component {
</Link>
</div>
{/* table */}
<div className="flex flex-col">
<div className="flex flex-col my-4">
<div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div className="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
<div className="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
Expand Down Expand Up @@ -106,7 +106,11 @@ class Vendor extends React.Component {
<div className="flex-shrink-0 h-10 w-10">
<img
className="h-10 w-10 rounded-full"
src={person.image}
src={
person.image
? person.image
: "https://github.com/medicotary/Medicotary/blob/main/src/assets/profile/toy%20faces-male-03.png?raw=true"
}
alt=""
/>
</div>
Expand All @@ -124,12 +128,14 @@ class Vendor extends React.Component {
<a href={person.phone}>{person.phone}</a>
</td>
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<a
href="#"
className="text-indigo-600 hover:text-indigo-900"
>
Edit
</a>
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
<a
href="#"
className="text-indigo-600 hover:text-indigo-900 rounded-lg border py-3 px-8"
>
Edit
</a>
</td>
</td>
</tr>
))}
Expand Down

0 comments on commit c95be9e

Please sign in to comment.