Skip to content

⚛️ User Actions Component #21

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

Merged
akramhany merged 3 commits into from
Dec 24, 2023
Merged

⚛️ User Actions Component #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac858e8
✨ feat: more btn styles
amir-kedis Dec 24, 2023
a928207
✨ feat: create user actions component
amir-kedis Dec 24, 2023
c66034e
🧹 chore: adjust my user type to be general
amir-kedis Dec 24, 2023
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
15 changes: 12 additions & 3 deletions client/src/assets/styles/components/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,24 @@
color: var(--grey-900);
}

&--primary-darker {
background-color: var(--primary-200);
color: var(--grey-900);
}

&--regular {
background-color: var(--grey-800);
color: var(--grey-100);
}

&--dark {
background-color: var(--primary-900);
color: var(--grey-50);
}

&--medium {
a {
font-size: 1rem;
}
font-size: 1rem;
padding-inline: 10px;
}

&--success {
Expand Down
12 changes: 12 additions & 0 deletions client/src/assets/styles/components/UserActions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.userActions {
&__container {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
direction: rtl;

.span-2-cols {
grid-column: 1 / span 2;
}
}
}
232 changes: 229 additions & 3 deletions client/src/components/common/UserActions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,234 @@

import "../../assets/styles/components/UserActions.scss";
import Button from "./Button";
import { useSelector } from "react-redux";

const ActionRoutes = {
"Assign Sector Leader": "/assign-sector-leader",
"Add Sector": "/add-sector",
"Add Scout": "/add-scout",
Statistics: "/statistics",
"Financial Management": "/financial-management",
"Send Notification": "/send-notification",
"Edit Scout": "/edit-scout",
"Reports and Councils": "/reports-and-councils",
Activities: "/activities",
Sessions: "/sessions",
"Start New Term": "/start-new-term",
Sectors: "/sectors",
"Record Captain Absence": "/record-captain-absence",
"Record Scouts Absence": "/record-scouts-absence",
Scores: "/scores",
Sector: "/sector",
};

export default function UserActions() {
const { userInfo } = useSelector((state) => state.auth);
const { type } = userInfo;

const GeneralCaptainActions = () => {
return (
<>
<Button
linkTo={ActionRoutes["Assign Sector Leader"]}
className="Button--medium Button--primary-darker"
>
تعيين قائد لقطاع
</Button>
<Button
linkTo={ActionRoutes["Add Sector"]}
className="Button--medium Button--regular"
>
إضافة قطاع
</Button>
<Button
linkTo={ActionRoutes["Add Scout"]}
className="Button--medium Button--regular"
>
إضافة كشاف
</Button>
<Button
linkTo={ActionRoutes.Statistics}
className="Button--medium Button--regular"
>
الاحصائيات
</Button>
<Button
linkTo={ActionRoutes["Financial Management"]}
className="Button--medium Button--regular"
>
إدارة الماليات
</Button>
<Button
linkTo={ActionRoutes["Send Notification"]}
className="Button--medium Button--regular"
>
إرسال إشعار
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
تعديل كشاف
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
التقارير والمجالس
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
الأنشطة
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
المواضيع
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium span-2-cols Button--success"
>
بدء فترة جديدة
</Button>
</>
);
};

const UnitCaptainActions = () => {
return (
<>
<Button
linkTo={ActionRoutes["Assign Sector Leader"]}
className="Button--medium Button--primary-darker"
>
تعيين قائد لقطاع
</Button>
<Button
linkTo={ActionRoutes["Statistics"]}
className="Button--medium Button--regular"
>
الاحصائيات
</Button>
<Button
linkTo={ActionRoutes["Send Notification"]}
className="Button--medium Button--regular"
>
إرسال إشعار
</Button>
<Button
linkTo={ActionRoutes["Add Scout"]}
className="Button--medium Button--regular"
>
إضافة كشاف
</Button>
<Button
linkTo={ActionRoutes["Edit Scout"]}
className="Button--medium Button--regular"
>
تعديل كشاف
</Button>
<Button
linkTo={ActionRoutes["Reports and Councils"]}
className="Button--medium Button--regular"
>
التقارير والمجالس
</Button>
<Button
linkTo={ActionRoutes["Activities"]}
className="Button--medium Button--regular"
>
الأنشطة
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
المواضيع
</Button>
<Button
linkTo={ActionRoutes["Sectors"]}
className="Button--medium span-2-cols Button--regular"
>
القطاعات
</Button>
<Button
linkTo={ActionRoutes["Record Captain Absence"]}
className="Button--medium span-2-cols Button--success"
>
تسجيل غياب القادة
</Button>
</>
);
};

const RegularCaptainActions = () => {
return (
<>
<Button
linkTo={ActionRoutes["Statistics"]}
className="Button--medium span-2-cols Button--regular"
>
الاحصائيات
</Button>
<Button
linkTo={ActionRoutes["Edit Scout"]}
className="Button--medium Button--regular"
>
تعديل كشاف
</Button>
<Button
linkTo={ActionRoutes["Reports and Councils"]}
className="Button--medium Button--regular"
>
التقارير والمجالس
</Button>
<Button
linkTo={ActionRoutes["Activities"]}
className="Button--medium Button--regular"
>
الأنشطة
</Button>
<Button
linkTo={ActionRoutes["Sessions"]}
className="Button--medium Button--regular"
>
المواضيع
</Button>
<Button
linkTo={ActionRoutes["Scores"]}
className="Button--medium Button--regular"
>
تقييم أفراد
</Button>
<Button
linkTo={ActionRoutes["Sector"]}
className="Button--medium Button--regular"
>
القطاع
</Button>
<Button
linkTo={ActionRoutes["Record Scouts Absence"]}
className="Button--medium span-2-cols Button--success"
>
تسجيل غياب الأفراد
</Button>
</>
);
};

return (
<div>UserActions</div>
)
<div className="userActions">
<div className="userActions__container ">
{{
general: <GeneralCaptainActions />,
unit: <UnitCaptainActions />,
regular: <RegularCaptainActions />,
}[type] || <p>لا يوجد أي إجراءات متاحة</p>}
</div>
</div>
);
}
4 changes: 3 additions & 1 deletion client/src/components/common/nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function Nav() {

const handleLogout = async () => {
try {
const res = await logout().unwrap();
await logout().unwrap();
toast.dark("تم تسجيل الخروج بنجاح");
dispatch(clearCredentials());
navigate("/");
Expand Down Expand Up @@ -75,6 +75,8 @@ export default function Nav() {
</div>
)}
</div>
{isLoading && <p>جاري التحميل...</p>}
{error && <p>{error}</p>}
</nav>
);
}
Expand Down
2 changes: 1 addition & 1 deletion server/database/fillDatabase.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ VALUES
"amir.kedis@gmail.com",
"$2a$10$82orQ3yruIoakCWUg/29KuXBwJlZiezJzxUW.8Ek.Jvc/MPLagDYS",
"male",
"regular"
"general"
) RETURNING *;