diff --git a/src/Navbar.js b/src/Navbar.js index 37c273f..a3e0e8b 100644 --- a/src/Navbar.js +++ b/src/Navbar.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { AppstoreOutlined, MailOutlined, SettingOutlined } from '@ant-design/icons'; +import { InboxOutlined, HomeOutlined, FireOutlined } from '@ant-design/icons'; import { createUserWithEmailAndPassword, signInWithPopup, signOut } from "firebase/auth"; import { Menu, Button } from 'antd'; @@ -13,21 +13,21 @@ const items = [ Home ), key: 'home', - icon: , + icon: , }, { label: ( Assets ), key: 'assets', - icon: , + icon: , }, { label: ( Resources ), key: 'resources', - icon: , + icon: , }, // { // label: ( @@ -58,7 +58,7 @@ export const NavBar = () => { return (
- +
diff --git a/src/pages/AssetLibrary/AnimationAssetLibraryModal.js b/src/pages/AssetLibrary/AnimationAssetLibraryModal.js index 2811ea9..79f5b26 100644 --- a/src/pages/AssetLibrary/AnimationAssetLibraryModal.js +++ b/src/pages/AssetLibrary/AnimationAssetLibraryModal.js @@ -5,7 +5,7 @@ import { addDoc, collection } from 'firebase/firestore'; import { db } from "../../config/firebase"; import { PlusCircleOutlined, CheckOutlined, UserOutlined, MehOutlined, PlusOutlined } from '@ant-design/icons'; -export const AnimationAssetLibraryModal = ({onAddResource}) => { +export const AnimationAssetLibraryModal = ({ onAddResource }) => { const [pipelineAssignees, setPipelineAssignees] = useState({ "Writing": 'nan', @@ -53,32 +53,27 @@ export const AnimationAssetLibraryModal = ({onAddResource}) => { const tagsData = ["Architecture", "Sci-Fi", "Realistic", - "Cartoon", + "Low-Poly", + "Modern", "Fantasy", - "Steampunk", - "Cyberpunk", - "Minimalist", - "Retro", - "Gothic", - "Medical", + "Steam/Cyber punk", "Horror", - "Adventure", - "Sports", "Medieval", - "Victorian", - "Metal", - "Wood", - "Stone", - "Glass", - "Plastic", - "Organic", - "Fabric", - "Ceramics", - "Underwater", "Forest", - "Arctic", - "Tropical", - "Mountainous"]; + "Underground", + "Kitchen", + "Interior", + "Hospital", + "Outdoor", + "Farm", + "Cave", + "Underwater", + "Furniture", + "Electronic", + "Construction", + "Food", + "Sports", + "Medical"]; //------------------------ const resourceListRef = collection(db, "animation-assets "); @@ -169,7 +164,7 @@ export const AnimationAssetLibraryModal = ({onAddResource}) => { // console.log('Change:', e.target.value); }; - + const onProjectChange = (e) => { switch (e) { case "Internal": @@ -209,7 +204,7 @@ export const AnimationAssetLibraryModal = ({onAddResource}) => { return (
{ inhouseData.docs.map((doc) => ({ ...doc.data(), id: doc.id, - key: doc.id + // key: doc.id })) ) const marketData = await getDocs(marketplaceAssetList); @@ -37,7 +37,7 @@ export const AssetLibrary = () => { marketData.docs.map((doc) => ({ ...doc.data(), id: doc.id, - key: doc.id + // key: doc.id })) ) const animationData = await getDocs(animationAssetList); @@ -45,11 +45,11 @@ export const AssetLibrary = () => { animationData.docs.map((doc) => ({ ...doc.data(), id: doc.id, - key: doc.id + // key: doc.id })) ) filterAllData(filteredRefData); - // console.log(filteredRefData); + console.log(filteredRefData); } catch (err) { console.error(err) @@ -152,7 +152,7 @@ export const AssetLibrary = () => { {assetSearchData.map((asset) => ( <> {asset.group == "Market" ? ( -
+
{/* */}
@@ -173,20 +173,20 @@ export const AssetLibrary = () => { {asset.project} {asset.client}
-
+ {/*
{asset.tags.map((tag) => ( - + {tag} ))} -
+
*/}
) : asset.group == "Animation" ? ( -
+
{/* */}
@@ -211,20 +211,20 @@ export const AssetLibrary = () => { {asset.project} {asset.client}
-
+ {/*
{asset.tags.map((tag) => ( - + {tag} ))} -
+
*/}
) : ( -
+
{/* */}
@@ -248,13 +248,13 @@ export const AssetLibrary = () => { {asset.project} {asset.client}
-
+ {/*
{asset.tags.map((tag) => ( - + {tag} ))} -
+
*/}
diff --git a/src/pages/AssetLibrary/AssetLibraryModal.js b/src/pages/AssetLibrary/AssetLibraryModal.js index cd85fda..58366eb 100644 --- a/src/pages/AssetLibrary/AssetLibraryModal.js +++ b/src/pages/AssetLibrary/AssetLibraryModal.js @@ -50,32 +50,29 @@ export const AssetLibraryModal = ({onAddResource}) => { const tagsData = ["Architecture", "Sci-Fi", "Realistic", - "Cartoon", + "Low-Poly", + "Modern", "Fantasy", - "Steampunk", - "Cyberpunk", - "Minimalist", - "Retro", - "Gothic", - "Medical", + "Steam/Cyber punk", "Horror", - "Adventure", - "Sports", "Medieval", - "Victorian", - "Metal", - "Wood", - "Stone", - "Glass", - "Plastic", - "Organic", - "Fabric", - "Ceramics", - "Underwater", "Forest", - "Arctic", - "Tropical", - "Mountainous"]; + "Underground", + "Kitchen", + "Interior", + "Hospital", + "Outdoor", + "Farm", + "Cave", + "Underwater", + "Furniture", + "Electronic", + "Construction", + "Food", + "Sports", + "Medical", + + ]; //------------------------ const resourceListRef = collection(db, "inhouse-assets"); @@ -306,6 +303,7 @@ export const AssetLibraryModal = ({onAddResource}) => { + diff --git a/src/pages/AssetLibrary/MarketplaceAssetLibraryModal.js b/src/pages/AssetLibrary/MarketplaceAssetLibraryModal.js index 3fb7b9e..caffa79 100644 --- a/src/pages/AssetLibrary/MarketplaceAssetLibraryModal.js +++ b/src/pages/AssetLibrary/MarketplaceAssetLibraryModal.js @@ -3,9 +3,9 @@ import { Link } from 'react-router-dom'; import { Button, Modal, Form, Input, Slider, Select, Typography, Empty, Radio, Space, Tag, Steps } from 'antd'; import { addDoc, collection } from 'firebase/firestore'; import { db } from "../../config/firebase"; -import { PlusCircleOutlined, CheckOutlined, PlusOutlined} from '@ant-design/icons'; +import { PlusCircleOutlined, CheckOutlined, PlusOutlined } from '@ant-design/icons'; -export const MarketplaceAssetLibraryModal = ({onAddResource}) => { +export const MarketplaceAssetLibraryModal = ({ onAddResource }) => { const [open, setOpen] = useState(false); const [confirmLoading, setConfirmLoading] = useState(false); @@ -39,49 +39,29 @@ export const MarketplaceAssetLibraryModal = ({onAddResource}) => { const tagsData = ["Architecture", "Sci-Fi", "Realistic", - "Cartoon", + "Low-Poly", + "Modern", "Fantasy", - "Steampunk", - "Cyberpunk", - "Minimalist", - "Retro", - "Gothic", - "Medical", + "Steam/Cyber punk", "Horror", - "Adventure", - "Sports", "Medieval", - "Victorian", - "Metal", - "Wood", - "Stone", - "Glass", - "Plastic", - "Organic", - "Fabric", - "Ceramics", - "Underwater", "Forest", - "Arctic", - "Tropical", - "Mountainous"]; + "Underground", + "Kitchen", + "Interior", + "Hospital", + "Outdoor", + "Farm", + "Cave", + "Underwater", + "Furniture", + "Electronic", + "Construction", + "Food", + "Sports", + "Medical"]; //------------------------ - const options = [ - { - label: 'Apple', - value: 'Apple', - }, - { - label: 'Pear', - value: 'Pear', - }, - { - label: 'Orange', - value: 'Orange', - }, - ]; - const resourceListRef = collection(db, "marketplace-assets"); @@ -142,7 +122,7 @@ export const MarketplaceAssetLibraryModal = ({onAddResource}) => { return (
{ assettype: "Prop", source: "epic", project: "Internal", - assetCategory:"3D Animation" + assetCategory: "3D Animation" }} >
@@ -258,7 +238,8 @@ export const MarketplaceAssetLibraryModal = ({onAddResource}) => { label="Asset Type" >