Skip to content

Commit

Permalink
Updated Styles and Tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@NishalJohn
NishalJohn committed Nov 6, 2023
1 parent d25a394 commit 1d4a3dd
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 135 deletions.
10 changes: 5 additions & 5 deletions src/Navbar.js
View file
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -13,21 +13,21 @@ const items = [
<CustomLink to={'/home'}>Home</CustomLink>
),
key: 'home',
icon: <MailOutlined />,
icon: <HomeOutlined />,
},
{
label: (
<CustomLink to={'/assets'}>Assets</CustomLink>
),
key: 'assets',
icon: <AppstoreOutlined />,
icon: <FireOutlined />,
},
{
label: (
<CustomLink to={'/resources'}>Resources</CustomLink>
),
key: 'resources',
icon: <AppstoreOutlined />,
icon: <InboxOutlined />,
},
// {
// label: (
Expand Down Expand Up @@ -58,7 +58,7 @@ export const NavBar = () => {

return (
<div className='nav-bar-wrapper'>
<Menu onClick={onClick} selectedKeys={[current]} mode="horizontal" items={items} />
<Menu onClick={onClick} style={{minWidth: '800px'}} selectedKeys={[current]} mode="horizontal" items={items} />
<Button type="link" onClick={logOut}>Sign out</Button>
</div>

Expand Down
45 changes: 20 additions & 25 deletions src/pages/AssetLibrary/AnimationAssetLibraryModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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 ");

Expand Down Expand Up @@ -169,7 +164,7 @@ export const AnimationAssetLibraryModal = ({onAddResource}) => {
// console.log('Change:', e.target.value);
};


const onProjectChange = (e) => {
switch (e) {
case "Internal":
Expand Down Expand Up @@ -209,7 +204,7 @@ export const AnimationAssetLibraryModal = ({onAddResource}) => {
return (
<div className="asset-library">
<Button onClick={showModal}>
<PlusOutlined /> Animation
<PlusOutlined /> Animation
</Button>
<Modal
title=""
Expand Down
32 changes: 16 additions & 16 deletions src/pages/AssetLibrary/AssetLibrary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ export const AssetLibrary = () => {
inhouseData.docs.map((doc) => ({
...doc.data(),
id: doc.id,
key: doc.id
// key: doc.id
}))
)
const marketData = await getDocs(marketplaceAssetList);
filteredRefData.push(
marketData.docs.map((doc) => ({
...doc.data(),
id: doc.id,
key: doc.id
// key: doc.id
}))
)
const animationData = await getDocs(animationAssetList);
filteredRefData.push(
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)
Expand Down Expand Up @@ -152,7 +152,7 @@ export const AssetLibrary = () => {
{assetSearchData.map((asset) => (
<>
{asset.group == "Market" ? (
<div className='asset-list-item'>
<div key={asset.id} className='asset-list-item'>
<div className='asset-icon-wrapper'>
{/* <MessageOutlined style={{ fontSize: '75px' }} /> */}
</div>
Expand All @@ -173,20 +173,20 @@ export const AssetLibrary = () => {
<Title level={5}>{asset.project}</Title>
<Text type="secondary">{asset.client}</Text>
</div>
<div className='asset-tags-wrapper'>
{/* <div className='asset-tags-wrapper'>
{asset.tags.map((tag) => (
<Tag bordered={false} color="processing">
<Tag key={tag} bordered={false} color="processing">
{tag}
</Tag>
))}
</div>
</div> */}
<div className='asset-actions-wrapper'>
<Button>View</Button>
<Button type="link">Edit</Button>
</div>
</div>
) : asset.group == "Animation" ? (
<div className='asset-list-item'>
<div key={asset.id} className='asset-list-item'>
<div className='asset-icon-wrapper'>
{/* <ClockCircleOutlined style={{ fontSize: '75px' }} /> */}
</div>
Expand All @@ -211,20 +211,20 @@ export const AssetLibrary = () => {
<Title level={5}>{asset.project}</Title>
<Text type="secondary">{asset.client}</Text>
</div>
<div className='asset-tags-wrapper'>
{/* <div className='asset-tags-wrapper'>
{asset.tags.map((tag) => (
<Tag bordered={false} color="processing">
<Tag key={tag} bordered={false} color="processing">
{tag}
</Tag>
))}
</div>
</div> */}
<div className='asset-actions-wrapper'>
<Button>View</Button>
<Button type="link">Edit</Button>
</div>
</div>
) : (
<div className='asset-list-item'>
<div key={asset.id} className='asset-list-item'>
<div className='asset-icon-wrapper'>
{/* <ClockCircleOutlined style={{ fontSize: '75px' }} /> */}
</div>
Expand All @@ -248,13 +248,13 @@ export const AssetLibrary = () => {
<Title level={5}>{asset.project}</Title>
<Text type="secondary">{asset.client}</Text>
</div>
<div className='asset-tags-wrapper'>
{/* <div className='asset-tags-wrapper'>
{asset.tags.map((tag) => (
<Tag bordered={false} color="processing">
<Tag key={tag} bordered={false} color="processing">
{tag}
</Tag>
))}
</div>
</div> */}
<div className='asset-actions-wrapper'>
<Button>View</Button>
<Button type="link">Edit</Button>
Expand Down
42 changes: 20 additions & 22 deletions src/pages/AssetLibrary/AssetLibraryModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -306,6 +303,7 @@ export const AssetLibraryModal = ({onAddResource}) => {
<Option value="Electronic">Electronic</Option>
<Option value="Vehicle">Vehicle</Option>
<Option value="Character">Character</Option>
<Option value="Animal">Animal</Option>
<Option value="Weapon">Weapon</Option>
<Option value="Furniture">Furniture</Option>
<Option value="Foliage">Foliage</Option>
Expand Down
Loading

0 comments on commit 1d4a3dd

Please sign in to comment.