Skip to content
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.

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

Prod server #1659

Closed
wants to merge 64 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
6ed2898
fix: fixed issue with college search filter for onboarding registeration
Nandana-pradeep33 Aug 21, 2024
68276f7
Merge pull request #1628 from Nandana-pradeep33/dev
viraka Aug 22, 2024
3ccdb6a
feat:Userinterest selection page
Ansanjohny Oct 5, 2024
a1fa307
Merge pull request #1 from Ansanjohny/dev
aswanthabam Oct 5, 2024
88181ce
feat: tags input
aswanthabam Oct 5, 2024
a6dcfe0
fix: page switching
aswanthabam Oct 5, 2024
967c139
feat: discord onboarding and interest selection
aswanthabam Oct 6, 2024
ef742e3
refactor: removed unused codes
aswanthabam Oct 6, 2024
2c7b07a
feat:ui update
alanfrancis442 Oct 6, 2024
f555321
Merge pull request #1635 from aswanthabam/dev
nashnsulthan Oct 6, 2024
50bd9bb
fix: improved ui
aswanthabam Oct 6, 2024
68d06d3
Merge pull request #1636 from aswanthabam/dev
nashnsulthan Oct 6, 2024
74fa5e8
Merge pull request #1637 from gtech-mulearn/dev
nashnsulthan Oct 6, 2024
b2b6d55
fix(onboard) : Improved UI UX
aswanthabam Oct 7, 2024
02adf6d
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 7, 2024
ced8ca6
Merge pull request #1638 from aswanthabam/dev
nashnsulthan Oct 7, 2024
1a933d7
Merge pull request #1639 from gtech-mulearn/dev
nashnsulthan Oct 7, 2024
c808608
feat: Add category in ig dashboard
Ansanjohny Oct 7, 2024
acc41d8
Merge pull request #1640 from Ansanjohny/dev
nashnsulthan Oct 7, 2024
138063a
Merge pull request #1641 from gtech-mulearn/dev
nashnsulthan Oct 7, 2024
4ded989
fix: redirect to interest select page if not selected
aswanthabam Oct 8, 2024
446e199
Merge branch 'dev' of https://github.com/aswanthabam/mulearn into dev
aswanthabam Oct 8, 2024
f4eca10
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 8, 2024
933147a
Merge pull request #1642 from aswanthabam/dev
nashnsulthan Oct 8, 2024
bae2129
Merge pull request #1643 from gtech-mulearn/dev
nashnsulthan Oct 8, 2024
563d864
feat:optimization
Ansanjohny Oct 10, 2024
03b2194
Merge pull request #1644 from Ansanjohny/dev
nashnsulthan Oct 11, 2024
bb2fdc3
code
Ansanjohny Oct 11, 2024
8b66edc
feat:Settings Page
Ansanjohny Oct 11, 2024
40dfeff
Merge pull request #1645 from gtech-mulearn/dev
nashnsulthan Oct 11, 2024
64a6835
feat:submiticonsapcing
Ansanjohny Oct 11, 2024
a265884
feat:url fix
Ansanjohny Oct 11, 2024
65ef847
feat:settings bug fix
Ansanjohny Oct 11, 2024
a44636a
Merge pull request #1646 from Ansanjohny/dev
nashnsulthan Oct 11, 2024
3e228d7
Merge pull request #1647 from gtech-mulearn/dev
nashnsulthan Oct 11, 2024
5c5032e
feat:Api Integration
Ansanjohny Oct 11, 2024
ad3becf
fix:Settings css fix
Ansanjohny Oct 12, 2024
9b2d327
feat: LC modifications
aswanthabam Oct 12, 2024
2eddbff
Merge branch 'dev' into feature-lc
aswanthabam Oct 12, 2024
085cc0d
Merge pull request #1649 from aswanthabam/feature-lc
nashnsulthan Oct 12, 2024
690b268
Merge pull request #1650 from gtech-mulearn/dev
nashnsulthan Oct 12, 2024
10da00d
Merge branch 'gtech-mulearn:dev' into dev
Ansanjohny Oct 12, 2024
186e329
fix:content and removed settings
Ansanjohny Oct 13, 2024
3bf9f25
Merge pull request #1648 from Ansanjohny/dev
nashnsulthan Oct 13, 2024
bebf99c
Merge pull request #1651 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
3b2b39b
feat: LC design fix and college selection page on onboarding
aswanthabam Oct 13, 2024
386fec0
Merge branch 'dev' into feature-lc
aswanthabam Oct 13, 2024
77d09c1
fix: removed error causing attribute
aswanthabam Oct 13, 2024
e4c6f7a
Merge pull request #1652 from aswanthabam/feature-lc
nashnsulthan Oct 13, 2024
d0e5ae2
Merge pull request #1653 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
1d76064
feat: Onboard and lc optimization
aswanthabam Oct 13, 2024
f0a53ed
fix: onboard build
aswanthabam Oct 13, 2024
d789f42
fix: onboard build
aswanthabam Oct 13, 2024
f511aeb
Merge branch 'dev' of https://github.com/aswanthabam/mulearn into dev
aswanthabam Oct 13, 2024
4a479bc
feat: meetup card and improvements
aswanthabam Oct 13, 2024
6612fb8
feat: show attendees while submitting report
aswanthabam Oct 13, 2024
e34e5cc
Merge pull request #1654 from aswanthabam/dev
nashnsulthan Oct 13, 2024
b4a95c7
feat: Learning Circle Pages
aswanthabam Oct 20, 2024
31e19ea
Merge pull request #1655 from aswanthabam/dev
nashnsulthan Oct 20, 2024
013d4ff
Merge pull request #1656 from gtech-mulearn/dev
nashnsulthan Oct 20, 2024
91eb94c
fix:error message
Ansanjohny Oct 20, 2024
51004c6
fix:lcmeetup filter
Ansanjohny Oct 20, 2024
97d903b
Merge pull request #1657 from Ansanjohny/dev
nashnsulthan Oct 20, 2024
f561c87
Merge pull request #1658 from gtech-mulearn/dev
nashnsulthan Oct 20, 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: 2 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VITE_BACKEND_URL=
VITE_FRONTEND_URL=
VITE_DISCORD_INVITE_URL=
VITE_RAZORPAY_KEY_ID=
VITE_RAZORPAY_KEY_ID=
VITE_DISCORD_AUTH_URL=
429 changes: 261 additions & 168 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@chakra-ui/react": "^2.6.1",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@types/react-star-ratings": "^2.3.3",
"@types/react-tabs": "^5.0.5",
"axios": "^1.3.4",
"file-saver": "^2.0.5",
Expand All @@ -35,7 +36,9 @@
"react-router-dom": "^6.9.0",
"react-select": "^5.7.7",
"react-spinners": "^0.13.8",
"react-star-ratings": "^2.3.0",
"react-tabs": "^6.0.1",
"react-tag-input-component": "^2.0.2",
"react-tooltip": "^5.18.1",
"recharts": "^2.10.2",
"sass": "^1.62.1",
Expand Down
8 changes: 8 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}
.rti--container {
width: 250px;
max-height: 100px;
overflow: scroll;
}
.rti--container .rti--input {
width: 100%;
}

