Skip to content

New app pattern #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elliotBraem merged 14 commits into from
Apr 11, 2024
Merged

New app pattern #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
967110b
Move app to every.app pattern
itexpert120 Apr 9, 2024
a3e4b13
fmt
itexpert120 Apr 9, 2024
61055fd
Move feed to new app layout
itexpert120 Apr 11, 2024
e1efe5c
Move all pages to new app layout'
itexpert120 Apr 11, 2024
10cf699
Replace alias
itexpert120 Apr 11, 2024
4dfcd35
Fix formatting
itexpert120 Apr 11, 2024
052de5b
Cleanup
itexpert120 Apr 11, 2024
64b9b9d
Remove directory
itexpert120 Apr 11, 2024
ef1deb2
Fix project page
itexpert120 Apr 11, 2024
3bacb07
configure testnet
itexpert120 Apr 11, 2024
17e009e
Fixes
itexpert120 Apr 11, 2024
40caf01
Fix testnet
itexpert120 Apr 11, 2024
c9d0650
Merge branch 'develop' into new-app-pattern
elliotBraem Apr 11, 2024
24c74dd
fix layout and default testnet
elliotBraem Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/builddao/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"buildhub.near": {}
"builddao.testnet": {}
}
2 changes: 1 addition & 1 deletion apps/builddao/widget/Feed.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const LoginContainer = styled.div`
margin-bottom: 1rem;
`;

const { name: feedName, template, requiredHashtags, customActions } = props;
const { feedName, template, requiredHashtags, customActions } = props;

// for modals
const [item, setItem] = useState(null);
Expand Down
6 changes: 3 additions & 3 deletions apps/builddao/widget/Resources.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const postAccountId = props.postAccountId;
if (mdPath && !postAccountId) {
return (
<div>
<Header>{props.name}</Header>
<Header>{props.feedName}</Header>
<MarkdownView path={mdPath} />
</div>
);
Expand All @@ -25,7 +25,7 @@ if (mdPath && !postAccountId) {
if (!mdPath && postAccountId) {
return (
<div>
<Header>{props.name}</Header>
<Header>{props.feedName}</Header>

<Post
accountId={postAccountId}
Expand All @@ -38,7 +38,7 @@ if (!mdPath && postAccountId) {

return (
<div>
<Header>{props.name}</Header>
<Header>{props.feedName}</Header>
<p>No mdPath or post accountId configured</p>
</div>
);
9 changes: 4 additions & 5 deletions apps/builddao/widget/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const config = {
"--secondary-color": "white",
background: "var(--main-color)",
color: "var(--secondary-color)",
height: "100vh"
},
layout: {
src: "${alias_devs}/widget/Layout",
Expand All @@ -19,7 +18,7 @@ const config = {
// customize your header
<Widget
src="${config_account}/widget/components.Navbar"
props={{ routes: config.router.routes, ...passProps }}
props={{ routes: config.router.routes, ...passProps, page: props.page }}
/>
),
Footer: () => <></>, // customize your footer
Expand All @@ -43,10 +42,10 @@ const config = {
},
},
proposal: {
path: "${config_account}/widget/page.projects",
path: "${config_account}/widget/page.proposal",
blockHeight: "final",
init: {
name: "Projects",
name: "Proposals",
},
},
resources: {
Expand Down Expand Up @@ -80,7 +79,7 @@ const config = {
hide: true,
},
projects: {
path: "${config_account}/widget/page.project-feed",
path: "${config_account}/widget/page.projects",
blockHeight: "final",
init: {
name: "Project Feed",
Expand Down
275 changes: 0 additions & 275 deletions apps/builddao/widget/app.old.jsx
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions apps/builddao/widget/app/view.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ if (!config) {

const Layout = VM.require(
config.layout?.src ?? "${alias_devs}/widget/Layout",
) || (() => <></>);
) || {
Layout: () => <></>,
};

// While something like Theme should be in the parent...
const CSS = styled.div`
Expand Down Expand Up @@ -85,8 +87,6 @@ const Content = styled.div`
`;

// const Template = config.Template ?? (({children}) => <>{children}</>);
console.log("view props", passProps);

return (
<CSS style={config.theme}>
<Container>
Expand Down
2 changes: 1 addition & 1 deletion apps/builddao/widget/components/modals/propose/Text.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ return (
proposalType: "Add Member",
}}
/>
{console.log(notificationsData)}
{/* {console.log(notificationsData)} */}
<div className="w-100 d-flex">
<Button
className="ms-auto"
Expand Down
Loading