Merge main

emmanueposu · Jun 2, 2024 · fc2ce0c · fc2ce0c
1 parent f8ac3ac
commit fc2ce0c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/trivia-forge/frontend/src/App.jsx b/trivia-forge/frontend/src/App.jsx
@@ -1,13 +1,13 @@
 import { useState } from 'react';
 import './App.css';
 import { BrowserRouter, Routes, Route } from "react-router-dom";
-import Home from "./Pages/HomePage";
-import Navigation from "./Components/Navigation";
-import TriviaGenPage from './Pages/TriviaGenPage';
-import TriviaReviewPage from './Pages/TriviaReviewPage';
-import MyTriviaPage from './Pages/myTriviaPage';
-import LoginPage from './Pages/LoginPage';
-import SignUpPage from './Pages/SignUpPage';
+import Home from "./pages/homePage";
+import Navigation from "./components/Navigation";
+import TriviaGenPage from './pages/triviaGenPage';
+import TriviaReviewPage from './pages/triviaReviewPage';
+import MyTriviaPage from './pages/myTriviaPage';
+import LoginPage from './pages/loginPage';
+import SignUpPage from './pages/signUpPage';
 import React from 'react';
 import 'bootstrap/dist/css/bootstrap.min.css';
 

diff --git a/trivia-forge/frontend/src/components/ReviewCategories.jsx b/trivia-forge/frontend/src/components/ReviewCategories.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ReviewQuestions from "../Components/ReviewQuestions";
+import ReviewQuestions from "../components/ReviewQuestions";
 
 
 function ReviewCategories({ category, index, changeValue, isMultipleChoice }) {

diff --git a/trivia-forge/frontend/src/components/ReviewQuestions.jsx b/trivia-forge/frontend/src/components/ReviewQuestions.jsx
@@ -1,7 +1,7 @@
 import React from "react";
-import ReviewChoices from "../Components/ReviewChoices";
+import ReviewChoices from "../components/ReviewChoices";
 import { Card } from "react-bootstrap";
-import { Question } from "../Models/Question";
+import { Question } from "../models/question";
 
 
 //logic for button to generate new question

diff --git a/trivia-forge/frontend/src/pages/myTriviaPage.jsx b/trivia-forge/frontend/src/pages/myTriviaPage.jsx
@@ -5,9 +5,9 @@ import Col from 'react-bootstrap/Col';
 import Row from 'react-bootstrap/Row';
 import Button from 'react-bootstrap/Button';
 import Spinner from 'react-bootstrap/Spinner';
-import UnorderedCategoriesList from "../Components/UnorderedCategoriesList";
-import QuestionsCount from "../Components/QuestionsCount";
-import Slideshow from "../Components/Slideshow";
+import UnorderedCategoriesList from "../components/UnorderedCategoriesList";
+import QuestionsCount from "../components/QuestionsCount";
+import Slideshow from "../components/Slideshow";
 import Modal from 'react-bootstrap/Modal';
 import { Link, useNavigate } from "react-router-dom";
 import useStore from '../hooks/useStore';

diff --git a/trivia-forge/frontend/src/pages/signUpPage.jsx b/trivia-forge/frontend/src/pages/signUpPage.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { useNavigate } from "react-router-dom";
 import { Form, Button, Card } from "react-bootstrap";
 import { addUser } from '../services/triviaForgeApiService';
-import { User } from '../Models/User';
+import { User } from '../models/user';
 
 
 function SignUpPage() {

diff --git a/trivia-forge/frontend/src/pages/triviaGenPage.jsx b/trivia-forge/frontend/src/pages/triviaGenPage.jsx
@@ -1,15 +1,15 @@
 import React, { useState } from "react"; // variables that cause the component to re-render when they change
 import OpenAI from "openai";
-import { Game } from "../Models/Game";
+import { Game } from "../models/game";
 import { useNavigate } from "react-router-dom";
-import { Question } from "../Models/Question";
-import { Choice } from "../Models/Choice";
-import { Category } from "../Models/Category";
+import { Question } from "../models/question";
+import { Choice } from "../models/choice";
+import { Category } from "../models/category";
 import { Card } from "react-bootstrap";
 import useStore from '../hooks/useStore'; // global state management
 import Spinner from 'react-bootstrap/Spinner';
 import Button from 'react-bootstrap/Button';
-import GenerateButtonTooltip from "../Components/GenerateButtonTooltip";
+import GenerateButtonTooltip from "../components/GenerateButtonTooltip";
 
 // initialize openai client using configuration specified in vite environment variables 
 // reference: https://platform.openai.com/docs/api-reference/making-requests

diff --git a/trivia-forge/frontend/src/pages/triviaReviewPage.jsx b/trivia-forge/frontend/src/pages/triviaReviewPage.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useLocation } from 'react-router-dom'; // used to access passed state
-import ReviewCategories from '../Components/ReviewCategories';
+import ReviewCategories from '../components/ReviewCategories';
 import { Button } from 'react-bootstrap';
 import { AddAllForGame, UpdateAllForGame } from '../services/saveGameService';
 import { useNavigate } from "react-router-dom";

diff --git a/trivia-forge/frontend/src/services/triviaForgeApiService.jsx b/trivia-forge/frontend/src/services/triviaForgeApiService.jsx
@@ -1,8 +1,8 @@
 import axios from 'axios';
-import { Game } from '../Models/Game';
-import { Question } from '../Models/Question';
-import { Category } from '../Models/Category';
-import { Choice } from '../Models/Choice';
+import { Game } from '../models/game';
+import { Question } from '../models/question';
+import { Category } from '../models/category';
+import { Choice } from '../models/choice';
 
 const API_URL = 'http://127.0.0.1:5000';