Skip to content

Commit

Permalink
Merge pull request #105 from GenaDrop/stagging
Browse files Browse the repository at this point in the history
Stagging
  • Loading branch information
Jikugodwill authored Feb 5, 2024
2 parents ea354ba + 6a14fb8 commit cbbb729
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 46 deletions.
2 changes: 1 addition & 1 deletion apps/BosGenaDrop/widget/DropFlow/ArtistPage/theme0.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ return (
<span className="username">@{accountId ?? "creativedao.near"}</span>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description && profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
2 changes: 1 addition & 1 deletion apps/BosGenaDrop/widget/DropFlow/ArtistPage/theme1.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ return (
<h1 className="title">About The Artist</h1>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description && profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
3 changes: 2 additions & 1 deletion apps/BosGenaDrop/widget/DropFlow/ArtistPage/theme2.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ return (
<span className="username">@{accountId ?? "creativedao.near"}</span>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description &&
profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
37 changes: 17 additions & 20 deletions apps/BosGenaDrop/widget/DropFlow/CreatePage/Index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ const Loading = styled.div`
color: #b0b0b0;
font-size: 14px;
}
.btn-outline-primary {
background-color: #000;
border-color: #fff;
color: #fff;
:hover {
background-color: #fff;
border-color: #000;
color: #000;
}
}
`;

const Tabs = styled.div`
Expand Down Expand Up @@ -299,32 +310,18 @@ if (context.accountId && accountId !== context.accountId) {
<Loading>
<h5>You are not authorized to edit this profile</h5>
<p>Please open the profile you're currently logged in to</p>
<Link
className="btn btn-outline-primary ms-2 rounded-5"
href={`/bos.genadrop.near/widget/DropFlow.ArtistPage.Index?accountId=${context.accountId}`}
>
Go to your profile
</Link>
</Loading>
);
}

return (
<Wrapper>
{/* <Tabs>
<Tab
onClick={() => {
setActiveTab(1);
setSearchValue("");
}}
selected={activeTab === 1}
>
<h2>Editor</h2>
</Tab>
<Tab
onClick={() => {
setActiveTab(2);
setSearchValue("");
}}
selected={activeTab === 2}
>
<h2>New</h2>
</Tab>
</Tabs> */}
{activeTab === 1 ? (
<Widget
src="bos.genadrop.near/widget/DropFlow.CreatePage.New"
Expand Down
2 changes: 1 addition & 1 deletion build/BosGenaDrop/src/DropFlow/ArtistPage/theme0.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ return (
<span className="username">@{accountId ?? "creativedao.near"}</span>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description && profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
2 changes: 1 addition & 1 deletion build/BosGenaDrop/src/DropFlow/ArtistPage/theme1.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ return (
<h1 className="title">About The Artist</h1>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description && profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
3 changes: 2 additions & 1 deletion build/BosGenaDrop/src/DropFlow/ArtistPage/theme2.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@ return (
<span className="username">@{accountId ?? "creativedao.near"}</span>
<p className="description">
{/* Truncate the description if it's longer than 6 lines */}
{profile && profile.description.split("\n").length > 6 ? (
{profile.description &&
profile.description.split("\n").length > 6 ? (
<>
{profile.description
.split("\n")
Expand Down
37 changes: 17 additions & 20 deletions build/BosGenaDrop/src/DropFlow/CreatePage/Index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ const Loading = styled.div`
color: #b0b0b0;
font-size: 14px;
}
.btn-outline-primary {
background-color: #000;
border-color: #fff;
color: #fff;
:hover {
background-color: #fff;
border-color: #000;
color: #000;
}
}
`;

const Tabs = styled.div`
Expand Down Expand Up @@ -299,32 +310,18 @@ if (context.accountId && accountId !== context.accountId) {
<Loading>
<h5>You are not authorized to edit this profile</h5>
<p>Please open the profile you're currently logged in to</p>
<Link
className="btn btn-outline-primary ms-2 rounded-5"
href={`/bos.genadrop.near/widget/DropFlow.ArtistPage.Index?accountId=${context.accountId}`}
>
Go to your profile
</Link>
</Loading>
);
}

return (
<Wrapper>
{/* <Tabs>
<Tab
onClick={() => {
setActiveTab(1);
setSearchValue("");
}}
selected={activeTab === 1}
>
<h2>Editor</h2>
</Tab>
<Tab
onClick={() => {
setActiveTab(2);
setSearchValue("");
}}
selected={activeTab === 2}
>
<h2>New</h2>
</Tab>
</Tabs> */}
{activeTab === 1 ? (
<Widget
src="bos.genadrop.near/widget/DropFlow.CreatePage.New"
Expand Down

0 comments on commit cbbb729

Please sign in to comment.