Skip to content

Commit 04eb87a

Browse files
abhisek2004abhisek2004
authored
Merge pull request #561 from abhisek2004/revert-558-AOS/Feature
Revert "feat: Implement Animate on Scroll (AOS) & Fix Firebase Init 🚀"
2 parents c371426 + 65da9a4 commit 04eb87a

20 files changed

+90
-236
lines changed

‎DevElevate/Client/package-lock.json‎

Lines changed: 0 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DevElevate/Client/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
"socket.io-client": "^4.8.1",
5050
"sonner": "^2.0.6",
5151
"stripe": "^18.3.0",
52-
"tailwind-merge": "^3.3.1",
53-
"aos": "^2.3.4"
52+
"tailwind-merge": "^3.3.1"
5453
},
5554
"devDependencies": {
5655
"@eslint/js": "^9.9.1",

‎DevElevate/Client/src/App.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ import UserVideoPage from "./pages/videoPages/VideoPage.js";
6868
import ForgotPass from "./components/Auth/ForgotPass";
6969
import SearchPage from "./pages/Search/SearchPage";
7070

71-
import AOS from 'aos';
72-
import 'aos/dist/aos.css';
7371

7472
// ✅ AppContent
7573
const AppContent = () => {
@@ -235,10 +233,6 @@ function App() {
235233
};
236234
}, []);
237235

