diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 729f32995..f38d5a155 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -43,9 +43,9 @@ jobs: ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-testnet-documents/_search' ELASTIC_SEARCH_API_KEY: ${{ secrets.DEV_ELASTIC_SEARCH_API_KEY }} IPFS_URL: 'ipfs.infura.io' - IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM' + IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz' IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }} - IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/' + IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/' MULTISIG_CONTRACT: 'msig.hypha' - name: S3 sync uses: jakejarvis/s3-sync-action@master diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index b2d5ea5fa..aca30bdfa 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -43,9 +43,9 @@ jobs: ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-mainnet-documents/_search' ELASTIC_SEARCH_API_KEY: ${{ secrets.PROD_ELASTIC_SEARCH_API_KEY }} IPFS_URL: 'ipfs.infura.io' - IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM' + IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz' IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }} - IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/' + IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/' MULTISIG_CONTRACT: 'msigdhohypha' - name: S3 sync diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 4f6fe8e48..f58499374 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -43,9 +43,9 @@ jobs: ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-mainnet-documents/_search' ELASTIC_SEARCH_API_KEY: ${{ secrets.PROD_ELASTIC_SEARCH_API_KEY }} IPFS_URL: 'ipfs.infura.io' - IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM' + IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz' IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }} - IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/' + IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/' MULTISIG_CONTRACT: 'msigdhohypha' - name: S3 sync diff --git a/CHANGELOG.md b/CHANGELOG.md index 66da25c19..ffa589894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,44 @@ # Changelog +## [2.12.0](https://github.com/hypha-dao/dho-web-client/compare/v2.11.0...v2.12.0) (2022-09-14) + + +### Features + +* add "edit" button for active documents ([#1567](https://github.com/hypha-dao/dho-web-client/issues/1567)) ([#1583](https://github.com/hypha-dao/dho-web-client/issues/1583)) ([adda57c](https://github.com/hypha-dao/dho-web-client/commit/adda57c80d72dab3a33af064d4708b50fa5aa812)) +* add cash claims flag ([#1490](https://github.com/hypha-dao/dho-web-client/issues/1490)) ([962e104](https://github.com/hypha-dao/dho-web-client/commit/962e104bd59e86bca749aa2c764498655f40c3db)) +* add delete button to comments ([#1543](https://github.com/hypha-dao/dho-web-client/issues/1543)) ([#1581](https://github.com/hypha-dao/dho-web-client/issues/1581)) ([9c1f574](https://github.com/hypha-dao/dho-web-client/commit/9c1f57467a315b2e0cb0f596e0f7bc00e3fb0c5f)) +* added "delete proposal" button to staging proposals ([#1520](https://github.com/hypha-dao/dho-web-client/issues/1520)) ([#1538](https://github.com/hypha-dao/dho-web-client/issues/1538)) ([7d48d6f](https://github.com/hypha-dao/dho-web-client/commit/7d48d6fcb94fb5f0d904f4bd2755d89167f91e55)) +* **configuration:** add dynamic explore banner ([#1588](https://github.com/hypha-dao/dho-web-client/issues/1588)) ([34ced1b](https://github.com/hypha-dao/dho-web-client/commit/34ced1b0ec1e2a9450e21530818fdbfbe0a1e444)) +* **dao-proposal-stage:** add type edit ([#1589](https://github.com/hypha-dao/dho-web-client/issues/1589)) ([3504910](https://github.com/hypha-dao/dho-web-client/commit/3504910527f0d0606197817220d605d134cb07ec)) +* disabled cash claims for hypha ([#1531](https://github.com/hypha-dao/dho-web-client/issues/1531)) ([61f1261](https://github.com/hypha-dao/dho-web-client/commit/61f12619d0bfd45066b29db51bd1c15f8768baa0)) +* **explore page:** show dao creation wizard to hypha members only ([#1514](https://github.com/hypha-dao/dho-web-client/issues/1514)) ([925cf02](https://github.com/hypha-dao/dho-web-client/commit/925cf020b4c3c95b7a1e4eb2cda56d6a8682fc3e)) +* **proposals:** add pull interval for the published proposals ([#1575](https://github.com/hypha-dao/dho-web-client/issues/1575)) ([62ac339](https://github.com/hypha-dao/dho-web-client/commit/62ac33975300f5fdbd56348145302bdbf2a7456e)) +* **proposals:** add pull interval to auto refresh ([#1529](https://github.com/hypha-dao/dho-web-client/issues/1529)) ([7163dad](https://github.com/hypha-dao/dho-web-client/commit/7163dada7cc512ceb9de80a3b79cdecf573a9bdc)) + + +### Bug Fixes + +* badge proposal details and formatting issues ([#1551](https://github.com/hypha-dao/dho-web-client/issues/1551)) ([33b755e](https://github.com/hypha-dao/dho-web-client/commit/33b755e035cc17202fbfdf9f52bcd130587dff14)) +* **changelog:** change relase notes for 2.10 ([#1546](https://github.com/hypha-dao/dho-web-client/issues/1546)) ([6eccb13](https://github.com/hypha-dao/dho-web-client/commit/6eccb13e7c86030e9bd41afbdb45468dc3d44c3a)) +* character max length in creating description for proposal ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1573](https://github.com/hypha-dao/dho-web-client/issues/1573)) ([6c881e8](https://github.com/hypha-dao/dho-web-client/commit/6c881e8541fce64b4232226968870e467c3863f1)) +* **configuration page:** remove pattern slip and disable announcement edit for non admins ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83)) +* current dao in left menu (dao switcher) has been hidden ([#1544](https://github.com/hypha-dao/dho-web-client/issues/1544)) ([#1565](https://github.com/hypha-dao/dho-web-client/issues/1565)) ([04dca98](https://github.com/hypha-dao/dho-web-client/commit/04dca98e9cfa64934f790b474e13f3f13fb5e46d)) +* enable deferred button for archived assignments [#1489](https://github.com/hypha-dao/dho-web-client/issues/1489) ([#1534](https://github.com/hypha-dao/dho-web-client/issues/1534)) ([a29b231](https://github.com/hypha-dao/dho-web-client/commit/a29b231aba7097fa69f65013ffb070d033dbe31b)) +* **filter-widget:** set width to be same on all screens ([#1542](https://github.com/hypha-dao/dho-web-client/issues/1542)) ([#1586](https://github.com/hypha-dao/dho-web-client/issues/1586)) ([1a15f85](https://github.com/hypha-dao/dho-web-client/commit/1a15f857d1e31d9cfbc173aead1f93baeff7d0be)) +* fix wrong titles and salary tag for search items ([#1513](https://github.com/hypha-dao/dho-web-client/issues/1513)) ([#1540](https://github.com/hypha-dao/dho-web-client/issues/1540)) ([c32b3aa](https://github.com/hypha-dao/dho-web-client/commit/c32b3aa0c19a24c1da10a961bd961fdec485c137)) +* fixed color for CTA buttons ([#1522](https://github.com/hypha-dao/dho-web-client/issues/1522)) ([#1560](https://github.com/hypha-dao/dho-web-client/issues/1560)) ([3f29e32](https://github.com/hypha-dao/dho-web-client/commit/3f29e32fa7183d20659844eb8efb4e25ae9b2bcc)) +* fixed filter on the search page, added missing filter types ([#1415](https://github.com/hypha-dao/dho-web-client/issues/1415)) ([#1537](https://github.com/hypha-dao/dho-web-client/issues/1537)) ([7ad7515](https://github.com/hypha-dao/dho-web-client/commit/7ad751570faea7797f4d1a477c68e80c2d7db75e)) +* fixed widgets links in home and organisation pages ([#1550](https://github.com/hypha-dao/dho-web-client/issues/1550)) ([#1564](https://github.com/hypha-dao/dho-web-client/issues/1564)) ([c600166](https://github.com/hypha-dao/dho-web-client/commit/c600166b8334046b9fd84333d018e779019c770f)) +* hide badge multiplier ([#1476](https://github.com/hypha-dao/dho-web-client/issues/1476)) ([#1535](https://github.com/hypha-dao/dho-web-client/issues/1535)) ([c498dbb](https://github.com/hypha-dao/dho-web-client/commit/c498dbb76549621b3a0afb36b47a5d93bd090560)) +* proposal description max length ([#1496](https://github.com/hypha-dao/dho-web-client/issues/1496)) ([20f0d46](https://github.com/hypha-dao/dho-web-client/commit/20f0d46bc11f8b5469e9db914e0ed81ee0bcbff6)) +* **proposal:** voting widget pagination ([#1541](https://github.com/hypha-dao/dho-web-client/issues/1541)) ([#1577](https://github.com/hypha-dao/dho-web-client/issues/1577)) ([697ba46](https://github.com/hypha-dao/dho-web-client/commit/697ba462592d2e66850ba613dd0a0715f1b7ee43)) +* remove padding top for dashboard pages ([#1524](https://github.com/hypha-dao/dho-web-client/issues/1524)) ([#1587](https://github.com/hypha-dao/dho-web-client/issues/1587)) ([1bce19f](https://github.com/hypha-dao/dho-web-client/commit/1bce19f783654b25e3f0c2c6013b1cc08e61e41d)) +* revert to claim all with multiple transaction ([#1509](https://github.com/hypha-dao/dho-web-client/issues/1509)) ([2e1ed55](https://github.com/hypha-dao/dho-web-client/commit/2e1ed55fb7f21c3b35f56ca418ba40d3e7499710)) +* select options in filter widget has been fixed ([#1523](https://github.com/hypha-dao/dho-web-client/issues/1523), [#1556](https://github.com/hypha-dao/dho-web-client/issues/1556)) ([#1580](https://github.com/hypha-dao/dho-web-client/issues/1580)) ([8c927bb](https://github.com/hypha-dao/dho-web-client/commit/8c927bbd8b2b8d449acec26bc434a9362153174b)) +* show dynamic deferred on active and archived proposals ([#1578](https://github.com/hypha-dao/dho-web-client/issues/1578)) ([d895d70](https://github.com/hypha-dao/dho-web-client/commit/d895d7020ef78919de618efb197062a80d0495fd)) +* warning about character max from description has been removed ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1563](https://github.com/hypha-dao/dho-web-client/issues/1563)) ([571f374](https://github.com/hypha-dao/dho-web-client/commit/571f37485c15985e0e5564af0a4bcebe16923f76)) + ## [2.11.0](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.11.0) (2022-09-05) diff --git a/package.json b/package.json index 3487fb839..8e87f7c6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.11.0", + "version": "2.12.0", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", diff --git a/src/components/common/button-card.vue b/src/components/common/button-card.vue index e4df4888c..8124d4ff3 100644 --- a/src/components/common/button-card.vue +++ b/src/components/common/button-card.vue @@ -78,11 +78,11 @@ q-btn.button( q-icon(v-if="!hideIcon" :name="icon" size="14px" :color="!outline ? 'primary' : 'white'") //- .div.q-pa-none.chip-container.q-px-xs //- chips.nudge-right(v-if="chip && chip.label" :tags="[ chip ]") - .row.q-mx-sm.q-my-xxs.text-left(v-if="from && end") + .row.q-mx-sm.q-my-xxs.text-left(v-if="from || end") //- .h-h7-regular(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") From - .h-h6.q-mb-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(from) }} - .h-h7-regular(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") To - .h-h6.q-py-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(end) }} + .h-h6.q-mb-xxs(v-if="from" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(from) }} + .h-h7-regular(v-if="from || end" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") Until + .h-h6.q-py-xxs(v-if="end" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(end) }} .row.q-mx-sm.q-my-xxs.text-left(v-else-if="title || subtitle") .h-h5-regular.q-mb-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ title }} .h-h5.q-py-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ subtitle }} diff --git a/src/css/quasar-classes-override.styl b/src/css/quasar-classes-override.styl index 1f9054598..3600b5baf 100644 --- a/src/css/quasar-classes-override.styl +++ b/src/css/quasar-classes-override.styl @@ -132,9 +132,12 @@ a, a:hover, a:focus .q-date__calendar-item--in color var(--q-color-primary) !important .q-btn - outline-color var(--q-color-primary) !important + color var(--q-color-secondary) + outline-color var(--q-color-secondary) !important outline-width 1px !important outline-style solid !important + .bg-primary + background var(--q-color-secondary) !important .q-date__range-from:before diff --git a/src/mixins/format.js b/src/mixins/format.js index 974942c60..ea6e33311 100644 --- a/src/mixins/format.js +++ b/src/mixins/format.js @@ -33,7 +33,7 @@ export const format = { return '' }, - getFormatedTokenAmount (amount = 0, maxFigures = 4, maxDecimals = 2) { + getFormatedTokenAmount (amount = 0, maxFigures = 4, maxDecimals = 0) { if (amount === 0) return '0' if (amount === undefined) return '' if (amount === null) return '' diff --git a/src/pages/profiles/Wallet.vue b/src/pages/profiles/Wallet.vue index 5eba5fec8..076b5921e 100644 --- a/src/pages/profiles/Wallet.vue +++ b/src/pages/profiles/Wallet.vue @@ -168,7 +168,15 @@ export default {