Skip to content

Commit

Permalink
Merge pull request #1683 from gtech-mulearn/dev
Browse files Browse the repository at this point in the history
Dev Server
  • Loading branch information
aswanthabam authored Nov 5, 2024
2 parents 6022168 + 97aa636 commit d35898b
Show file tree
Hide file tree
Showing 9 changed files with 695 additions and 33 deletions.
61 changes: 33 additions & 28 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import DashboardLC from "./modules/Dashboard/modules/LearningCircleV2/pages/dash
import YourLC from "./modules/Dashboard/modules/LearningCircleV2/pages/YourLC/YourLC";
import MoreInfoLC from "./modules/Dashboard/modules/LearningCircleV2/pages/moreInfoLC/MoreInfoLC";
import AttendeeReport from "./modules/Dashboard/modules/LearningCircleV2/pages/AttendeeReport/AttendeeReport";
import LCReport from "./modules/Dashboard/modules/LearningCircleV2/pages/LCReport/LCReport";

const Profile = lazy(
() => import("./modules/Dashboard/modules/Profile/pages/Profile")
Expand Down Expand Up @@ -724,10 +725,10 @@ function App() {
/>
)
},
{
path: "learning-circle",
element: <LearningCircleLandingPage />
},
// {
// path: "learning-circle",
// element: <LearningCircleLandingPage />
// },
{
path: "learningcircle",
element: <LearningCircleLanding />
Expand All @@ -753,33 +754,37 @@ function App() {
element: <AttendeeReport />
},
{
path: "learningcircle/create-meetup/:circle_id",
element: <CreateLCMeetup />
},
{
path: "learning-circle/meetup/:id",
element: <LcMeetupIfo />
},
{
path: "learning-circle/meetup/:id/attendee-report",
element: <LcReportAttendee />
},
{
path: "learning-circle/details/:id",
element: <LearningCircle />
},
{
path: "learning-circle/dashboard/:id",
element: <LcDashboard />
},
{
path: "learning-circle/find-circle",
element: <FindCircle />
path: "learningcircle/report/:meet_id",
element: <LCReport />
},
{
path: "learning-circle/create-circle",
element: <LearningCircleCreate />
path: "learningcircle/create-meetup/:circle_id",
element: <CreateLCMeetup />
},
// {
// path: "learning-circle/meetup/:id",
// element: <LcMeetupIfo />
// },
// {
// path: "learning-circle/meetup/:id/attendee-report",
// element: <LcReportAttendee />
// },
// {
// path: "learning-circle/details/:id",
// element: <LearningCircle />
// },
// {
// path: "learning-circle/dashboard/:id",
// element: <LcDashboard />
// },
// {
// path: "learning-circle/find-circle",
// element: <FindCircle />
// },
// {
// path: "learning-circle/create-circle",
// element: <LearningCircleCreate />
// },
{
path: "organization-transfer",
element: (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
.popup {
position: fixed;
backdrop-filter: blur(5px) contrast(100%);
-webkit-backdrop-filter: blur(5px) contrast(100%);
top: 0;
left: 0;
height: 100%;
width: 100%;
z-index: 50;
display: flex;
transition: 0.3s ease;
/* transform: scale(0); */
flex-direction: column;
align-items: center;

.container {
background: #fff;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 20px;
border-radius: 10px;
width: 50%;
height: fit-content;
display: flex;
flex-direction: column;
align-items: start;
justify-content: start;
gap: 20px;
h1 {
color: #000;
font-size: 20px;
font-weight: 600;
}
p {
width: 100%;
background: #eef2ff;
text-align: left;
padding: 10px;
border-radius: 10px;
color: #000;
}
a {
width: 100%;
background: #eef2ff;
text-align: left;
padding: 10px;
border-radius: 10px;
display: flex;
gap: 10px;
align-items: center;
}
.buttons {
width: 100%;
button {
width: 100%;
margin-top: 20px;
}
}
}
}
.lcReport {
width: 95%;

.backLink {
display: flex;
align-items: center;
background-color: white;
padding: 0.5rem 1rem;
margin-bottom: 10px;
width: fit-content;
color: #5d5d5d;
text-decoration: none;
cursor: pointer;
border-radius: 10px;
}
.container {
padding: 20px;
background: #fff;
border-radius: 10px;
display: flex;
gap: 10px;
flex-direction: column;
align-items: start;
text-align: start;
width: 100%;
h1 {
color: #000;
font-weight: 500;
font-size: 18px;
margin-bottom: 10px;
}
h2 {
margin-top: 10px;
color: #000;
font-size: 17px;
}
textarea {
height: 100px;
width: 70%;
padding: 10px;
background: #eef2ff;
padding: 10px;
border-radius: 10px;
color: #333;
}
.info {
color: #777;
font-size: 15px;
margin-bottom: 20px;
}
.attendees {
display: flex;
flex-direction: column;
gap: 10px;
width: 100%;

.attendee {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
background: #eef2ff;
padding: 15px 20px;
border-radius: 10px;
.content {
display: flex;
gap: 20px;
align-items: center;

.counter {
color: #000;
font-weight: 600;
}
.profile {
height: 30px;
width: 30px;
border-radius: 50%;
}
}
.noreport {
color: rgb(255, 113, 113);
font-size: 13px;
font-weight: 600;
}
.buttons {
display: flex;
gap: 20px;
span {
display: flex;
padding: 1px;
border-radius: 50%;
border: 1px solid #22222290;
cursor: pointer;
font-size: 30px;
width: 35px;
height: 35px;
align-items: center;
justify-content: center;
&.accepted,
&.rejected {
font-size: 15px !important;
border: none;
width: auto;
gap: 5px;

&:hover {
background: none;
}
}
&.accepted {
color: rgb(0, 210, 0);
}
&.rejected {
font-size: 12px;
color: red;
}
&:hover {
background: #b9c9ff;
}
&.view {
font-size: 20px;
}
&.accept {
color: rgb(0, 210, 0);
}
&.reject {
color: red;
}
&.disabled {
cursor: not-allowed;
color: grey;
}
}
}
}
}
.bottom {
width: 100%;
display: flex;
justify-content: end;
.button {
margin-top: 20px;
}
}
}
}

@media screen and (max-width: 768px) {
.lcReport {
width: 100%;
.container {
textarea {
width: 100%;
}
}
}
.popup {
.container {
width: 90%;
}
}
}
Loading

0 comments on commit d35898b

Please sign in to comment.