Skip to content
Merged
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
8 changes: 4 additions & 4 deletions app/communities/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"use client";

import CommunityItem from "@/components/Community/community-item/CommunityItem";
import PersonalHome from "@/components/Community/PersonalHome";
import PageContent from "@/components/Layout/PageContent";
import CommunityLoader from "@/components/Loaders/CommunityLoader";
import CommunityItem from "@/components/community/community-item/CommunityItem";
import PersonalHome from "@/components/community/PersonalHome";
import PageContent from "@/components/layout/PageContent";
import CommunityLoader from "@/components/loaders/CommunityLoader";
import useCommunitiesFeed from "@/hooks/community/useCommunitiesFeed";
import useCommunityState from "@/hooks/community/useCommunityState";
import useCommunityMembershipActions from "@/hooks/community/useCommunityMembershipActions";
Expand Down
10 changes: 5 additions & 5 deletions app/community/[communityId]/CommunityClientPage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use client";

import { communityStateAtom } from "@/atoms/communitiesAtom";
import About from "@/components/Community/about/About";
import CreatePostLink from "@/components/Community/CreatePostLink";
import CommunityHeader from "@/components/Community/community-header/CommunityHeader";
import PageContent from "@/components/Layout/PageContent";
import Posts from "@/components/Posts/Posts";
import About from "@/components/community/about/About";
import CreatePostLink from "@/components/community/CreatePostLink";
import CommunityHeader from "@/components/community/community-header/CommunityHeader";
import PageContent from "@/components/layout/PageContent";
import Posts from "@/components/posts/Posts";
import { useAtom } from "jotai";
import React, { useEffect } from "react";
import { Community } from "@/types/community";
Expand Down
10 changes: 5 additions & 5 deletions app/community/[communityId]/comments/[pid]/PostClientPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

/* eslint-disable react-hooks/exhaustive-deps */
import { communityStateAtom } from "@/atoms/communitiesAtom";
import About from "@/components/Community/about/About";
import PageContent from "@/components/Layout/PageContent";
import PostLoader from "@/components/Loaders/post-loader/PostLoader";
import Comments from "@/components/Posts/Comments/Comments";
import PostItem from "@/components/Posts/post-item/PostItem";
import About from "@/components/community/about/About";
import PageContent from "@/components/layout/PageContent";
import PostLoader from "@/components/loaders/post-loader/PostLoader";
import Comments from "@/components/posts/comments/Comments";
import PostItem from "@/components/posts/post-item/PostItem";
import { auth } from "@/firebase/clientApp";
import useCommunityPermissions from "@/hooks/community/useCommunityPermissions";
import usePostState from "@/hooks/posts/usePostState";
Expand Down
8 changes: 4 additions & 4 deletions app/community/[communityId]/submit/SubmitPostClientPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import { authModalStateAtom } from "@/atoms/authModalAtom";
import { communityStateAtom } from "@/atoms/communitiesAtom";
import About from "@/components/Community/about/About";
import PageContent from "@/components/Layout/PageContent";
import AuthButtons from "@/components/Navbar/RightContent/AuthButtons";
import NewPostForm from "@/components/Posts/new-post-form/NewPostForm";
import About from "@/components/community/about/About";
import PageContent from "@/components/layout/PageContent";
import AuthButtons from "@/components/navbar/right-content/AuthButtons";
import NewPostForm from "@/components/posts/new-post-form/NewPostForm";
import { auth } from "@/firebase/clientApp";
import { Box, Stack, Text } from "@chakra-ui/react";
import { useAtom, useSetAtom } from "jotai";
Expand Down
12 changes: 6 additions & 6 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use client";

/* eslint-disable react-hooks/exhaustive-deps */
import CreatePostLink from "@/components/Community/CreatePostLink";
import PersonalHome from "@/components/Community/PersonalHome";
import Recommendations from "@/components/Community/recommendations/Recommendations";
import PageContent from "@/components/Layout/PageContent";
import PostLoader from "@/components/Loaders/post-loader/PostLoader";
import PostItem from "@/components/Posts/post-item/PostItem";
import CreatePostLink from "@/components/community/CreatePostLink";
import PersonalHome from "@/components/community/PersonalHome";
import Recommendations from "@/components/community/recommendations/Recommendations";
import PageContent from "@/components/layout/PageContent";
import PostLoader from "@/components/loaders/post-loader/PostLoader";
import PostItem from "@/components/posts/post-item/PostItem";
import { auth, firestore } from "@/firebase/clientApp";
import useCommunityState from "@/hooks/community/useCommunityState";
import useCustomToast from "@/hooks/useCustomToast";
Expand Down
2 changes: 1 addition & 1 deletion app/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { ChakraProvider, Toaster } from "@chakra-ui/react";
import { theme } from "@/chakra/theme";
import Layout from "@/components/Layout/Layout";
import Layout from "@/components/layout/Layout";
import { Provider as JotaiProvider } from "jotai";
import { useEffect, useState } from "react";
import { toaster } from "@/hooks/useCustomToast";
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import useCallCreatePost from "@/hooks/posts/useCallCreatePost";
import { Button, Flex, Image, Stack, Text } from "@chakra-ui/react";
import { useAtomValue } from "jotai";
import React, { useState } from "react";
import CreateCommunityModal from "../Modal/CreateCommunity/CreateCommunityModal";
import CreateCommunityModal from "../modal/create-community/CreateCommunityModal";

