Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
19 changes: 2 additions & 17 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
import React from "react";
import { ThemeProvider } from "./theme/ThemeProvider";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import Navbar from "./components/Navbar";
import Home from "./pages/Home";
import Syllabus from "./pages/Syllabus";
import Notes from "./pages/Notes";
import PYQs from "./pages/PYQs";
import Feedback from "./pages/Feedback";
import About from "./pages/About";
import Privacy from "./pages/Privacy";
import Contact from "./pages/Contact";
import Analytics from "./pages/Analytics";
import Faq from "./pages/Faq";
import Contribute from "./pages/Contribute";
import ScrollToTop from "./components/scrolltotop";
import MindMapEditor from "./pages/MindMapEditor";
import Profile from "./pages/Profile.js";
import SubmitFeedback from "./pages/SubmitFeedback";
import Todo from "./pages/Todo";
import {Home, Syllabus, Notes, PYQs, Feedback, About, Privacy, Contact, Analytics, Faq, Contribute, MindMapEditor, Profile, SubmitFeedback, Todo} from './pages';
import {Navbar, ScrollToTop} from "./components";


const App = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/FeedbackModal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// client/src/components/FeedbackModal.js
import React, { useState, useEffect } from "react";
import './FeedbackModal.css'; // This line connects the component to the CSS above
import './style/FeedbackModal.css'; // This line connects the component to the CSS above

const FeedbackModal = ({ onClose, onSuccess }) => {
const [formData, setFormData] = useState({
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Navbar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useRef } from "react";
import { Link, NavLink } from "react-router-dom";
import "./Navbar.css";
import "./style/Navbar.css";
import { useTheme } from "../theme/ThemeProvider";
import { FaMoon, FaSun, FaChevronDown } from "react-icons/fa";

Expand Down
4 changes: 4 additions & 0 deletions client/src/components/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export { default as Calender} from "./Calender.js";
export { default as FeedbackModal} from "./FeedbackModal.js";
export { default as Navbar} from "./Navbar.js";
export { default as scrolltotop} from "./scrolltotop.js";
4 changes: 2 additions & 2 deletions client/src/pages/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React, { useState, useEffect } from 'react';
import { motion, AnimatePresence } from 'framer-motion';
import { Link } from 'react-router-dom';
import { FaArrowUp } from "react-icons/fa";
import './About.css';
import './ScrollToTop.css';
import './style/About.css';
import './style/ScrollToTop.css';
const About = () => {
document.title = "StudyMatePlus | About Us";
// Animation Variants from Home.js
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Analytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
} from 'chart.js';
import { motion, AnimatePresence } from 'framer-motion';
import { FaArrowUp } from "react-icons/fa";
import './Analytics.css';
import './ScrollToTop.css';
import './style/Analytics.css';
import './style/ScrollToTop.css';

ChartJS.register(CategoryScale, LinearScale, BarElement, ArcElement, Tooltip, Legend);

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Contact.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Link } from 'react-router-dom';
import './Contact.css';
import './ScrollToTop.css';
import './style/Contact.css';
import './style/ScrollToTop.css';

const Contact = () => {

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Contribute.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { motion, AnimatePresence } from 'framer-motion';
import './Contribute.css';
import './ScrollToTop.css';
import './style/Contribute.css';
import './style/ScrollToTop.css';

const Contribute = () => {
const [activeStep, setActiveStep] = useState(1);
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Faq.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import { motion, AnimatePresence } from "framer-motion";
import "./Faq.css";
import './ScrollToTop.css';
import "./style/Faq.css";
import './style/ScrollToTop.css';
import { FaGithub, FaLinkedin, FaDiscord, FaArrowUp} from "react-icons/fa";
import { Link } from "react-router-dom";
import { FaXTwitter } from "react-icons/fa6";
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Feedback.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import { motion, AnimatePresence } from "framer-motion";
import "./Feedback.css";
import './ScrollToTop.css';
import "./style/Feedback.css";
import './style/ScrollToTop.css';
import { FaArrowUp } from "react-icons/fa";
import FeedbackModal from "../components/FeedbackModal"; // Import the modal component

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { motion, AnimatePresence } from 'framer-motion';
import { FaGithub, FaLinkedin, FaDiscord, FaArrowUp } from "react-icons/fa";
import { FaXTwitter } from "react-icons/fa6";
import logo from "./logo.png";
import "./Home.css";
import './ScrollToTop.css';
import "./style/Home.css";
import './style/ScrollToTop.css';

const Home = () => {

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/MindMapEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import ReactFlow, {
MarkerType, Handle, Position
} from 'reactflow';
import 'reactflow/dist/style.css';
import './MindMapEditor.css';
import './ScrollToTop.css';
import './style/MindMapEditor.css';
import './style/ScrollToTop.css';

import { v4 as uuid } from 'uuid';
import { motion, AnimatePresence } from 'framer-motion';
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Notes.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useMemo, useEffect, useRef } from 'react';
import { motion, AnimatePresence } from 'framer-motion';
import { FaArrowUp } from "react-icons/fa";
import './Notes.css';
import './style/Notes.css';

const Notes = () => {

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/PYQs.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState, useMemo, useEffect } from "react";
import { motion, AnimatePresence } from "framer-motion";
import { FaArrowUp } from "react-icons/fa";
import "./PYQs.css";
import './ScrollToTop.css';
import "./style/PYQs.css";
import './style/ScrollToTop.css';

const PYQs = () => {

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Privacy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom';
import './Privacy.css';
import './ScrollToTop.css';
import './style/Privacy.css';
import './style/ScrollToTop.css';

const Privacy = () => {

Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
FaCommentDots,
FaBookmark,
} from "react-icons/fa";
import "./Profile.css";
import './ScrollToTop.css';
import "./style/Profile.css";
import './style/ScrollToTop.css';

const user = {
name: "John Doe",
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/SubmitFeedback.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { motion } from 'framer-motion';
import './SubmitFeedback.css'; // We will create this file next
import './Feedback.css'; // Reusing some existing styles
import './style/SubmitFeedback.css'; // We will create this file next
import './style/Feedback.css'; // Reusing some existing styles

const StarRating = ({ rating, setRating }) => {
const [hover, setHover] = useState(0);
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Syllabus.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useMemo, useEffect } from 'react';
import { motion, AnimatePresence } from 'framer-motion';
import { FaArrowUp } from "react-icons/fa";
import './Syllabus.css';
import './style/Syllabus.css';

const Syllabus = () => {

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Todo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import "./Todo.css";
import "./style/Todo.css";
import Calendar from "../components/Calendar";

const STORAGE_KEY = "smp_tasks_v1";
Expand Down
15 changes: 15 additions & 0 deletions client/src/pages/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export { default as About} from "./About.js";
export { default as Analytics} from "./Analytics.js";
export { default as Contact} from "./Contact.js";
export { default as Contribute} from "./Contribute.js";
export { default as Faq} from "./Faq.js";
export { default as Feedback} from "./Feedback.js";
export { default as Home} from "./Home.js";
export { default as MindMapEditor} from "./MindMapEditor.js";
export { default as Notes} from "./Notes.jsx";
export { default as Privacy} from "./Privacy.js";
export { default as Profile} from "./Profile.js";
export { default as PYQs} from "./PYQs.js";
export { default as SubmitFeedback} from "./SubmitFeedback.js";
export { default as Syllabus} from "./Syllabus.js";
export { default as Todo} from "./Todo.js";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.