Skip to content

Commit

Permalink
Merge pull request #342 from chain4travel/suite
Browse files Browse the repository at this point in the history
* feat: creating deposit Offers (#332)
* Create Deposits fixes (#334)
* refactor create offer single sig
* add multi-sig logic to create an offer form
* change duration from seconds to days
* fix check of displaying create offer form (#335)
* Bug fixes (#333)
* fix(send): show p-chain available amount instead of x-chain
* fix(style): center the NFT card content in the history panel
* fix(History): showing p-chain address in the history panel
* fix(style): add border-radius to confirmation background
* fix(multi-sig-wallet): update console handling in the msig section
* chore(locale): update warning message for list loading
* feat(balance): deduct the gas fee from the native token balance calculation
* fix(validator): Correct uptime calculation to prevent 10000% display
* Refactor font styling to use mixins scss file (#173)
* Refactor font styling to use mixins scss file
* fix(typography): size adjustment
* Merge branch 'suite' into fonts-refactor

---------

Co-authored-by: Ayagoumi <[email protected]>
* improvement for creating offer form (#336)
* improvement in creating an offer form
* fix catching  signavault errors
* improvement for msg part of creating an offer
* Fix add validator (#337)
* fix(add validator): date picker, formatting, and style
* Fix: multi-sig alias address validation
* fix(add-validator): fix start and end time starting time & style adjustments
* fix(history): network explorer URL check
* several fixes for deposit offer (#339)
* fix vesting period label (#341)
* Fix(add validator): duration calculation & update for when the wallet changes (#340)
* Fix(add validator): duration calculation & update for when the wallet changes
* Fix(add-validator): lifecycle method and add password input type
* Refactor ClaimRewards component

---------

Co-authored-by: Achraf Eddaqqaq <[email protected]>
  • Loading branch information
Ayagoumi and aeddaqqa authored Dec 11, 2023
2 parents 7906e33 + 7406386 commit 6aa3240
Show file tree
Hide file tree
Showing 179 changed files with 5,472 additions and 1,788 deletions.
Binary file added bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"weekstart": "1.0.1"
},
"dependencies": {
"@c4tplatform/signavaultjs": "^1.0.11",
"@c4tplatform/signavaultjs": "^1.1",
"@cypress/xpath": "^2.0.3",
"vue": "^2.6.11",
"vue-cli-plugin-vuetify": "^2.0.3",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Access/AccountsFound.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ export default class AccountsFound extends Vue {
.savedAccounts {
margin: 0;
font-family: ClashDisplay;
font-family: var(--primary-font);
font-weight: 500;
line-height: 1.5;
font-size: 1rem;
@include mixins.typography-body-2;
margin-bottom: 0.5rem;
}
.v-icon {
color: var(--primary-color);
width: 20px;
height: 20px;
font-size: 22px;
@include mixins.typography-subtitle-1;
}
.goTo {
Expand Down
6 changes: 5 additions & 1 deletion src/components/CamBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import Spinner from '@/components/misc/Spinner.vue'
components: { Spinner },
})
export default class CamBtn extends Vue {
@Prop({ default: 'primary' }) readonly variant!: 'primary' | 'transparent' | 'negative'
@Prop({ default: 'primary' }) readonly variant!:
| 'primary'
| 'transparent'
| 'negative'
| 'accent'
@Prop({ default: false }) readonly disabled!: boolean
@Prop({ default: false }) readonly loading!: boolean
@Prop({ default: () => {} }) readonly onClick!: Function
Expand Down
12 changes: 9 additions & 3 deletions src/components/CamInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</template>

<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator'
import { Component, Prop, Vue } from 'vue-property-decorator'
@Component
export default class CamInput extends Vue {
Expand All @@ -43,8 +43,14 @@ export default class CamInput extends Vue {
}
}
</script>

<style scoped>
<style scoped lang="scss">
.v-application .error {
background-color: transparent !important;
border: 1px solid var(--camino-slate-slate-600);
&:disabled {
border: 1px solid var(--camino-slate-slate-600) !important;
}
}
.cam-input {
display: flex;
flex-direction: column;
Expand Down
15 changes: 6 additions & 9 deletions src/components/CreateWalletWorkflow/CreateWallet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export default class CreateWallet extends Vue {
h1 {
margin-top: variables.$vertical-padding;
text-align: left;
font-size: variables.$m-size;
@include mixins.typography-subtitle-1;
font-weight: 400;
}
}
Expand All @@ -269,7 +269,7 @@ export default class CreateWallet extends Vue {
> * {
margin: 4px;
font-size: 0.8rem;
@include mixins.typography-caption;
}
p {
Expand All @@ -291,7 +291,7 @@ export default class CreateWallet extends Vue {
.key_disp {
margin: 30px auto;
font-size: 12px;
@include mixins.typography-caption;
}
a {
Expand Down Expand Up @@ -373,9 +373,7 @@ a {
header {
h1 {
margin-top: 10px;
font-size: variables.$xl-size;
line-height: 1.25em;
font-weight: 400;
@include mixins.typography-headline-1;
}
p {
Expand All @@ -388,8 +386,7 @@ a {
span {
display: block;
font-size: variables.$s-size;
font-weight: 700;
@include mixins.typography-caption;
text-transform: uppercase;
&.label {
Expand Down Expand Up @@ -504,7 +501,7 @@ a {
header {
h1 {
font-size: variables.$xl-size-mobile;
@include mixins.typography-headline-4;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ button {
}
.buts_right {
button {
font-size: 11px;
@include mixins.typography-caption;
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/components/NetworkSettings/CustomPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ export default class CustomPage extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';
.custom_network {
padding: 0px 15px;
Expand All @@ -219,7 +220,7 @@ export default class CustomPage extends Vue {
}
button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -228,7 +229,7 @@ export default class CustomPage extends Vue {
form {
margin-top: 12px;
label {
font-size: 12px;
@include mixins.typography-caption;
}
> div {
display: flex;
Expand All @@ -243,19 +244,19 @@ select {
background-color: var(--bg-light);
border-radius: var(--border-radius-sm);
padding: 6px 6px;
font-size: 13px;
@include mixins.typography-caption;
outline: none;
}
button {
margin-top: 10px;
width: 100%;
font-size: 12px;
@include mixins.typography-caption;
border-radius: var(--border-radius-sm);
}
.v-btn {
text-transform: none;
font-size: 12px !important;
@include mixins.typography-caption;
color: var(--bg) !important;
}
Expand All @@ -274,7 +275,7 @@ button {
}
.form_error {
font-size: 12px;
@include mixins.typography-caption;
color: #e03737;
}
</style>
11 changes: 6 additions & 5 deletions src/components/NetworkSettings/EditPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ export default class EditPage extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';
.custom_network {
padding: 0px 15px;
Expand All @@ -184,7 +185,7 @@ export default class EditPage extends Vue {
}
button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -193,7 +194,7 @@ export default class EditPage extends Vue {
form {
margin-top: 12px;
label {
font-size: 12px;
@include mixins.typography-caption;
}
> div {
display: flex;
Expand All @@ -208,7 +209,7 @@ select {
color: var(--primary-color);
border-radius: var(--border-radius-sm);
padding: 6px 6px;
font-size: 13px;
@include mixins.typography-caption;
outline: none;
width: 100%;
}
Expand All @@ -217,7 +218,7 @@ button {
width: 100%;
background-color: variables.$primary-color;
color: #fff;
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -241,7 +242,7 @@ button {
}
.form_error {
font-size: 12px;
@include mixins.typography-caption;
color: #e03737;
}
</style>
2 changes: 1 addition & 1 deletion src/components/NetworkSettings/NetworkMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default class NetworkMenu extends Vue {
}
button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand Down
7 changes: 4 additions & 3 deletions src/components/NetworkSettings/NetworkRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ export default class NetworkRow extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';
.stat_col {
font-size: 14px;
@include mixins.typography-caption;
color: var(--primary-color);
text-align: right;
word-break: keep-all !important;
Expand Down Expand Up @@ -153,7 +154,7 @@ img {
.editBut {
color: var(--primary-color);
opacity: 0.4;
font-size: 11px;
@include mixins.typography-caption;
/*position: absolute;*/
/*top: 12px;*/
/*right: 0px;*/
Expand All @@ -174,7 +175,7 @@ img {
.url,
.credentials {
color: variables.$primary-color-light;
font-size: 12px;
@include mixins.typography-caption;
word-break: break-all;
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/NftCards/URL_NFT.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ img {
.type {
display: block;
margin: 0px auto !important;
font-size: 12px;
@include mixins.typography-caption;
background-color: var(--primary-color-light);
color: var(--bg) !important;
width: max-content;
Expand All @@ -114,7 +114,7 @@ img {
.unknown {
padding: 10px;
p {
font-size: 0.8rem;
@include mixins.typography-caption;
color: #999;
margin: 0;
}
Expand All @@ -128,7 +128,7 @@ img {
color: var(--primary-color-light);
background-color: var(--bg-light);
text-decoration: none;
font-size: 0.9rem;
@include mixins.typography-caption;
margin: 0px auto;
&:hover {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Notifications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export default {
},
}
</script>
<style scoped>
<style scoped lang="scss">
@use '../styles/abstracts/mixins';
.notifications {
pointer-events: none;
position: fixed;
Expand All @@ -43,11 +44,10 @@ export default {
box-shadow: 2px 2px 12px rgba(0, 0, 0, 0.4);
background-color: var(--bg);
max-width: 195px;
font-size: 13px !important;
@include mixins.typography-caption;
}
.notif_title {
/*font-size: 14px;*/
color: var(--bg-light);
font-weight: bold;
padding: 6px 14px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,18 @@ export default {
}
.action {
font-size: 12px;
@include mixins.typography-caption;
color: variables.$primary-color-light;
}
.amount {
text-align: right;
white-space: nowrap;
font-size: 15px;
@include mixins.typography-body-2;
}
@include mixins.medium-device {
.amount {
font-size: 14px;
@include mixins.typography-caption;
}
}
</style>
7 changes: 4 additions & 3 deletions src/components/SidePanels/History/ViewTypes/BaseTx.vue
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,9 @@ export default class BaseTx extends Vue {
}
</script>
<style scoped lang="scss">
@use '../../../../styles/abstracts/mixins';
label {
font-size: 12px;
@include mixins.typography-caption;
color: var(--primary-color-light);
}
.nfts {
Expand All @@ -383,10 +384,10 @@ label {
display: flex;
flex-direction: column;
justify-content: center;
font-size: 12px;
@include mixins.typography-caption;
color: var(--primary-color-light);
overflow: hidden;
font-family: 'Inter' sans-serif;
font-family: var(--primary-font);
white-space: nowrap;
p {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ export default class BaseTxNFTOutput extends Vue {
}
</script>
<style scoped lang="scss">
@use '../../../../styles/abstracts/mixins';
.amount {
text-align: right;
white-space: nowrap;
font-size: 15px;
@include mixins.typography-body-2;
color: #d04c4c;
&[profit] {
Expand Down
Loading

0 comments on commit 6aa3240

Please sign in to comment.