Compare commits

..

9 Commits

Author SHA1 Message Date
victorAnumudu 3fe29accbf Added styling to calendar page 2023-02-16 16:45:48 +01:00
tokslaw 65a531922f Merge branch 'edit-reminder--1' of MyFit/users-myfit into master 2023-02-16 13:46:50 +00:00
Chukwumdiebube ae01f21c61 Styled text input 2023-02-16 14:23:08 +01:00
tokslaw 39dfa6b1dc Merge branch 'task-44-center-cat-text' of MyFit/users-myfit into master 2023-02-16 12:51:55 +00:00
jenkins d52f7ced65 subcriptiton top 2023-02-15 21:11:59 -05:00
ChineseChikki 5624666213 category text center aligned 2023-02-15 19:37:20 +01:00
tokslaw 40e5615cce Merge branch 'extend_session_expiry_time' of MyFit/users-myfit into master 2023-02-15 17:46:32 +00:00
victorAnumudu f36d80ac9a Clears localStorage when session expire or user logs out 2023-02-15 16:30:25 +01:00
victorAnumudu 886f58f5ea Extended session expiry time 2023-02-15 16:22:22 +01:00
10 changed files with 69 additions and 18 deletions
+2 -2
View File
@@ -14,7 +14,7 @@ export default function CalendarTable({ className }) {
return (
<div
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[620px] ${
className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[800px] ${
className || ""
}`}
>
@@ -41,4 +41,4 @@ export default function CalendarTable({ className }) {
</div>
);
}
}
-1
View File
@@ -2,7 +2,6 @@ import React, { useState } from "react";
import { Link, useNavigate } from "react-router-dom";
// import { toast } from "react-toastify";
import localImgLoad from "../../lib/localImgLoad";
import CountDown from "../Helpers/CountDown";
import Icons from "../Helpers/Icons";
export default function TrackItemCard({ datas, hidden = false }) {
@@ -9,7 +9,8 @@ export default function InputCom({
iconName,
inputHandler,
value,
maxLength
maxLength,
borderColor
}) {
return (
<div className="input-com">
@@ -21,12 +22,12 @@ export default function InputCom({
{label}
</label>
)}
<div className="input-wrapper border border-light-purple dark:border-[#5356fb29] w-full rounded-[50px] h-[58px] overflow-hidden relative ">
<div className={`input-wrapper border border-light-purple dark:border-[#5356fb29] w-full rounded-[50px] h-[58px] overflow-hidden relative ${borderColor}`}>
<input
placeholder={placeholder}
value={value}
onChange={inputHandler}
className="input-field placeholder:text-base text-base px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none"
className="input-field placeholder:text-base text-base px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none"
type={type}
id={name}
name={name}
+2
View File
@@ -26,6 +26,8 @@ export default function Layout({ children }) {
localStorage.removeItem('member_uuid');
localStorage.removeItem('session_token');
localStorage.removeItem('status');
localStorage.removeItem('layout');
localStorage.removeItem('measurement_units');
// toast.success("Come Back Soon", {
// icon: `🙂`,
// });
+2 -1
View File
@@ -128,6 +128,7 @@ export default function AddEditReminder({ className }) {
value={reminder.description}
inputHandler={onReminderInputChange}
maxLength={100}
borderColor='border border-pink'
/>
</div>
@@ -229,7 +230,7 @@ export default function AddEditReminder({ className }) {
value={reminder.notes}
placeholder="Provide a detailed description of your item."
rows="7"
className="w-full h-full px-7 py-4 border border-light-purple dark:border-[#5356fb29] rounded-[20px] text-dark-gray dark:text-white bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none resize-none"
className="w-full h-full px-7 py-4 border border-pink dark:border-[#5356fb29] rounded-[20px] text-dark-gray dark:text-white bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none resize-none"
onChange={onReminderInputChange}
maxLength={250}
/>
@@ -205,7 +205,6 @@ export default function ReminderTable({ className }) {
})
)
}
</tbody>
</table>
</div>
@@ -0,0 +1,36 @@
import React from "react";
import { Link } from "react-router-dom";
export default function SubScriptionTop({ className }) {
return (
<div
className={`create-nft w-full lg:h-[140px] shadow lg:flex rounded-lg justify-between items-center md:p-9 p-4 bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] -2 border-pink mb-10 ${
className || ""
}`}
>
<div className="lg:w-8/12 w-full mb-8 lg:mb-0">
<h1 className="text-2xl text-dark-gray dark:text-white font-bold mb-2">
Some how we will say the name of uout current Subscription
</h1>
<p className="text-base text-thin-light-gray tracking-wide">
Last paymant date + nect pay day
</p>
</div>
<div className="flex-1 flex lg:justify-end">
<div className="flex items-center space-x-5">
<Link
to="#"
className="w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
Some actions
</Link>
<Link to="#" className="text-dark-gray dark:text-white text-base">
<span className=" border-b dark:border-[#5356fb29] border-dark-gray font-medium">
terms and conditions
</span>
</Link>
</div>
</div>
</div>
);
}
+2 -1
View File
@@ -8,13 +8,14 @@ import CurrentBalanceWidget from "../MyWallet/CurrentBalanceWidget";
import Layout from "../Partials/Layout";
//import SellAnaliseStatics from "./SellAnaliseStatics";
import SellProductHistoryTable from "./SellProductHistoryTable";
import SubScriptionTop from "./SubScriptionTop";
import PricingListTable from "./PricingListTable";
export default function Subscriptions() {
return (
<>
<Layout>
<SubScriptionTop />
<div className="sell-page-wrapper w-full mb-10">
<div className="main-wrapper w-full">
<div className="current_balance-bit-sell-widget w-full lg:h-[436px] mb-11">
+14 -4
View File
@@ -684,6 +684,7 @@ TODO: Responsive ===========================
width: 100%;
min-height: 23.2rem;
border-radius: 7px !important;
@apply border border-pink !important;
}
.dark .react-calendar{
@@ -699,9 +700,13 @@ TODO: Responsive ===========================
.react-calendar__navigation{
margin-top: 2px;
margin-inline: 2px;
@apply text-pink !important;
}
.react-calendar__tile--active{color: #fff; font-weight: bold; background-color: #006edc;}
.react-calendar__tile--active{color: #fff; font-weight: bold;
/* background-color: #006edc; */
@apply bg-pink;
}
.dark .react-calendar__tile--active{color: #fff;}
.react-calendar__navigation button:enabled:hover,
@@ -717,14 +722,16 @@ TODO: Responsive ===========================
.react-calendar__month-view__weekdays__weekday abbr:where([title]){
text-decoration: none !important;
cursor: default;
@apply text-pink !important;
}
.react-calendar__tile{
border: 1px solid #cfd7e3 !important;
border-left: 0;
text-align: right;
height: 4.813rem !important;
height: 6.813rem !important;
transition: all 500ms;
/* @apply border border-pink !important; */
}
.dark .react-calendar__tile{background: #11131F;}
@@ -735,7 +742,7 @@ TODO: Responsive ===========================
appearance: none;
background: url("data:image/svg+xml,<svg height='10px' width='10px' viewBox='0 0 16 16' fill='%23000000' xmlns='http://www.w3.org/2000/svg'><path d='M7.247 11.14 2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 0 1 .753 1.659l-4.796 5.48a1 1 0 0 1-1.506 0z'/></svg>") no-repeat #fafafa;
background-position: calc(100% - 0.75rem) center !important;
border: 0.5px solid #E3E4FE;
@apply border border-pink;
}
.dark .reminder-select select {
@@ -764,6 +771,7 @@ TODO: Responsive ===========================
padding: 1.25rem;
background: #fafafa;
border-radius: 9999px;
@apply border border-pink;
}
.dark .react-date-picker__wrapper {border: 0.5px solid #25284F;}
@@ -788,4 +796,6 @@ TODO: Responsive ===========================
.react-date-picker__inputGroup__leadingZero{
cursor: pointer;
color: #374151;
}
}
.animate-fadeIn {@apply transition duration-300}
+7 -5
View File
@@ -18,6 +18,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
localStorage.removeItem('member_id');
localStorage.removeItem('member_uuid');
localStorage.removeItem('status');
localStorage.removeItem('layout');
localStorage.removeItem('measurement_units');
navigate("/login", { replace: true }); // redirects user to login page after session expires
};
@@ -30,15 +32,15 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
useEffect(()=>{
let sessionExpReminder = setTimeout(()=>{ //reminds user of session expiry after 4 mins 240000
let sessionExpReminder = setTimeout(()=>{ //reminds user of session expiry after 8 mins
expireSessionReminder()
}, 240000)
}, 480000)
let timeForSessionExpiry = setTimeout(()=>{ //reminds user of session expiry after 4 mins 300000
let timeForSessionExpiry = setTimeout(()=>{ //expire session after 10 mins
expireSession()
}, 300000)
}, 600000)
return ()=>{ // clears timeout side effect
return ()=>{ // clears timeout side effect7
clearTimeout(sessionExpReminder)
clearInterval(timeForSessionExpiry)
}