Skip to content

Commit

Permalink
Release v1.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
gregory-latinier authored and mgravitt committed Mar 20, 2020
1 parent 545eef3 commit 7cf5ac6
Show file tree
Hide file tree
Showing 100 changed files with 3,071 additions and 809 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ BLOCKCHAIN_EXPLORER='"https://telos-test.bloks.io"'
PPP_ENV='"prod"'

SENTRY_DSN='""'

DOCUMENTATION='"https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view"'
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ build_dev:
BLOCKCHAIN_EXPLORER: '"https://telos-test.bloks.io"'
PPP_ENV: '"test"'
SENTRY_DSN: '""'
DOCUMENTATION: '"https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view "'
cache:
paths:
- node_modules/
Expand Down Expand Up @@ -65,6 +66,7 @@ build_prod:
BLOCKCHAIN_EXPLORER: '"https://telos.bloks.io"'
PPP_ENV: '"prod"'
SENTRY_DSN: '"https://[email protected]/1884471"'
DOCUMENTATION: '"https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view "'
cache:
paths:
- node_modules/
Expand Down Expand Up @@ -114,6 +116,7 @@ build_dho:
BLOCKCHAIN_EXPLORER: '"https://telos.bloks.io"'
PPP_ENV: '"prod"'
SENTRY_DSN: '"https://[email protected]/1884471"'
DOCUMENTATION: '"https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view "'
cache:
paths:
- node_modules/
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": "hyphadac-quasar",
"version": "1.0.11",
"version": "1.0.12",
"description": "HyphaDAO",
"productName": "HyphaDAO",
"cordovaId": "org.cordova.quasar.app",
Expand Down
3 changes: 2 additions & 1 deletion quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ module.exports = function (ctx) {
DAO_CONTRACT: process.env.DAO_CONTRACT,
BLOCKCHAIN_EXPLORER: process.env.BLOCKCHAIN_EXPLORER,
PPP_ENV: process.env.PPP_ENV,
SENTRY_DSN: process.env.SENTRY_DSN
SENTRY_DSN: process.env.SENTRY_DSN,
DOCUMENTATION: process.env.DOCUMENTATION
},
scopeHoisting: true,
// vueRouterMode: 'history',
Expand Down
1 change: 1 addition & 0 deletions src/assets/icons/past.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/icons/payment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/seeds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/logos/hypha-logo-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 6 additions & 8 deletions src/components/account/dialog-login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ q-dialog(
v-model="show"
@before-hide="$emit('update:show', false)"
)
q-card.login-card
q-card.login-card(
:style="{ width: $q.platform.is.desktop ? '400px' : '100%' }"
)
q-card-section.text-center
.text-h6 Login
q-card-section
Expand Down Expand Up @@ -79,9 +81,9 @@ q-dialog(
)
q-card-section
.or-sep.flex.justify-between.text-accent
hr.separator
hr.separator(:style="{ width: $q.platform.is.desktop ? '45%' : '35%' }")
| OR
hr.separator
hr.separator(:style="{ width: $q.platform.is.desktop ? '45%' : '35%' }")
q-card-section
q-list
q-item.wallet(
Expand Down Expand Up @@ -121,10 +123,6 @@ q-dialog(
</template>

<style lang="stylus" scoped>
.login-card
min-width 400px
.or-sep
width 400px
hr
width 45%
width 100%
</style>
53 changes: 0 additions & 53 deletions src/components/layout/header-menu.vue

This file was deleted.

158 changes: 118 additions & 40 deletions src/components/layout/left-menu.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<script>
import { mapMutations } from 'vuex'
import { mapGetters, mapMutations } from 'vuex'
export default {
name: 'layout-left-menu',
computed: {
...mapGetters('accounts', ['isAuthenticated', 'isMember'])
},
methods: {
...mapMutations('layout', ['setShowRightSidebar', 'setRightSidebarType']),
displayRoleForm () {
displayForm (type) {
this.setShowRightSidebar(true)
this.setRightSidebarType('roleForm')
this.$emit('close')
this.setRightSidebarType(`${type}Form`)
}
}
}
Expand All @@ -20,23 +22,71 @@ export default {
:bordered="false"
dense
)
q-item
q-item.q-mt-md.text-black(to="/")
q-item-section(avatar)
q-icon(name="fa fa-home")
q-item-section
strong Activities
q-item(
v-if="isAuthenticated && isMember"
clickable
v-ripple
@click="displayForm('role')"
)
q-item-section(avatar)
q-item-section Create Role
q-item(
v-if="isAuthenticated && isMember"
clickable
v-ripple
@click="displayForm('contribution')"
)
q-item-section(avatar)
q-item-section Create Contribution
q-item(
to="/proposals/role"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Endorse Role
q-item(
to="/proposals/contribution"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Endorse Contribution
q-item(
to="/applicants"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Enroll Members
q-item-section(side)
q-btn.close-btn(
icon="fas fa-times"
round
dense
unelevated
color="white"
text-color="black"
@click="$emit('close')"
q-icon(
name="fas fa-lock"
class="text-grey-5"
style="font-size: 18px;"
)
q-item.text-black(to="/")
q-item(
to="/proposals/assignment"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-icon(name="fa fa-home")
q-item-section
strong My Actions
q-item-section Enroll Applicants
q-item-section(side)
q-icon(
name="fas fa-lock"
class="text-grey-5"
style="font-size: 18px;"
)
q-item(
to="/roles"
exact
Expand All @@ -50,44 +100,67 @@ export default {
q-item-section(avatar)
q-icon(name="fas fa-user-friends")
q-item-section
strong Members
strong Participants
q-item(
to="/applicants"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Enroll Registrants
q-item-section New Members
q-item(
to="/proposals/assignment"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Role Applicants
q-separator.q-my-sm
.flex.justify-between.items-center
q-item(
to="/roles"
:style="{ width: 'calc(100% - 50px)'}"
)
q-item-section(avatar)
q-icon(name="fas fa-suitcase")
q-item-section
strong Roles
q-btn.btn-add(
color="red"
text-color="white"
icon="fas fa-plus"
round
dense
unelevated
size="xs"
@click="displayRoleForm"
:style="{width: '24px', height: '24px'}"
)
q-item
q-item-section(avatar)
q-icon(name="fas fa-suitcase")
q-item-section
strong Proposals
q-item(
to="/proposals/role"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Vote on Roles
q-item-section Roles
q-item(
to="/proposals/contribution"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Contributions
q-separator.q-my-sm
q-item
q-item-section(avatar)
q-icon(name="fas fa-handshake")
q-item-section
strong Agreements
q-item(
to="/roles"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Roles
q-item(
to="/assignments"
exact
clickable
v-ripple
)
q-item-section(avatar)
q-item-section Assignments

</template>

Expand All @@ -98,4 +171,9 @@ export default {
margin-right 17px
.menu
font-size 16px
/deep/.q-item.q-router-link--active
font-weight 700
color #E06664
.menu > .q-item, .q-item--dense
min-height 28px
</style>
Loading

0 comments on commit 7cf5ac6

Please sign in to comment.