Skip to content

Yohannes.organizations.and.results #26

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

Open
yoseflakew25 wants to merge 2 commits into
base: yosef.create.exam
Choose a base branch
from
Open

Yohannes.organizations.and.results #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f458757
fixed some ui
johannesteshome May 9, 2024
def5cfb
Merge branch 'yohannes.organizations.and.results' of https://github.c…
johannesteshome May 9, 2024
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
3 changes: 0 additions & 3 deletions client/src/Pages/CreateExamPages/CreateExam.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ const CreateExam = () => {
};





// Define a function to render the form based on the selected exam question type
const renderQuestionForm = (type, index) => {
switch (type) {
Expand Down
8 changes: 5 additions & 3 deletions client/src/Pages/OrganizationsDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const OrganizationsDetails = () => {
return (
<div>
<div className='my-4 bg-white rounded h-full flex'>
<div className='flex gap-2 items-center w-[70%] my-0'>
<div className='flex gap-2 items-center w-[80%] my-0'>
<img
className='w-1/2 rounded-full cursor-pointer'
src='https://img.freepik.com/free-vector/illustration-gallery-icon_53876-27002.jpg'
Expand Down Expand Up @@ -76,9 +76,11 @@ const OrganizationsDetails = () => {
/>
</div>
</div>
</div>
</div>

<Divider className="bg-primary-500 h-40 my-auto" type="vertical" />

<div className='flex flex-col items-start justify-center w-1/2 my-0 border-l-2 pl-2'>
<div className='flex flex-col items-start justify-center w-1/2 my-0 pl-2'>
<div className='flex gap-4'>
<p className='font-semibold'>Email:</p>
<p>{organizationDetail.email === "" ? "N/A" : organizationDetail.email }</p>
Expand Down
10 changes: 6 additions & 4 deletions client/src/Pages/OrganizationsPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ const OrganizationsPage = () => {
</span>
</div>

<div className='flex flex-wrap gap-8'>
<div className='flex flex-wrap gap-4'>
{isLoading ? (
<Loading />
) : (
Expand All @@ -233,14 +233,16 @@ const OrganizationsPage = () => {
key={index}
loading={loading}>
<div className='flex gap-2'>
<Link to={`${organization._id}`}>
<Link
className='w-[20%]'
to={`${organization._id}`}>
<img
className='w-12 h-12 rounded-full cursor-pointer'
src='https://img.freepik.com/free-vector/illustration-gallery-icon_53876-27002.jpg'
alt=''
/>
</Link>
<div className='flex flex-col items-start justify-center'>
<div className='flex flex-col items-start justify-center w-full'>
<div className='flex gap-2 items-center'>
<Link
to={`${organization._id}`}
Expand Down Expand Up @@ -284,7 +286,7 @@ const OrganizationsPage = () => {
</div>
<Pagination
current={current}
total={pages*10}
total={pages * 10}
onChange={onPaginationChange}
/>
</div>
Expand Down