Skip to content

Commit

Permalink
chore: release 2.14.0
Browse files Browse the repository at this point in the history
Release-As: 2.14.0
  • Loading branch information
arsenijesavic authored Sep 27, 2022
2 parents 136e8ed + 6285aaf commit d25e4fe
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '14.x'
node-version: '16.x'
- name: Install dependencies
run: yarn
# 👇 Adds Chromatic as a step in the workflow
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
# Changelog

## [2.13.0](https://github.com/hypha-dao/dho-web-client/compare/v2.12.0...v2.13.0) (2022-09-22)


### 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))
* **dao:** read cash claim enable from backend ([#1610](https://github.com/hypha-dao/dho-web-client/issues/1610)) ([92db2d7](https://github.com/hypha-dao/dho-web-client/commit/92db2d7a2551ba7441cd59aefa0e9f2013cdc2ca))
* 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 creation:** make start dates clickable only ([#1387](https://github.com/hypha-dao/dho-web-client/issues/1387)) ([#1594](https://github.com/hypha-dao/dho-web-client/issues/1594)) ([691d89d](https://github.com/hypha-dao/dho-web-client/commit/691d89d58548d10fae519eaff375a70b883a6f55))
* 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 decimals from numbers ([#1597](https://github.com/hypha-dao/dho-web-client/issues/1597)) ([#1615](https://github.com/hypha-dao/dho-web-client/issues/1615)) ([ca3dff8](https://github.com/hypha-dao/dho-web-client/commit/ca3dff82c554639489e3092f2047a9fb9aa1d9aa))
* 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))
* **wallet page:** improve design ([#1593](https://github.com/hypha-dao/dho-web-client/issues/1593)) ([9ab69db](https://github.com/hypha-dao/dho-web-client/commit/9ab69dbe0835db418f9d2c9daa9913fa515e14c5))
* 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.12.0](https://github.com/hypha-dao/dho-web-client/compare/v2.11.0...v2.12.0) (2022-09-14)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dho-web-client",
"version": "2.12.0",
"version": "2.13.0",
"description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)",
"productName": "Hypha DHO",
"author": "Max <[email protected]>",
Expand Down
29 changes: 26 additions & 3 deletions src/components/dao/settings-general.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ widget(title='General' titleImage='/svg/file-checkmark.svg' :bar='true').q-pa-no
.row.justify-between
.col-6.q-pr-sm
.row.items-center.q-col-gutter-xs
label.h-label Social chat
label.h-label DAO name
//- q-icon(name="fas fa-info-circle" size="16px" color="body")
//- q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") Add a link to your DAO documentation here. Could be your website or a wiki where users can learn more about your DAO. The link will be added to the Banner on the Organization Page.
q-input.q-my-sm(
Expand All @@ -39,9 +39,9 @@ widget(title='General' titleImage='/svg/file-checkmark.svg' :bar='true').q-pa-no
lazy-rules
outlined
placeholder="Paste the URL address here"
ref="name"
ref="title"
rounded
v-model='form.socialChat'
v-model='form.title'
)
q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!isAdmin") Only DAO admins can change the settings
.col-6.q-pl-sm
Expand All @@ -66,6 +66,27 @@ widget(title='General' titleImage='/svg/file-checkmark.svg' :bar='true').q-pa-no
)
q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!isAdmin") Only DAO admins can change the settings

.row.justify-between.q-mt-sm
.col-6.q-pr-sm
.row.items-center.q-col-gutter-xs
label.h-label Social chat
//- q-icon(name="fas fa-info-circle" size="16px" color="body")
//- q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") Add a link to your DAO documentation here. Could be your website or a wiki where users can learn more about your DAO. The link will be added to the Banner on the Organization Page.
q-input.q-my-sm(
:debounce="200"
:disable="!isAdmin"
bg-color="white"
color="accent"
dense
lazy-rules
outlined
placeholder="Paste the URL address here"
ref="name"
rounded
v-model='form.socialChat'
)
q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!isAdmin") Only DAO admins can change the settings

.row.justify-between.q-mt-xl
.col-6.q-pr-sm
.row.items-center.q-col-gutter-xs
Expand Down Expand Up @@ -98,6 +119,8 @@ widget(title='General' titleImage='/svg/file-checkmark.svg' :bar='true').q-pa-no
q-toggle(:disable="!isAdmin" color="primary" keep-color v-model="form.removableBannersEnabled")
q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!isAdmin") Only DAO admins can change the settings

.row.justify-between

</template>

<style lang="stylus" scoped>
Expand Down
16 changes: 8 additions & 8 deletions src/components/ipfs/input-file-ipfs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
@input=" e => updateModel(e)"
:accept="acceptedFiles"
counter
:label="label"
filled
v-model="file"
:max-total-size="maxSize"
Expand Down Expand Up @@ -52,7 +51,7 @@ export default {
}
},
props: {
ipfsURL: {
cid: {
type: String,
default: undefined
},
Expand All @@ -66,11 +65,11 @@ export default {
}
},
mounted () {
if (this.ipfsURL !== '' && this.ipfsURL && this.image) this.loadImage(this.ipfsURL)
if (this.cid !== '' && this.cid) this.loadFile(this.cid)
},
watch: {
value (v) {
this.loadImage(v)
cid (v) {
this.loadFile(v)
}
},
methods: {
Expand All @@ -88,17 +87,18 @@ export default {
this.$emit('uploading')
this.typeCid = await BrowserIpfs.store(e)
this.$emit('uploadedFile', this.typeCid)
await this.loadImage(this.typeCid)
await this.loadFile(this.typeCid)
} catch (e) {
this.isUploading = false
}
this.isUploading = false
},
async loadImage (v) {
async loadFile (v) {
this.typeCid = v
this.$emit('uploadedFile', this.typeCid)
const file = await BrowserIpfs.retrieve(this.typeCid)
this.imageURI = URL.createObjectURL(file.payload)
this.file = file.payload
// this.imageURI = URL.createObjectURL(file.payload)
},
chooseFile () {
this.$refs.qFile.pickFiles()
Expand Down
7 changes: 4 additions & 3 deletions src/layouts/MultiDhoLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,13 @@ q-layout(:style="{ 'min-height': 'inherit' }" :view="'lHr Lpr lFr'" ref="layout"
.main(:class="{'q-pt-lg': $q.screen.gt.sm }")
.row.full-width.items-center.justify-between
// navigation-header
.col-auto
.col
.row(v-if="breadcrumbs")
router-link.text-primary.text-underline.text-weight-600(:to="breadcrumbs.tab.link") {{ breadcrumbs.tab.name }}
.row
.h-h3(v-if="title") {{ title }}
.col
.h-h3.ellipsis(v-if="title") {{ title }}
q-tooltip(:target="true" anchor="top middle").h-h3.ellipsis {{ title }}
.col-5
.row.justify-end.items-center
q-btn.q-mr-xs(:to="{ name: 'configuration' }" unelevated rounded padding="12px" icon="fas fa-cog" size="sm" :color="isActiveRoute('configuration') ? 'primary' : 'white'" :text-color="isActiveRoute('configuration') ? 'white' : 'primary'" )
q-btn(:to="{ name: 'support' }" unelevated rounded padding="12px" icon="far fa-question-circle" size="sm" color="white" text-color="primary")
Expand Down
15 changes: 12 additions & 3 deletions src/pages/dho/Configuration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ const cloneDeep = value => JSON.parse(JSON.stringify(value))
const defaultSettings = {
// GENERAL FORM
socialChat: '',
title: '',
url: '',
proposalsCreationEnabled: true,
membersApplicationEnabled: true,
removableBannersEnabled: true,
socialChat: '',
// VOTING FORM
votingDurationSec: '',
Expand Down Expand Up @@ -96,11 +97,12 @@ export default {
initForm () {
this.initialForm = {
socialChat: this.daoSettings?.socialChat ? this.daoSettings?.socialChat : defaultSettings.socialChat,
title: this.daoSettings?.title ? this.daoSettings?.title : defaultSettings.title,
url: this.daoSettings?.url ? this.daoSettings?.url : defaultSettings.url,
proposalsCreationEnabled: this.daoSettings?.proposalsCreationEnabled !== null ? this.daoSettings?.proposalsCreationEnabled : defaultSettings.proposalsCreationEnabled,
membersApplicationEnabled: this.daoSettings?.membersApplicationEnabled !== null ? this.daoSettings?.membersApplicationEnabled : defaultSettings.membersApplicationEnabled,
removableBannersEnabled: this.daoSettings?.removableBannersEnabled !== null ? this.daoSettings?.removableBannersEnabled : defaultSettings.removableBannersEnabled,
socialChat: this.daoSettings?.socialChat ? this.daoSettings?.socialChat : defaultSettings.socialChat,
votingDurationSec: this.daoSettings?.votingDurationSec ? this.daoSettings?.votingDurationSec : defaultSettings.votingDurationSec,
// periodDurationSec: this.daoSettings?.periodDurationSec ? this.daoSettings?.periodDurationSec : defaultSettings.periodDurationSec,
Expand Down Expand Up @@ -170,7 +172,7 @@ export default {
async saveSettings () {
try {
const { alerts, announcements, ...form } = this.form
const { alerts, announcements, title, url, ...form } = this.form
const _alerts = this.isHypha ? [...alerts] : []
Expand Down Expand Up @@ -199,6 +201,9 @@ export default {
docId: this.selectedDao.docId,
data: {
...form,
daoTitle: title,
daoUrl: url,
proposalsCreationEnabled: form.proposalsCreationEnabled ? 1 : 0,
membersApplicationEnabled: form.membersApplicationEnabled ? 1 : 0,
removableBannersEnabled: form.removableBannersEnabled ? 1 : 0,
Expand All @@ -218,6 +223,10 @@ export default {
}
})
if (this.form.url !== this.initialForm.url) {
this.$router.push(`/${this.form.url}/configuration`)
}
this.initialForm = {
...this.form,
// salaries: cloneDeep([...this.form.salaries]),
Expand Down
1 change: 1 addition & 0 deletions src/pages/proposals/create/StepDescription.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ widget
//- v-model="url" outlined
//- )
input-file-ipfs(
:cid="url"
label="IPFS File"
@uploadedFile="ipfsId => url = ipfsId"
)
Expand Down

0 comments on commit d25e4fe

Please sign in to comment.