238-
useEffect(() => {
239-
AOS.init({ duration: 1000, once: true, easing: 'ease-out-cubic' });
240-
}, []);
241-
242236
return (
243237
<AuthProvider>
244238
<GlobalProvider>

‎DevElevate/Client/src/components/Dashboard/DailyGoals.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const FocusMode: React.FC = () => {
112112
};
113113

114114
return (
115-
<div data-aos="fade-up" data-aos-delay="100" className="p-6 mb-8 text-gray-900 bg-white rounded-2xl border border-gray-200 shadow-md transition-all duration-300 ease-in-out dark:bg-gray-900 dark:border-gray-700 dark:text-white">
115+
<div className="p-6 mb-8 text-gray-900 bg-white rounded-2xl border border-gray-200 shadow-md transition-all duration-300 ease-in-out dark:bg-gray-900 dark:border-gray-700 dark:text-white">
116116
<h3 className="mb-2 text-2xl font-semibold tracking-tight">Focus Mode</h3>
117117
<p className="mb-4 text-gray-500 dark:text-gray-400">Pomodoro Timer with advanced features</p>
118118
<div className="mb-4 text-center">
@@ -212,7 +212,7 @@ const DailyGoals: React.FC = () => {
212212
<>
213213
<FocusMode />
214214

215-
<div data-aos="fade-up" data-aos-delay="150" className={`rounded-2xl p-6 border transition-all duration-300 ease-in-out shadow-md ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
215+
<div className={`rounded-2xl p-6 border transition-all duration-300 ease-in-out shadow-md ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
216216
<div className="flex justify-between items-center mb-6">
217217
<h3 className={`text-2xl font-semibold tracking-tight ${state.darkMode ? 'text-white' : 'text-gray-900'}`}>
218218
Daily Goals
@@ -260,8 +260,6 @@ const DailyGoals: React.FC = () => {
260260
state.dailyGoals.map((goal, index) => (
261261
<div
262262
key={index}
263-
data-aos="fade-up"
264-
data-aos-delay={`${index * 100}`}
265263
className={`flex items-center gap-4 p-4 rounded-xl border shadow-sm transition-all duration-200 ${
266264
state.darkMode ? 'bg-gray-800 border-gray-700 hover:bg-gray-700' : 'bg-white border-gray-200 hover:bg-gray-100'
267265
}`}
@@ -289,8 +287,6 @@ const DailyGoals: React.FC = () => {
289287
{state.completedGoals.map((goal, index) => (
290288
<div
291289
key={index}
292-
data-aos="fade-up"
293-
data-aos-delay={`${index * 100}`}
294290
className={`flex items-center gap-4 p-3 rounded-xl transition-all duration-200 ${
295291
state.darkMode ? 'bg-gray-800 hover:bg-gray-700' : 'bg-gray-100 hover:bg-gray-200'
296292
}`}

‎DevElevate/Client/src/components/Dashboard/NewsWidget.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ const NewsWidget: React.FC = () => {
5454

5555
return (
5656
<div
57-
data-aos="fade-up"
58-
data-aos-delay="120"
5957
className={`${
6058
state.darkMode
6159
? "bg-gray-800 border-gray-700"
@@ -114,8 +112,6 @@ const NewsWidget: React.FC = () => {
114112
{articles.map((item, index) => (
115113
<div
116114
key={item.article_id ?? index}
117-
data-aos="fade-up"
118-
data-aos-delay={`${index * 100}`}
119115
className={`border rounded-lg overflow-hidden ${
120116
state.darkMode ? "bg-gray-900" : "bg-white"
121117
} ${

‎DevElevate/Client/src/components/Dashboard/ProgressWidget.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const ProgressWidget: React.FC = () => {
4949
}
5050

5151
return (
52-
<div data-aos="fade-up" data-aos-delay="100" className={`${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'} rounded-xl p-6 border shadow-sm`}>
52+
<div className={`${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'} rounded-xl p-6 border shadow-sm`}>
5353
<div className="flex items-center justify-between mb-6">
5454
<h3 className={`text-xl font-semibold ${state.darkMode ? 'text-white' : 'text-gray-900'}`}>
5555
Learning Progress
@@ -63,12 +63,12 @@ const ProgressWidget: React.FC = () => {
6363
</button>
6464
</div>
6565

66-
<div className="space-y-4" data-aos="fade-up">
67-
{learningTracks.map((track, index) => {
66+
<div className="space-y-4">
67+
{learningTracks.map((track) => {
6868
const Icon = track.icon;
6969
return (
70-
<div key={track.id} data-aos="fade-right" data-aos-delay={`${index * 120}`} className="flex items-center space-x-4">
71-
<div className={`p-3 rounded-lg bg-gradient-to-r ${track.color}`} data-aos="zoom-in" data-aos-delay={`${index * 120}`}>
70+
<div key={track.id} className="flex items-center space-x-4">
71+
<div className={`p-3 rounded-lg bg-gradient-to-r ${track.color}`}>
7272
<Icon className="w-5 h-5 text-white" />
7373
</div>
7474
<div className="flex-1">
@@ -98,4 +98,4 @@ const ProgressWidget: React.FC = () => {
9898
);
9999
};
100100

101-
export default ProgressWidget;
101+
export default ProgressWidget;

‎DevElevate/Client/src/components/Dashboard/QuickActions.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ const QuickActions: React.FC = () => {
3939
];
4040

4141
return (
42-
<div data-aos="fade-up" data-aos-delay="150" className={`${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'} rounded-xl p-6 border shadow-sm transition-colors duration-300`}>
43-
<h3 data-aos="fade-right" data-aos-delay="200" className={`text-2xl font-semibold tracking-tight mb-6 ${state.darkMode ? 'text-white' : 'text-gray-900'}`}>
42+
<div className={`${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'} rounded-xl p-6 border shadow-sm transition-colors duration-300`}>
43+
<h3 className={`text-2xl font-semibold tracking-tight mb-6 ${state.darkMode ? 'text-white' : 'text-gray-900'}`}>
4444
Quick Actions
4545
</h3>
4646

@@ -50,8 +50,6 @@ const QuickActions: React.FC = () => {
5050
return (
5151
<button
5252
key={index}
53-
data-aos="fade-up"
54-
data-aos-delay={`${index * 100}`}
5553
onClick={action.onClick}
5654
className={`p-4 rounded-xl border w-full text-left ${state.darkMode ? 'border-gray-700 hover:border-gray-600' : 'border-gray-200 hover:border-gray-300'} transition-all hover:shadow-md group`}
5755
>
@@ -76,4 +74,4 @@ const QuickActions: React.FC = () => {
7674
);
7775
};
7876

79-
export default QuickActions;
77+
export default QuickActions;

‎DevElevate/Client/src/components/Dashboard/StatsCards.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ const StatsCards: React.FC = () => {
4545
return (
4646
<div
4747
key={index}
48-
data-aos="fade-up"
49-
data-aos-delay={`${index * 100}`}
5048
className={`${
5149
state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'
5250
} rounded-xl p-6 border shadow-sm hover:shadow-md transition-shadow duration-200 mb-6`}
@@ -77,4 +75,4 @@ const StatsCards: React.FC = () => {
7775
);
7876
};
7977

80-
export default StatsCards;
78+
export default StatsCards;

‎DevElevate/Client/src/components/Dashboard/StreakCalendar.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ const StreakCalendar: React.FC = () => {
8080
const yearOptions = Array.from({ length: 11 }, (_, i) => today.getFullYear() - 5 + i);
8181

8282
return (
83-
<div data-aos="fade-up" data-aos-delay="150" className={`rounded-2xl p-6 border transition-all duration-300 ease-in-out shadow-md ${globalState.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
84-
<div className="flex items-center justify-between mb-4" data-aos="fade-right" data-aos-delay="200">
83+
<div className={`rounded-2xl p-6 border transition-all duration-300 ease-in-out shadow-md ${globalState.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
84+
<div className="flex items-center justify-between mb-4">
8585
<h3 className={`text-xl font-semibold tracking-tight ${globalState.darkMode ? 'text-white' : 'text-gray-900'}`}>
8686
Learning Streak
8787
</h3>
@@ -121,7 +121,7 @@ const StreakCalendar: React.FC = () => {
121121
</div>
122122

123123
{/* Day grid */}
124-
<div className="mb-4" data-aos="fade-up" data-aos-delay="250">
124+
<div className="mb-4">
125125
<div className="grid grid-cols-7 gap-1 text-[13px] font-semibold text-gray-50 mb-2">
126126
{['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'].map((day) => (
127127
<div key={day} className="text-center py-1 rounded-md bg-sky-50 dark:bg-sky-900 text-sky-700 dark:text-sky-200">
@@ -166,4 +166,4 @@ const StreakCalendar: React.FC = () => {
166166
);
167167
};
168168

169-
export default StreakCalendar;
169+
export default StreakCalendar;

‎DevElevate/Client/src/components/Quiz/QuizHistory.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const QuizHistory: React.FC = () => {
5151

5252
if (loading) {
5353
return (
54-
<div data-aos="fade-up" data-aos-delay="100" className={`rounded-lg border p-6 ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
54+
<div className={`rounded-lg border p-6 ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
5555
<h3 className="text-lg font-semibold mb-4">Recent Quiz Attempts</h3>
5656
<div className="animate-pulse space-y-3">
5757
{[1, 2, 3].map(i => (
@@ -63,7 +63,7 @@ const QuizHistory: React.FC = () => {
6363
}
6464

6565
return (
66-
<div data-aos="fade-up" data-aos-delay="120" className={`rounded-lg border p-6 ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
66+
<div className={`rounded-lg border p-6 ${state.darkMode ? 'bg-gray-800 border-gray-700' : 'bg-white border-gray-200'}`}>
6767
<h3 className="text-lg font-semibold mb-4">Recent Quiz Attempts</h3>
6868

6969
{attempts.length === 0 ? (
@@ -74,13 +74,11 @@ const QuizHistory: React.FC = () => {
7474
</div>
7575
) : (
7676
<div className="space-y-3">
77-
{attempts.map((attempt, index) => {
77+
{attempts.map((attempt) => {
7878
const percentage = Math.round((attempt.score / attempt.totalQuestions) * 100);
7979
return (
8080
<div
8181
key={attempt._id}
82-
data-aos="fade-up"
83-
data-aos-delay={`${index * 120}`}
8482
className={`p-4 rounded-lg border ${state.darkMode ? 'border-gray-600 bg-gray-700' : 'border-gray-200 bg-gray-50'}`}
8583
>
8684
<div className="flex items-center justify-between">
@@ -118,4 +116,4 @@ const QuizHistory: React.FC = () => {
118116
);
119117
};
120118

121-
export default QuizHistory;
119+
export default QuizHistory;

0 commit comments

Comments
 (0)