-
- You have
-
- {totalMissedUpdates} missed
-
- {updateType} updates
-
-
- Let's try to avoid having zero days
-
+
+
+
+ You have
+
+ {totalMissedUpdates} missed
+
+ {updateType} updates
+
+
+ Let's try to avoid having zero days
+
+
);
};
diff --git a/src/components/ProgressForm/ProgressLayout.tsx b/src/components/ProgressForm/ProgressLayout.tsx
index 6537ba17c..7aeee00bf 100644
--- a/src/components/ProgressForm/ProgressLayout.tsx
+++ b/src/components/ProgressForm/ProgressLayout.tsx
@@ -20,12 +20,10 @@ const ProgressLayout: FC = () => {
return (
<>
-
+
Task Updates
On {getCurrentDate()}
diff --git a/src/components/Tabs/Tabs.module.scss b/src/components/Tabs/Tabs.module.scss
index 93badc756..6ea7c2ded 100644
--- a/src/components/Tabs/Tabs.module.scss
+++ b/src/components/Tabs/Tabs.module.scss
@@ -1,18 +1,51 @@
$theme-grey: #d4d4d5;
+$theme-grey-light: #f1f1f5;
+$gray-shade-color: #808080;
+$gray-shade-color2: #5c5b5b;
+$theme-dark-grey: #a1a5b7;
+$theme-pink: #e30062;
.tabButton {
+ border: none;
+ border-bottom: 1.8px solid $theme-grey;
+ font-size: 0.85rem;
+ font-weight: bold;
+ color: $gray-shade-color;
+ background: var(--toastify-color-light);
+ padding: 0.45rem 0.8rem;
+ border-radius: 0.2rem 0.2rem 0 0;
+ cursor: pointer;
+}
+
+.tabButton:hover {
+ color: $gray-shade-color2;
+}
+
+.tabButton:active {
+ background-color: $theme-grey-light;
+}
+
+.active {
+ color: var(--toastify-color-dark);
+ border: 1.8px solid $theme-grey;
+ border-bottom: none;
+ background: var(--toastify-color-light);
+}
+
+.featureFlagTabButton {
background: white;
border: none;
padding: 12px 8px 8px;
font-size: 0.8em;
- border-radius: 5px 5px 0 0;
- border-bottom: 1px solid $theme-grey;
+ border: none;
cursor: pointer;
+ color: $theme-dark-grey;
}
-.active {
+.featureFlagActiveTab {
font-weight: bold;
- border: 1px solid $theme-grey;
- border-bottom: none;
background: white;
+ border: none;
+ border-bottom: 3px solid $theme-pink;
+ color: black;
}
diff --git a/src/components/Tabs/index.tsx b/src/components/Tabs/index.tsx
index a6fceb1d7..67f99e895 100644
--- a/src/components/Tabs/index.tsx
+++ b/src/components/Tabs/index.tsx
@@ -1,11 +1,13 @@
import styles from '@/components/Tabs/Tabs.module.scss';
-import { Tab } from '@/interfaces/task.type';
import { COMPLETED, DONE, AVAILABLE, UNASSINGED } from '@/constants/constants';
+import { Tab, tasksCountObject } from '@/interfaces/task.type';
+import { useRouter } from 'next/router';
type TabsProps = {
tabs: Tab[];
onSelect: (tab: Tab) => void;
activeTab: Tab;
+ tasksCount: tasksCountObject;
};
function changeName(name: string) {
if (name === COMPLETED) {
@@ -17,20 +19,38 @@ function changeName(name: string) {
}
}
-const Tabs = ({ tabs, onSelect, activeTab }: TabsProps) => (
- <>
- {tabs.map((tab: Tab) => (
-
- ))}
- >
-);
+const Tabs = ({ tabs, onSelect, activeTab, tasksCount }: TabsProps) => {
+ const router = useRouter();
+ const { query } = router;
+ const isFeatureFlagOn = query.dev === 'true';
+ return (
+ <>
+ {tabs.map((tab: Tab) => (
+
+ ))}
+ >
+ );
+};
export default Tabs;
diff --git a/src/components/standup/index.tsx b/src/components/standup/index.tsx
index 40e774614..160207471 100644
--- a/src/components/standup/index.tsx
+++ b/src/components/standup/index.tsx
@@ -73,12 +73,11 @@ const StandUpContainer: FC = () => {
return (
<>