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

Updating casing for files and folders #168

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ Instructions on setting up your project locally.
### Prerequisites

1. Node, npm are installed in your machine
2. Configure firebase emulators for the local development environment. Please refer to `src/services/firebase/emulator-readme.md`
3. If you are not using firebase emulator, please update the firebase config to bypass firebase emulator setup - refer to `src/services/firebase/firebaseConfig.ts`
2. Configure firebase emulators for the local development environment. Please refer to `src/services/Firebase/emulator-readme.md`
3. If you are not using firebase emulator, please update the firebase config to bypass firebase emulator setup - refer to `src/services/Firebase/firebaseConfig.ts`
4. Firebase app secrets stored in the root level of the project in file named: `env.development.local`

### Installation
Expand All @@ -97,7 +97,7 @@ _Below is an example of how you can instruct your audience on installing and set
git clone https://github.com/your_username_/Project-Name.git
```
2. Install and run firebase emulator (optional)
a. Please refer to `src/services/firebase/emulator-readme.md` for further instructions.
a. Please refer to `src/services/Firebase/emulator-readme.md` for further instructions.
3. Install NPM packages
```sh
npm install
Expand Down
4 changes: 2 additions & 2 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"storage": {
"rules": "src/services/firebase/rules/storage.rules"
"rules": "src/services/Firebase/rules/storage.rules"
},
"firestore": {
"rules": "src/services/firebase/rules/firestore.rules"
"rules": "src/services/Firebase/rules/firestore.rules"
},
"emulators": {
"auth": {
Expand Down
6 changes: 3 additions & 3 deletions src/app.tsx → src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
Text,
VStack,
} from "@chakra-ui/react";
import { AuthProvider } from "./services/firebase/authProvider";
import { AuthProvider } from "./services/Firebase/AuthProvider";
import { useGetWindowDimensionsHook } from "./utilities/useGetDdimensionsHook";
import logo from "./assets/images/logo/Mendisphere Logo colour.png";
import mendisphereTheme from "./theme";
import Routing, { Paths } from "./routing";
import Header from "./components/header";
import Footer from "./components/footer";
import Header from "./components/Header";
import Footer from "./components/Footer";

function App() {
const { width } = useGetWindowDimensionsHook();
Expand Down
2 changes: 1 addition & 1 deletion src/app.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react"
import { screen } from "@testing-library/react"
import { render } from "./test-utils"
import App from "./app"
import App from "./App"

test("renders learn react link", () => {
render(<App />)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Text,
} from "@chakra-ui/react";
import { HomeIcon } from "@primer/octicons-react";
import { Organisation } from "../../data/model/organisation";
import { Organisation } from "../../data/Model/Organisation";
import { Paths } from "../../routing";

const currentPageStyle = {
Expand Down Expand Up @@ -38,7 +38,7 @@ const Breadcrumbs: React.FC<{ org?: Organisation }> = ({ org }) => {
{/* organisations page */}
<BreadcrumbItem>
<BreadcrumbLink
href={isOrgProfilePage ? Paths.organisationListing : undefined}
href={isOrgProfilePage ? Paths.OrganisationListing : undefined}
style={isOrgProfilePage ? undefined : currentPageStyle}
>
Organisations
Expand Down
1 change: 1 addition & 0 deletions src/components/Breadcrumbs/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Breadcrumbs";
1 change: 1 addition & 0 deletions src/components/CardSkeletonLoader/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./CardSkeletonLoader";
1 change: 1 addition & 0 deletions src/components/Container/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Container";
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
Flex,
Center,
VStack,
StackDivider,
Divider,
Expand All @@ -10,9 +9,9 @@ import {
Spacer,
} from "@chakra-ui/react";
import "../../pages/style.scss";
import { SocialType } from "../../data/enums/social-type.enum";
import { SocialType } from "../../data/Enums/social-type.enum";
import { GetIconForSocials } from "../../utilities/iconMappings/iconMapping";
import { Social } from "../../data/model/organisationSummary";
import { Social } from "../../data/Model/OrganisationSummary";

const Footer: React.FC = () => {
const socials: Social[] = [
Expand Down
1 change: 1 addition & 0 deletions src/components/Footer/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Footer";
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Spacer,
} from "@chakra-ui/react";
import { Link as ReactRouterLink } from "react-router-dom";
import NavigationButton from "../navigationButton";
import NavigationButton from "../NavigationButton";
import "../../pages/style.scss";

import logo from "../../assets/images/logo/Mendisphere Logo colour.png";
Expand Down Expand Up @@ -55,7 +55,7 @@ const Header = () => {
display={{ base: "none", md: "flex" }}
>
<Link onClick={handleScrollToFooter}>About</Link>
<Link as={ReactRouterLink} to={Paths.organisationListing}>
<Link as={ReactRouterLink} to={Paths.OrganisationListing}>
Organisations
</Link>
<Link onClick={handleScrollToFooter}>Contact Us</Link>
Expand Down
1 change: 1 addition & 0 deletions src/components/Header/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Header";
1 change: 1 addition & 0 deletions src/components/NavigationButton/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./NavigationButton";
1 change: 1 addition & 0 deletions src/components/ScrollAnimation/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Animate } from "./ScrollAnimation";
1 change: 1 addition & 0 deletions src/components/TableSkeletonLoader/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./TableSkeletonLoader";
1 change: 0 additions & 1 deletion src/components/breadcrumbs/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/cardSkeletonLoader/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/container/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/footer/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/header/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/navigationButton/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/scrollAnimation/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/components/tableSkeletonLoader/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { AuthContextModel } from "./authContextModel";
import { AuthContextModel } from "./AuthContextModel";

export const AuthContext = React.createContext<AuthContextModel>(
{} as AuthContextModel
Expand Down
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.
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ import {
DocumentSnapshot,
getCountFromServer,
} from "firebase/firestore";
import { Collections } from "../../services/firebase/names";
import { db } from "../../services/firebase/firebaseConfig";
import { Collections } from "../../services/Firebase/names";
import { db } from "../../services/Firebase/firebaseConfig";
import {
createOrganisationAdminData,
IOrganisationAdminData,
} from "./organisationAdmin";
import { SupportArea } from "../enums/support-area.enum";
import { Specialisation } from "../enums/specialisation.enum";
import { Service } from "../enums/service.enum";
import { IPCStatus } from "../enums/ipc-status.enum";
import { VerificationStatus } from "../enums/verification-status.enum";
} from "./OrganisationAdmin";
import { SupportArea } from "../Enums/support-area.enum";
import { Specialisation } from "../Enums/specialisation.enum";
import { Service } from "../Enums/service.enum";
import { IPCStatus } from "../Enums/ipc-status.enum";
import { VerificationStatus } from "../Enums/verification-status.enum";
import {
IOrganisationSummary,
createOrganisationSummary,
} from "./organisationSummary";
} from "./OrganisationSummary";

export interface IOrganisation {
name?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {
QueryDocumentSnapshot,
SnapshotOptions,
} from "firebase/firestore";
import { db } from "../../services/firebase/firebaseConfig";
import { Collections } from "../../services/firebase/names";
import { CapitalGoal } from "../enums/captial-goal.enum";
import { OrgSize } from "../enums/org-size.enum";
import { db } from "../../services/Firebase/firebaseConfig";
import { Collections } from "../../services/Firebase/names";
import { CapitalGoal } from "../Enums/captial-goal.enum";
import { OrgSize } from "../Enums/org-size.enum";

export interface IOrganisationAdminData {
orgId?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
getDoc,
setDoc,
} from "firebase/firestore";
import { db } from "../../../services/firebase/firebaseConfig";
import { Collections } from "../../../services/firebase/names";
import { db } from "../../../services/Firebase/firebaseConfig";
import { Collections } from "../../../services/Firebase/names";

export interface IFAQ {
question: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
getDoc,
setDoc,
} from "firebase/firestore";
import { Collections } from "../../../services/firebase/names";
import { db } from "../../../services/firebase/firebaseConfig";
import { Collections } from "../../../services/Firebase/names";
import { db } from "../../../services/Firebase/firebaseConfig";
import {
IProfileContent,
convertContentToFireStore,
convertFirestoreToContent,
} from "./profileContent";
} from "./ProfileContent";

export class OrganisationProfileImpact {
orgId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
getDoc,
setDoc,
} from "firebase/firestore";
import { Collections } from "../../../services/firebase/names";
import { db } from "../../../services/firebase/firebaseConfig";
import { Collections } from "../../../services/Firebase/names";
import { db } from "../../../services/Firebase/firebaseConfig";
import {
IProfileContent,
convertContentToFireStore,
convertFirestoreToContent,
} from "./profileContent";
} from "./ProfileContent";

export class OrganisationProfileOurStory {
orgId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
getDoc,
setDoc,
} from "firebase/firestore";
import { db } from "../../../services/firebase/firebaseConfig";
import { Collections } from "../../../services/firebase/names";
import { Social } from "../organisationSummary";
import { db } from "../../../services/Firebase/firebaseConfig";
import { Collections } from "../../../services/Firebase/names";
import { Social } from "../OrganisationSummary";

export interface IPeopleSpotlight {
name: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
setDoc,
SnapshotOptions,
} from "firebase/firestore";
import { db } from "../../services/firebase/firebaseConfig";
import { Collections } from "../../services/firebase/names";
import { SocialType } from "../enums/social-type.enum";
import { db } from "../../services/Firebase/firebaseConfig";
import { Collections } from "../../services/Firebase/names";
import { SocialType } from "../Enums/social-type.enum";

export type Social = {
socialType: SocialType;
Expand Down
6 changes: 3 additions & 3 deletions src/data/model/user.ts → src/data/Model/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {
doc,
setDoc,
} from "firebase/firestore";
import { Collections } from "../../services/firebase/names";
import { db } from "../../services/firebase/firebaseConfig";
import { UserRole } from "../enums/user-role.enum";
import { Collections } from "../../services/Firebase/names";
import { db } from "../../services/Firebase/firebaseConfig";
import { UserRole } from "../Enums/user-role.enum";

export interface IUser {
id: string;
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ColorModeScript } from "@chakra-ui/react";
import * as React from "react";
import * as ReactDOM from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import App from "./app";
import App from "./App";
import reportWebVitals from "./reportWebVitals";
import * as serviceWorker from "./serviceWorker";
import 'typeface-inter'
Expand Down
20 changes: 10 additions & 10 deletions src/mocks/firestoreMock.tsx → src/mocks/FirestoreMock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import { Component } from "react";
import {
getOrganisationsForListingsPage,
OrganisationListingQueryFilters,
} from "../data/model/organisation";
import { db, storage } from "../services/firebase/firebaseConfig";
import { Collections, StorageDirectory } from "../services/firebase/names";
import { IPCStatus } from "../data/enums/ipc-status.enum";
import { testOrgs } from "./testOrganisationsMock";
import { listingsFolder } from "../services/firebase/storage";
} from "../data/Model/Organisation";
import { db, storage } from "../services/Firebase/firebaseConfig";
import { Collections, StorageDirectory } from "../services/Firebase/names";
import { IPCStatus } from "../data/Enums/ipc-status.enum";
import { testOrgs } from "./TestOrganisationsMock";
import { listingsFolder } from "../services/Firebase/storage";
import { getDownloadURL, ref, uploadBytes } from "@firebase/storage";
import { createOrganisationSummary } from "../data/model/organisationSummary";
import { createOrganisationProfileOurStory } from "../data/model/organisationProfile/organisationProfileOurStory";
import { createOrganisationProfilePeopleSpotlight } from "../data/model/organisationProfile/organisationProfilePeopleSpotlight";
import { createOrganisationSummary } from "../data/Model/OrganisationSummary";
import { createOrganisationProfileOurStory } from "../data/Model/OrganisationProfile/OrganisationProfileOurStory";
import { createOrganisationProfilePeopleSpotlight } from "../data/Model/OrganisationProfile/OrganisationProfilePeopleSpotlight";
import { faker } from "@faker-js/faker";
import { QuillEditor } from "./quillEditor";
import { QuillEditor } from "./QuillEditor";

class FirestoreMockPage extends Component {
parseData = async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { IPCStatus } from "../data/enums/ipc-status.enum";
import { Service } from "../data/enums/service.enum";
import { Specialisation } from "../data/enums/specialisation.enum";
import { SupportArea } from "../data/enums/support-area.enum";
import { VerificationStatus } from "../data/enums/verification-status.enum";
import { IOrganisation } from "../data/model/organisation";
import { IProfileContent } from "../data/model/organisationProfile/profileContent";
import { IOrganisationSummary } from "../data/model/organisationSummary";
import { IPCStatus } from "../data/Enums/ipc-status.enum";
import { Service } from "../data/Enums/service.enum";
import { Specialisation } from "../data/Enums/specialisation.enum";
import { SupportArea } from "../data/Enums/support-area.enum";
import { VerificationStatus } from "../data/Enums/verification-status.enum";
import { IOrganisation } from "../data/Model/Organisation";
import { IProfileContent } from "../data/Model/OrganisationProfile/ProfileContent";
import { IOrganisationSummary } from "../data/Model/OrganisationSummary";
import { faker } from "@faker-js/faker";
import { SocialType } from "../data/enums/social-type.enum";
import { IPeopleSpotlight } from "../data/model/organisationProfile/organisationProfilePeopleSpotlight";
import { SocialType } from "../data/Enums/social-type.enum";
import { IPeopleSpotlight } from "../data/Model/OrganisationProfile/OrganisationProfilePeopleSpotlight";

export const testOrg1: IOrganisation = {
name: "Over The Rainbow (OTR)",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { IPCStatus } from "../data/enums/ipc-status.enum";
import { Service } from "../data/enums/service.enum";
import { Specialisation } from "../data/enums/specialisation.enum";
import { SupportArea } from "../data/enums/support-area.enum";
import { VerificationStatus } from "../data/enums/verification-status.enum";
import { IOrganisation } from "../data/model/organisation";
import { IProfileContent } from "../data/model/organisationProfile/profileContent";
import { IOrganisationSummary } from "../data/model/organisationSummary";
import { IPCStatus } from "../data/Enums/ipc-status.enum";
import { Service } from "../data/Enums/service.enum";
import { Specialisation } from "../data/Enums/specialisation.enum";
import { SupportArea } from "../data/Enums/support-area.enum";
import { VerificationStatus } from "../data/Enums/verification-status.enum";
import { IOrganisation } from "../data/Model/Organisation";
import { IProfileContent } from "../data/Model/OrganisationProfile/ProfileContent";
import { IOrganisationSummary } from "../data/Model/OrganisationSummary";
import { faker } from "@faker-js/faker";
import { SocialType } from "../data/enums/social-type.enum";
import { IPeopleSpotlight } from "../data/model/organisationProfile/organisationProfilePeopleSpotlight";
import { SocialType } from "../data/Enums/social-type.enum";
import { IPeopleSpotlight } from "../data/Model/OrganisationProfile/OrganisationProfilePeopleSpotlight";

export const testOrg1: IOrganisation = {
name: "Over The Rainbow (OTR)",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Flex, Stack, Box, Image, Heading } from "@chakra-ui/react";
import NavigationButton from "../../components/navigationButton";
import NavigationButton from "../../components/NavigationButton";

const HeroSection = () => {
return (
Expand Down
6 changes: 3 additions & 3 deletions src/pages/home/home.tsx → src/pages/Home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { VStack } from "@chakra-ui/react";
import { useNavigate } from "react-router-dom";
import HeroSection from "./heroSection";
import SupportSection from "./supportSection";
import TogetherSection from "./togetherSection";
import HeroSection from "./HeroSection";
import SupportSection from "./SupportSection";
import TogetherSection from "./TogetherSection";
import "../style.scss";

const Home: React.FC = () => {
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions src/pages/Home/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Home";
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/pages/login/login.tsx → src/pages/Login/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Flex } from "@chakra-ui/react";
import LoginDesign from "./loginDesign";
import LoginSection from "./loginSection";
import LoginDesign from "./LoginDesign";
import LoginSection from "./LoginSection";
import "./style.scss";

const Login = () => {
Expand Down
File renamed without changes.
Loading
Loading