.css-13cymwt-control,
.css-t3ipsp-control {
Expand Down
54 changes: 49 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import {
Navigate
} from "react-router-dom";
import AuthRoutes from "./components/AuthRoutes";
import Onboarding from "./modules/Common/Authentication/pages/Onboarding";
import Login from "./modules/Common/Authentication/pages/Login";
import ForgotPassword from "./modules/Common/Authentication/pages/ForgotPassword";

import PrivateRoutes from "./components/PrivateRoutes";
import DashboardRootLayout from "./modules/Dashboard/layouts/DashboardRootLayout";
import NotFound from "./components/NotFound";
Expand Down Expand Up @@ -47,6 +43,12 @@ import Donation from "./modules/Public/Donation/Donation";
import Refund from "./modules/Public/Donation/pages/Refund";
import DonationSuccess from "./modules/Public/Donation/pages/DonationSuccess";
import OpenGrad from "./modules/Dashboard/modules/OpenGrad";
import UserInterest from "./modules/Common/Authentication/pages/Onboarding/UserInterest/UserInterest";
import LcMeetupIfo from "./modules/Dashboard/modules/LearningCircle/pages/Meetup/LcMeetup";
import OrganizationSetting from "./modules/Dashboard/modules/Settings/pages/Organization/Organization";
import SettingsHome from "./modules/Dashboard/modules/Settings/pages/Settings/SettingsHome";
import LcReportAttendee from "./modules/Dashboard/modules/LearningCircle/pages/LcDashboard/components/LcAttendeeReport";
import LcAdmin from "./modules/Dashboard/modules/LearningCircle/pages/LcAdmin/LcAdmin";

const Profile = lazy(
() => import("./modules/Dashboard/modules/Profile/pages/Profile")
Expand Down Expand Up @@ -291,12 +293,29 @@ function App() {
element: <AuthRoutes />,
children: [
{ path: "register/:role", element: <AccountCreation /> },
{ path: "register/", element: <AccountCreation /> },
{
path: "register/",
children: [
{
path: "",
element: <AccountCreation />
}
]
},

{ path: "login", element: <SignIn /> },
{ path: "forgot-password", element: <ForgetPassword /> },
{ path: "reset-password", element: <ResetPassword /> }
]
},
{
path: "/register/interests",
element: <UserInterest />
},
{
path: "/register/organization",
element: <CollegePage />
},
{
path: "/signin",
element: <SignIn />
Expand Down Expand Up @@ -348,6 +367,15 @@ function App() {
/>
)
},
{
path: "lc-meetup-verification",
element: (
<AuthChecker
roles={[roles.ADMIN, roles.FELLOW]}
children={<LcAdmin />}
/>
)
},
{
path: "campus-details",
element: (
Expand Down Expand Up @@ -683,6 +711,14 @@ function App() {
path: "learning-circle",
element: <LearningCircleLandingPage />
},
{
path: "learning-circle/meetup/:id",
element: <LcMeetupIfo />
},
{
path: "learning-circle/meetup/:id/attendee-report",
element: <LcReportAttendee />
},
{
path: "learning-circle/details/:id",
element: <LearningCircle />
Expand Down Expand Up @@ -721,6 +757,14 @@ function App() {
path: "settings",
element: <Settings />,
children: [
{
path: "",
element: <SettingsHome />
},
{
path: "organization",
element: <OrganizationSetting />
},
{
path: "account",
element: <Account />
Expand Down
Loading
Loading