/**
* Component for displaying card for creating a new community or post.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import useCommunityState from "@/hooks/community/useCommunityState";
import { Box, Button, Flex, Stack } from "@chakra-ui/react";
import { useRouter } from "next/navigation";
import React, { useState } from "react";
import CommunityMembersModal from "../../Modal/CommunityMembers/CommunityMembersModal";
import CommunityMembersModal from "../../modal/community-members/CommunityMembersModal";
import AboutCommunity from "./AboutCommunity";
import AboutHeaderBar from "./AboutHeaderBar";
import AdminSectionAbout from "./AdminSectionAbout";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from "react";
import { Community } from "@/types/community";
import { Button } from "@chakra-ui/react";
import useCommunityPermissions from "@/hooks/community/useCommunityPermissions";
import CommunitySettingsModal from "@/components/Modal/CommunitySettings/CommunitySettings";
import CommunitySettingsModal from "@/components/modal/community-settings/CommunitySettings";

type AdminSectionAboutProps = {
communityData: Community;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { IconButton, Icon } from "@chakra-ui/react";
import CommunityMembersModal from "../../Modal/CommunityMembers/CommunityMembersModal";
import CommunityMembersModal from "../../modal/community-members/CommunityMembersModal";
import { FiUsers } from "react-icons/fi";

type CommunityMembersButtonProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useParams } from "next/navigation";
import { useAuthState } from "react-firebase-hooks/auth";
import { auth } from "@/firebase/clientApp";
import { FiSettings } from "react-icons/fi";
import CommunitySettingsModal from "../../Modal/CommunitySettings/CommunitySettings";
import CommunitySettingsModal from "../../modal/community-settings/CommunitySettings";
import { Community } from "@/types/community";

type CommunitySettingsProps = {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { ReactNode } from "react";
import Navbar from "../Navbar/Navbar";
import Navbar from "../navbar/Navbar";
import GlobalHooks from "./GlobalHooks";

/**
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions components/Navbar/Navbar.tsx → components/navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import useDirectory from "@/hooks/useDirectory";
import { Flex, Image, Text } from "@chakra-ui/react";
import React from "react";
import { useAuthState } from "react-firebase-hooks/auth";
import Directory from "./Directory/Directory";
import RightContent from "./RightContent/RightContent";
import Directory from "./directory/Directory";
import RightContent from "./right-content/RightContent";
import SearchInput from "./SearchInput";

/**
Expand All @@ -28,9 +28,9 @@ import SearchInput from "./SearchInput";
* - User menu with different options
* @returns {React.FC} - Navbar component
*
* @requires ./RightContent - content displaying authentication buttons or actions
* @requires ./right-content - content displaying authentication buttons or actions
* @requires ./SearchInput - Search field
* @requires ./Directory - showing community menu button
* @requires ./directory - showing community menu button
*/
const Navbar: React.FC = () => {
const [user, loading, error] = useAuthState(auth); // will be passed to child components
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from "@chakra-ui/react";
import React, { useState } from "react";
import Communities from "./Communities";
import CreateCommunityModal from "@/components/Modal/CreateCommunity/CreateCommunityModal";
import CreateCommunityModal from "@/components/modal/create-community/CreateCommunityModal";

/**
* Component for displaying the directory menu.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import AuthModal from "@/components/Modal/Auth/AuthModal";
import SavedPostsModal from "@/components/Modal/SavedPosts/SavedPostsModal";
import AuthModal from "@/components/modal/auth/AuthModal";
import SavedPostsModal from "@/components/modal/saved-posts/SavedPostsModal";
import { Flex } from "@chakra-ui/react";
import { User } from "firebase/auth";
import React from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ProfileModal from "@/components/Modal/Profile/ProfileModal";
import ProfileModal from "@/components/modal/profile/ProfileModal";
import { MenuPositioner, MenuRoot } from "@chakra-ui/react";
import { User } from "firebase/auth";
import React, { useState } from "react";
Expand Down
2 changes: 1 addition & 1 deletion components/Posts/Posts.tsx → components/posts/Posts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import usePostsFeed from "@/hooks/posts/usePostsFeed";
import { Box, Spinner, Stack, Text } from "@chakra-ui/react";
import React, { useEffect } from "react";
import { useAuthState } from "react-firebase-hooks/auth";
import PostLoader from "../Loaders/post-loader/PostLoader";
import PostLoader from "../loaders/post-loader/PostLoader";
import PostItem from "./post-item/PostItem";

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ProfileModal from "@/components/Modal/Profile/ProfileModal";
import AuthButtons from "@/components/Navbar/RightContent/AuthButtons";
import ProfileModal from "@/components/modal/profile/ProfileModal";
import AuthButtons from "@/components/navbar/right-content/AuthButtons";
import { Flex, Textarea, Button, Text, Stack } from "@chakra-ui/react";
import { User } from "firebase/auth";
import React, { useState } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Flex } from "@chakra-ui/react";
import TextInputs from "../PostForm/TextInputs";
import ImageUpload from "../PostForm/ImageUpload";
import TextInputs from "../post-form/TextInputs";
import ImageUpload from "../post-form/ImageUpload";

type PostBodyProps = {
selectedTab: string;
Expand Down
Loading