Skip to content

Commit

Permalink
develop to master (#482)
Browse files Browse the repository at this point in the history 
* UI/layout cleanup (#438)

* run generator

* import connect, theme libs. Add eindow.global. Ensure main.tsx uses React 17 API.

* deletes app test

* updates favicon and title

* remove nx defaults

* rough in layout box, target DH connect nav with class

* remove even more css. World's dubest layout component

* switches to connect class padding for mobile

* extract base layout component to storybook

* hook export chain, change name to outerlayout

* extract formSegment from summon-app; replace in all instances in summon

* extract split-column, replace all instances in summon

* document future changes in comments

* fix exports

* switch core-app to nx default project

* fix spacing

* Fix/split column bug (#444)

- fix bug

* Layouts/subnav (#447)

* clear out extra app.t.tsx

* build sub-nav

* style sub-nav

* test subnav

* extract subNavLink into component

* subnavlink story

* build subnavlink story

* fix broken as prop

* add mobile view, icon button trigger

* add tsc command to core-app

* adds human-format, removes profanity

* Fix summon (#446)

* Fix summon

* clear out extra app.t.tsx

* build sub-nav

* style sub-nav

* test subnav

* extract subNavLink into component

* subnavlink story

* build subnavlink story

* fix broken as prop

* Fix summon

* add mobile view, icon button trigger

* add tsc command to core-app

* adds human-format, removes profanity

* add human-format to dao-data

* move dts file

Co-authored-by: jordan <[email protected]>
Co-authored-by: Jord <[email protected]>

* Haus layout (#451)

* Publish new lib versions. (#412)

* fix/fix-table-types (#354)

* removed the any types from hub

* renamed Table to DaoTable and DataTable to DaoTable to be more consistent with DaoCard

* removed commented out DaoData type

* one more comment -- thought i got both before

* Fix/355 summon params mixup (#356)

* more ignore

* fixes bad init params order in summon tx

* Feature/tag component (#349)

* Created basic tag component

* Added dynamic color selections for tags

* Bumped versions fixed filer

* Added icon support to tag component

Co-authored-by: Jord <[email protected]>
Co-authored-by: Jonathan Prozzi <[email protected]>

* Feature/delegate play (#357)

* more ignore

* fixes bad init params order in summon tx

* delegate testing and subgraph field updates

* finishes mapping

* update dao-data query and transformer

* adds delegate tag to list view and hooks up delegate filtering

* refactors filter into query helper

* Spencer's Summon tooltip suggestions (#370)

* Spencer's Summon tooltip suggestions

- Summon portion of #365 

* Delimiter references

#368

For now, just referencing spaces. But if tabs, commas, or other delimiters are also supported, those should be references in the tooltips as well.

* Address Jord's comments

Co-authored-by: Sam Kuhlmann <[email protected]>

* Fix/summon poll (#375)

* more ignore

* fixes bad init params order in summon tx

* delegate testing and subgraph field updates

* finishes mapping

* update dao-data query and transformer

* adds delegate tag to list view and hooks up delegate filtering

* adds schema field to tx entity

* updates poll for tx entity made before dao entity

* Feature/alpha baal update (#376)

* new abis

* updates summoner tx logic and contract addresses

* fixes transaction entity creation location;

* fixes some test

* Feature/unit utils (#380)

* create custom d.ts for human-format

* type and convert unit fn from V2

* readableNumber util accepts number strings, throws error if string but number string

* fix 0 to 1 utils, extend MaxDecimals to shorten decimal places

* refine spacer and unit symbol placement

* update new card to handle new params

* update table

* corrections

* alter d.ts file

* potential solutions to ts bug

* implement keating's d.ts fix

* fix comment

* Fix/network switcher (#381)

* better error handling

* fix bug

* remove log

* get react-table TS to stop yelling (#382)

Co-authored-by: Sam Kuhlmann <[email protected]>

* Feature/hub sort (#383)

* wip

* gets query working on dao entity after lots of subgraph updates

* updates front end for sort

* fixes type issue

* fixes build issue

* reviewing v3 monorepo and saw some networks missing (#399)

* Feature/public profile (#384)

* Add some stuff

* Add public profile

* Add ens

* Get build to pass

* Update apps/hub-app/src/pages/PublicProfilePage.tsx

Co-authored-by: Rowdy <[email protected]>

Co-authored-by: Sam Kuhlmann <[email protected]>
Co-authored-by: Rowdy <[email protected]>

* fixing doc display name from <[object Object]> to displayName (#402)

Co-authored-by: Sam Kuhlmann <[email protected]>

* adds search (#401)

* adds search wip

* correctly types the onChange for the input

* cleans up unsed imports

* naming

* Feature/public profile (#384)

* Add some stuff

* Add public profile

* Add ens

* Get build to pass

* Update apps/hub-app/src/pages/PublicProfilePage.tsx

Co-authored-by: Rowdy <[email protected]>

Co-authored-by: Sam Kuhlmann <[email protected]>
Co-authored-by: Rowdy <[email protected]>

* fixing doc display name from <[object Object]> to displayName (#402)

Co-authored-by: Sam Kuhlmann <[email protected]>

* conflicts

* correctly types the onChange for the input

* cleans up unsed imports

* naming

* fix build error

Co-authored-by: Alexander Keating <[email protected]>
Co-authored-by: Rowdy <[email protected]>
Co-authored-by: Brian Rossetti <[email protected]>

* Release/12072022 (#411)

* adds search wip

* correctly types the onChange for the input

* cleans up unsed imports

* naming

* conflicts

* correctly types the onChange for the input

* cleans up unsed imports

* naming

* fix build error

* feature bump

Co-authored-by: Jonathan Prozzi <[email protected]>
Co-authored-by: Rowdy <[email protected]>
Co-authored-by: Jord <[email protected]>
Co-authored-by: Spencer Graham <[email protected]>
Co-authored-by: Brian Rossetti <[email protected]>
Co-authored-by: Alexander Keating <[email protected]>

* Revert "Publish new lib versions. (#412)"

This reverts commit bab7077.

* build formLayout Component

* type correction

* build formLayout story

* rough in bicolumn layout

* handle bicolumn mobile switch, finish bicolumn

* fix mainlayout naming

* build story for bi-column layout

* build dh layout one shot?

* yes, one shot

* fix import

* change prop name

Co-authored-by: Jonathan Prozzi <[email protected]>
Co-authored-by: Alexander Keating <[email protected]>
Co-authored-by: Sam Kuhlmann <[email protected]>
Co-authored-by: Rowdy <[email protected]>
Co-authored-by: Spencer Graham <[email protected]>
Co-authored-by: Brian Rossetti <[email protected]>

* bumping packages that were published pre revert last week - causing fialures with package publishing (#460)

* removing period from info content which casues confusing tooltip (#453)

Co-authored-by: Sam Kuhlmann <[email protected]>

* Feature/hub profile menu fix (#480)

* fixes profile link and layout

* dao list style

* adds toast to share link

* Readme tables preferred (#483)

* adjusting breakdown of apps and libs to tables

* adding additoonal app references and libs

* adding timestamp and address fields to many events (#468)

* adding timestamps and address fields to many events

* addressing code review

* shortening naming convention on proposals, top level txHash defined as txHash going forward

* update version

* deploy subgraph and generate query types

Co-authored-by: skuhlmann <[email protected]>

Co-authored-by: Jord <[email protected]>
Co-authored-by: Alexander Keating <[email protected]>
Co-authored-by: jordan <[email protected]>
Co-authored-by: Jonathan Prozzi <[email protected]>
Co-authored-by: Sam Kuhlmann <[email protected]>
Co-authored-by: Rowdy <[email protected]>
Co-authored-by: Spencer Graham <[email protected]>
  • Loading branch information
@brossetti1 @jordanlesich
@alexkeating @jonathanprozzi @skuhlmann @0xRowdy @spengrah
8 people authored Jul 20, 2022
1 parent 399283a commit 5f7d121
Show file tree
Hide file tree
Showing 76 changed files with 1,223 additions and 1,105 deletions.
55 changes: 17 additions & 38 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,14 @@ Our applications in the `apps` folder are our DAO infrastructure and leverage ou
- DAO Producer Job
- v3 Subgraph

#### [Hub App](./apps/hub-app)

- Vite React application with Typescript

Entry point: `apps/hub-app`

#### [Summoner App](./apps/summon-app/)

- Vite React application with Typescript

Entry point: `apps/summon-app`

#### [DAO Producer Job](./apps/jobs/dao-producer-job)

Entry point: `apps/dao-producer-job`

#### [v3 Subgraph](./apps/v3-subgraph/)

Entry point: `apps/v3-subgraph`

Entry point: `apps/summoner-app`
| App | Build | Entry Points |
| ------------------------------------------------ | ----------- | ------------------------------------- |
| [Core App](./apps/core-app) | vite, ts | `apps/core-app` |
| [Hub App](./apps/hub-app) | vite, ts | `apps/hub-app` |
| [Summoner App](./apps/summon-app/) | vite, ts | `apps/summon-app` |
| [DAO Producer Job](./apps/jobs/dao-producer-job) | webpack, ts | `apps/dao-producer-job` |
| [v3 Subgraph](./apps/v3-subgraph/) | webpack, ts | `apps/v3-subgraph, apps/summoner-app` |

### Libs

Expand All @@ -53,25 +40,17 @@ Our libraries in the `libs` folder are structured to be consumed by our apps as
- DAOhaus Connect
- Tx Builder

#### [DAO Data SDK](./libs/dao-data)

Entry point: `libs/dao-data-sdk`

#### [Component Library (UI)](./libs/ui)

Entry point: `libs/ui`

#### [DAOhaus Connect](./libs/daohaus-connect-feature)

Entry point: `libs/daohaus-connect-feature`

#### [Tx Builder](./libs/tx-builder-feature)

Entry point: `libs/tx-builder-feature`

#### [Helm Chart Infrastructure Playbook](./libs/infra-chart)

Entry point: `libs/infra-chart`
| Lib | Entry Point |
| -------------------------------------------------------- | ------------------------------ |
| [ABI Utilities](./libs/abi-utilities/) | `libs/abi-utilities` |
| [Baal Contract Service](./libs/baal-contract-service/) | `libs/baal-contract-service` |
| [Common Utilities](./libs/common-utilities/) | `libs/common-utilities` |
| [DAO Data SDK](./libs/dao-data) | `libs/dao-data-sdk` |
| [Component Library (UI)](./libs/ui) | `libs/ui` |
| [DAOhaus Connect](./libs/daohaus-connect-feature) | `libs/daohaus-connect-feature` |
| [Tx Builder](./libs/tx-builder-feature) | `libs/tx-builder-feature` |
| [Helm Chart Infrastructure Playbook](./libs/infra-chart) | `libs/infra-chart` |

## Getting Started

Expand Down
8 changes: 8 additions & 0 deletions apps/core-app/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
"lintFilePatterns": ["apps/core-app/**/*.{ts,tsx,js,jsx}"]
}
},
"tsc": {
"executor": "@nrwl/workspace:run-commands",
"options": {
"command": "tsc --project apps/core-app/tsconfig.app.json --noEmit --skipLibCheck",
"color": true
}
},

"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/apps/core-app"],
Expand Down
63 changes: 63 additions & 0 deletions apps/core-app/src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import styled from 'styled-components';

import { BiColumnLayout, Card, FormLayout, widthQuery } from '@daohaus/ui';
import { HausLayout } from '@daohaus/daohaus-connect-feature';

const LeftCard = styled(Card)`
width: 100%;
min-width: 54rem;
max-width: 64rem;
height: 47rem;
@media ${widthQuery.md} {
max-width: 100%;
min-width: 0;
}
`;

const RightCard = styled(Card)`
width: 100%;
min-width: 38rem;
max-width: 45rem;
height: 77rem;
@media ${widthQuery.md} {
max-width: 100%;
min-width: 0;
}
`;

const Spacer = styled.div`
width: 100%;
height: 50rem;
`;

export function App() {
return (
<HausLayout
navLinks={[
{ label: 'Home', href: '/home' },
{ label: 'Proposals', href: '/proposals' },
{ label: 'Vaults', href: '/vaults' },
{ label: 'Members', href: '/members' },
]}
dropdownLinks={[{ label: 'Settings', href: '/settings' }]}
>
<FormLayout
title="Title"
description="this is a nice long description where I talk about things"
subtitle="Something nicer"
>
<Card>
<Spacer />
</Card>
</FormLayout>
{/* <BiColumnLayout
subtitle="Disperse Proposal"
title="Disperse Reimbursements for April ‘22 Event"
left={<LeftCard>Left</LeftCard>}
right={<RightCard>Right</RightCard>}
/> */}
</HausLayout>
);
}

export default App;
Loading

0 comments on commit 5f7d121

Please sign in to comment.