Skip to content

Commit

Permalink
Merge pull request #407 from GenaDrop/staging
Browse files Browse the repository at this point in the history
Staging to main
  • Loading branch information
Ebube111 authored Aug 14, 2024
2 parents c773d56 + c6dd012 commit 3233cd3
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 10 deletions.
6 changes: 4 additions & 2 deletions apps/Mintbase/widget/Mintbase/App/DAOs/Index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const MintDAOs = ({ isDarkModeOn }) => {
</div>
<div className="type">
<div>
<p> Member of a DAO</p>
<p>Member of a DAO</p>
<p className="green"></p>
</div>
<div>
Expand All @@ -162,7 +162,9 @@ const MintDAOs = ({ isDarkModeOn }) => {
))
) : (
<div>
<h4>No Result Found</h4>
<h4 style={{ color: isDarkModeOn ? "#fff" : "" }}>
No Result Found
</h4>
</div>
)}
</div>
Expand Down
15 changes: 9 additions & 6 deletions apps/Mintbase/widget/Mintbase/App/Resources/routes/Guide.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const { Post } = VM.require("${config_account}/widget/components.Index") || {

const MarkdownContainer = styled.div`
max-width: 888px;
padding: 0 55px 55px 55px;
padding: 55px 55px 55px 55px;
background: var(--bg-1, ${isDarkModeOn ? "#000" : "#fff"});
border-radius: 23px;
border: 1px solid #ccc;
Expand Down Expand Up @@ -92,10 +92,13 @@ const MarkdownContainer = styled.div`
}
`;

const HeaderStyle = styled.div`
// padding: 40px 0;
`;

function MarkdownView(props) {
const content = fetch(`${props.path}`);
if (content === null) return "";
console.log(content);
return (
<MarkdownContainer>
<Markdown text={content.body} />
Expand All @@ -108,24 +111,24 @@ const postAccountId = props.postAccountId;

if (mdPath && !postAccountId) {
return (
<div>
<HeaderStyle>
{/* <Header>{props.feedName}</Header> */}
<MarkdownView path={mdPath} />
</div>
</HeaderStyle>
);
}

if (!mdPath && postAccountId) {
return (
<div>
<Header>
{/* <Header>{props.feedName}</Header> */}

<Post
accountId={postAccountId}
blockHeight={props.postBlockHeight}
noBorder={true}
/>
</div>
</Header>
);
}

Expand Down
14 changes: 12 additions & 2 deletions apps/Mintbase/widget/Mintbase/App/Search/Index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ const Search = ({ tab, isDarkModeOn }) => {
</div>
</div> */}
<div className="contracts">
<h1>{searchedUsers?.length} Humans Results</h1>
<h1 style={{ color: isDarkModeOn ? "#fff" : "" }}>
{searchedUsers?.length} Humans Results
</h1>
{loadingUsers ? (
<div className="user">
<span className="animate-pulse"></span>
Expand Down Expand Up @@ -307,7 +309,15 @@ const Search = ({ tab, isDarkModeOn }) => {
</div>
</Gallery>
) : (
<h4>No Result Found</h4>
<h4
style={{
color: isDarkModeOn ? "#fff" : "",
textAlign: "center",
minHeight: 100,
}}
>
No Result Found
</h4>
)}
</div>
</SearchContainer>
Expand Down

0 comments on commit 3233cd3

Please sign in to comment.