Merge pull request #39 from nadavWeisler/wizrad-ui

Wizrad UI

psych-info-ui/package.json

@@ -14,6 +14,7 @@
     "@mui/icons-material": "^5.14.12",
     "@mui/material": "^5.14.12",
     "@reduxjs/toolkit": "^1.9.7",
+    "encoding": "^0.1.13",
     "firebase": "^10.4.0",
     "i18next": "^23.5.1",
     "next": "13.5.4",

psych-info-ui/src/app/Components/AdminComp/IncomingRequests.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { useState, useEffect, Fragment } from "react";
-import { Content } from "@/app/General/interfaces";
+import { Content } from "@/app/general/interfaces";
 import { Typography } from "@mui/material";
 import RequestAccordion from "@/app/Components/AdminComp/RequestAccordion";
 import { getPendingContent } from "@/app/firebase/commands";

psych-info-ui/src/app/Components/AdminComp/RequestAccordion.tsx

@@ -9,7 +9,7 @@ import {
     Button,
 } from "@mui/material";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { RequestAccordionProps } from "@/app/General/interfaces";
+import { RequestAccordionProps } from "@/app/general/interfaces";
 import AccordionContent from "@/app/Components/ResultComp/AccordionContent";
 import { deletePendingContent, createContent } from "@/app/firebase/commands";
 

psych-info-ui/src/app/Components/AdminComp/SigninForm.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { useState, useEffect } from "react";
 import { Button, TextField, Box } from "@mui/material";
-import { AdminSignInFormProps } from "@/app/General/interfaces";
+import { AdminSignInFormProps } from "@/app/general/interfaces";
 
 function SigninForm({
     handleSubmit = () => null,

psych-info-ui/src/app/Components/ResultComp/AccordionContent.tsx

@@ -1,5 +1,5 @@
 import { Typography, Box } from "@mui/material";
-import { Content } from "@/app/General/interfaces";
+import { Content } from "@/app/general/interfaces";
 
 function AccordionContent({
     title = "",

psych-info-ui/src/app/Components/ResultComp/ResultPrePage.tsx

@@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
 import { Typography, Button } from "@mui/material";
 import ResultAccordion from "@/app/Components/ResultComp/ResultAccordion";
 import { getContent } from "@/app/firebase/commands";
-import { Content, Operator } from "@/app/General/interfaces";
+import { Content, Operator } from "@/app/general/interfaces";
 
 const operator = Operator.AND;
 

psych-info-ui/src/app/Components/ResultComp/ShareDialog.tsx

@@ -20,7 +20,7 @@ import {
     LinkedinIcon,
     TelegramIcon,
 } from "react-share";
-import { ShareDialogProps } from "@/app/General/interfaces";
+import { ShareDialogProps } from "@/app/general/interfaces";
 
 function ShareDialog({
     open = false,

psych-info-ui/src/app/Components/UI/NavBar.tsx

@@ -4,7 +4,6 @@ import {
     AppBar,
     Toolbar,
     Typography,
-    Button,
     Select,
     MenuItem,
     Container,
@@ -25,12 +24,12 @@ function Navbar() {
     const handleOpenMenu = () => setOpenMenu(true);
     const handleCloseMenu = () => setOpenMenu(false);
     const [authUser, setAuthUser] = useState<User | null>(null);
-    const [width, setWidth] = useState<number>(window?.innerWidth);
+    const [width, setWidth] = useState<number>(window.innerWidth);
 
     const { user } = useContext(AuthContext);
 
     function handleWindowSizeChange() {
-        setWidth();
+        setWidth(window.innerWidth);
     }
 
     useEffect(() => {

psych-info-ui/src/app/Components/Wizard/steps/LangStep.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect, Fragment } from "react";
 import { Chip, Grid, Typography } from "@mui/material";
 import { Language, Tag } from "@/app/general/interfaces";
-import { GetAllDisplays, ListContainsById } from "@/app/General/utils";
+import { GetAllDisplays, ListContainsById } from "@/app/general/utils";
 import { useTranslation } from "react-i18next";
 
 interface LangStepProps {

psych-info-ui/src/app/Components/Wizard/steps/OrgsStep.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect, Fragment } from "react";
 import { Chip, Grid, Typography } from "@mui/material";
 import { Organization } from "@/app/general/interfaces";
-import { GetAllDisplays, ListContainsById } from "@/app/General/utils";
+import { GetAllDisplays, ListContainsById } from "@/app/general/utils";
 import { useTranslation } from "react-i18next";
 
 interface OrganizationStepProps {

psych-info-ui/src/app/Components/Wizard/steps/TagsStep.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect, Fragment } from "react";
 import { Chip, Grid, Typography } from "@mui/material";
 import { Tag } from "@/app/general/interfaces";
-import { GetAllDisplays, ListContainsById } from "@/app/General/utils";
+import { GetAllDisplays, ListContainsById } from "@/app/general/utils";
 import { useTranslation } from "react-i18next";
 
 interface TagsStepProps {

psych-info-ui/src/app/General/utils.tsx

@@ -1,4 +1,4 @@
-import { Filter, Language, Organization, StringObject, Tag } from "./interfaces";
+import { Filter, Language, Organization, StringObject, Tag } from "@/app/general/interfaces";
 
 export function ListContainsById(StringObjectList: Tag[] | Organization[] | StringObject[], id: string): boolean {
     return StringObjectList.some((item) => item.id === id);

psych-info-ui/src/app/firebase/commands.ts

@@ -6,7 +6,7 @@ import {
     Operator,
     Organization,
     Tag,
-} from "@/app/General/interfaces";
+} from "@/app/general/interfaces";
 
 export async function getAllTags(used: boolean): Promise<Tag[]> {
     try {

psych-info-ui/src/app/layout.tsx

@@ -6,7 +6,7 @@ import AuthProvider from "@/app/context/AuthContext";
 
 import "../i18n/config";
 import { ThemeProvider } from "@mui/material/styles";
-import { appTheme } from "./General/styles";
+import { appTheme } from "./general/styles";
 
 const inter = Inter({ subsets: ["latin"] });
 

psych-info-ui/src/app/page.tsx

@@ -5,7 +5,7 @@ import Wizrad from "@/app/Components/Wizard/Wizard";
 import WelcomeMsg from "@/app/Components/UI/WelcomeMsg";
 import { Provider } from "react-redux";
 import store from "@/app/store";
-import { Filter } from "./General/interfaces";
+import { Filter } from "./general/interfaces";
 import Gallary from "./Components/gallary/gallary";
 import { GetFilters } from "./general/utils";
 

psych-info-ui/src/app/upload/page.tsx

@@ -16,20 +16,20 @@ import {
     SelectChangeEvent,
     Theme,
 } from "@mui/material";
-import { appTheme } from "@/app/General/styles";
+import { appTheme } from "@/app/general/styles";
 import { AddString } from "../Components/addString";
 import {
     Content,
     Language,
     Organization,
     StringObject,
     Tag,
-} from "@/app/General/interfaces";
+} from "@/app/general/interfaces";
 import {
     EMPTY_LANGUAGE,
     EMPTY_ORGANIZATION,
     EMPTY_TAG,
-} from "@/app/General/utils";
+} from "@/app/general/utils";
 import {
     createLanguage,
     createOrganization,