adata-ui 0.3.23 → 0.3.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/adata-ui.common.js +95 -39
  2. package/dist/adata-ui.common.js.map +1 -1
  3. package/dist/adata-ui.umd.js +95 -39
  4. package/dist/adata-ui.umd.js.map +1 -1
  5. package/dist/adata-ui.umd.min.js +1 -1
  6. package/dist/adata-ui.umd.min.js.map +1 -1
  7. package/package-lock.json +1 -1
  8. package/package.json +1 -1
  9. package/src/components/Header/Header.vue +7 -3
  10. package/src/components/Header/Profile.vue +14 -1
  11. package/src/components/Header/ProfileMenu.vue +44 -5
  12. package/src/configs/profileDropDown.js +3 -3
package/package-lock.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adata-ui",
3
- "version": "0.3.19",
3
+ "version": "0.3.23",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adata-ui",
3
- "version": "0.3.23",
3
+ "version": "0.3.26",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/components/Header/Header.vue CHANGED
@@ -57,8 +57,8 @@
57
57
  </svg>
58
58
  Найти
59
59
  </div>
60
- <a v-show="hasFavourites" :href="favouriteUrl" target="_blank">
61
- <div @click="$emit('')" class="favorite-btn">
60
+ <a v-show="hasFavourites" :href="main[mode] + '/favourites' + `${tab ? '?tab=' + tab : ''}`" target="_blank">
61
+ <div class="favorite-btn">
62
62
  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
63
63
  <path d="M3 2.5V14.0057C3 14.4167 3.46826 14.6521 3.79816 14.4071L7.70184 11.5072C7.87886 11.3757 8.12114 11.3757 8.29816 11.5072L12.2018 14.4071C12.5317 14.6521 13 14.4167 13 14.0057V2.5C13 2.22386 12.7761 2 12.5 2H3.5C3.22386 2 3 2.22386 3 2.5Z" stroke="#2C3E50" stroke-linecap="round" stroke-linejoin="round"/>
64
64
  </svg>
@@ -75,6 +75,7 @@
75
75
  :loginUrl="loginUrl"
76
76
  :rate="rate"
77
77
  :balance="this.thousandSeparator(balance)"
78
+ :tab="tab"
78
79
  @showBalanceModal="
79
80
  (val) => {
80
81
  $emit('showBalanceModal', val);
@@ -547,12 +548,15 @@ export default {
547
548
  hasSearchField: {
548
549
  type: Boolean,
549
550
  default: false
551
+ },
552
+ tab: {
553
+ type: String,
554
+ default: ""
550
555
  }
551
556
  },
552
557
  data() {
553
558
  return {
554
559
  isActiveMenu: false,
555
- favouriteUrl: "/profile/favorites",
556
560
  main: {
557
561
  dev: "https://adtdev.kz",
558
562
  prod: "https://adata.kz",
package/src/components/Header/Profile.vue CHANGED
@@ -56,7 +56,16 @@
56
56
  </div>
57
57
  </div>
58
58
  <SlideToggle v-slot="{ animationClass }">
59
- <profile-menu v-if="isAuthenticated" v-show="active" :class="animationClass" @logout="logout" :balance="balance" :rate="rate" />
59
+ <profile-menu
60
+ v-if="isAuthenticated"
61
+ v-show="active"
62
+ :class="animationClass"
63
+ @logout="logout"
64
+ :balance="balance"
65
+ :rate="rate"
66
+ :mode="mode"
67
+ :tab="tab"
68
+ />
60
69
  </SlideToggle>
61
70
  </div>
62
71
  </div>
@@ -105,6 +114,10 @@ export default {
105
114
  balance: {
106
115
  type: [Number, String],
107
116
  default: 0
117
+ },
118
+ tab: {
119
+ type: String,
120
+ default: ""
108
121
  }
109
122
  },
110
123
  components: {
package/src/components/Header/ProfileMenu.vue CHANGED
@@ -20,13 +20,13 @@
20
20
  <div class="balance__title">Текущий баланс:</div>
21
21
  <div class="balance__badge">{{ balance || 0 }} ₸</div>
22
22
  </div>
23
- <a-button size="extra_sm" variant="blue_outlined" url="https://adata.kz/profile?modal=show">Пополнить</a-button>
23
+ <a-button size="extra_sm" variant="blue_outlined" :url="links.balance[mode]">Пополнить</a-button>
24
24
  </div>
25
25
  </div>
26
26
 
27
27
  <div class="profile-menu__main">
28
28
  <div class="profile-links">
29
- <a href="https://adata.kz/profile" class="profile-link">
29
+ <a :href="links.profile[mode]" onclick="`return false`" class="profile-link">
30
30
  <div class="profile-link__icon">
31
31
  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
32
32
  <circle cx="12" cy="7.5" r="4.5" stroke="#2C3E50" stroke-width="2"/>
@@ -37,7 +37,7 @@
37
37
  </div>
38
38
  <div class="profile-link__text">Личный кабинет</div>
39
39
  </a>
40
- <a href="https://tender.adata.kz/profile/search-profile" class="profile-link">
40
+ <a :href="links.tenders[mode]" onclick="`return false`" class="profile-link">
41
41
  <div class="profile-link__icon">
42
42
  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
43
43
  <path
@@ -47,7 +47,7 @@
47
47
  </div>
48
48
  <div class="profile-link__text">Тендеры Шаблоны</div>
49
49
  </a>
50
- <a href="https://work.adata.kz/profile/account" class="profile-link">
50
+ <a :href="links.profile[mode]" onclick="`return false`" class="profile-link">
51
51
  <div class="profile-link__icon">
52
52
  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
53
53
  <path d="M7 5V2C7 1.73478 7.10536 1.48043 7.29289 1.29289C7.48043 1.10536 7.73478 1 8 1H16C16.2652 1 16.5196 1.10536 16.7071 1.29289C16.8946 1.48043 17 1.73478 17 2V5H21C21.2652 5 21.5196 5.10536 21.7071 5.29289C21.8946 5.48043 22 5.73478 22 6V20C22 20.2652 21.8946 20.5196 21.7071 20.7071C21.5196 20.8946 21.2652 21 21 21H3C2.73478 21 2.48043 20.8946 2.29289 20.7071C2.10536 20.5196 2 20.2652 2 20V6C2 5.73478 2.10536 5.48043 2.29289 5.29289C2.48043 5.10536 2.73478 5 3 5H7ZM20 13H4V19H20V13ZM20 7H4V11H7V9H9V11H15V9H17V11H20V7ZM9 3V5H15V3H9Z" fill="#2C3E50"/>
@@ -55,7 +55,7 @@
55
55
  </div>
56
56
  <div class="profile-link__text">Профиль Работа</div>
57
57
  </a>
58
- <a href="https://adata.kz/favourites" class="profile-link" target="_blank">
58
+ <a :href="links.favourites[mode] + `${tab ? '?tab=' + tab : ''}`" onclick="`return false`" class="profile-link" target="_blank">
59
59
  <div class="profile-link__icon">
60
60
  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
61
61
  <path d="M5 2H19C19.2652 2 19.5196 2.10536 19.7071 2.29289C19.8946 2.48043 20 2.73478 20 3V22.143C20.0001 22.2324 19.9763 22.3202 19.9309 22.3973C19.8855 22.4743 19.8204 22.5378 19.7421 22.5811C19.6639 22.6244 19.5755 22.6459 19.4861 22.6434C19.3968 22.641 19.3097 22.6146 19.234 22.567L12 18.03L4.766 22.566C4.69037 22.6135 4.60339 22.6399 4.5141 22.6424C4.42482 22.6449 4.33649 22.6235 4.2583 22.5803C4.1801 22.5371 4.11491 22.4738 4.06948 22.3969C4.02406 22.32 4.00007 22.2323 4 22.143V3C4 2.73478 4.10536 2.48043 4.29289 2.29289C4.48043 2.10536 4.73478 2 5 2ZM18 4H6V19.432L12 15.671L18 19.432V4Z" fill="#2C3E50"/>
@@ -78,6 +78,10 @@
78
78
  <script>
79
79
  export default {
80
80
  props: {
81
+ mode: {
82
+ type: String,
83
+ required: true,
84
+ },
81
85
  rate: {
82
86
  type: String,
83
87
  required: true
@@ -85,6 +89,41 @@ export default {
85
89
  balance: {
86
90
  type: String,
87
91
  required: true
92
+ },
93
+ tab: {
94
+ type: String,
95
+ default: ""
96
+ }
97
+ },
98
+ data() {
99
+ return {
100
+ links: {
101
+ balance: {
102
+ 'prod': 'https://adata.kz/profile?modal=show',
103
+ 'dev': 'https://adtdev.kz/profile?modal=show',
104
+ 'staging': 'https://adada.kz/profile?modal=show',
105
+ },
106
+ profile: {
107
+ 'prod': 'https://adata.kz/profile',
108
+ 'dev': 'https://adtdev.kz/profile',
109
+ 'staging': 'https://adada.kz/profile',
110
+ },
111
+ tenders: {
112
+ 'prod': 'https://tender.adata.kz/profile/search-profile',
113
+ 'dev': 'https://tender.adtdev.kz/profile/search-profile',
114
+ 'staging': 'https://tender.adada.kz/profile/search-profile',
115
+ },
116
+ work: {
117
+ 'prod': 'https://work.adata.kz/profile/account',
118
+ 'dev': 'https://work.adtdev.kz/profile/account' ,
119
+ 'staging': 'https://work.adada.kz/profile/account',
120
+ },
121
+ favourites: {
122
+ 'prod': 'https://adata.kz/favourites',
123
+ 'dev': 'https://adtdev.kz/favourites' ,
124
+ 'staging': 'https://adada.kz/favourites',
125
+ },
126
+ }
88
127
  }
89
128
  }
90
129
  }
package/src/configs/profileDropDown.js CHANGED
@@ -45,9 +45,9 @@ export const profileDropDown = [
45
45
  {
46
46
  id: 8,
47
47
  name: "Избранные",
48
- dev: "https://pk.adtdev.kz/profile/favorites",
49
- staging: "https://pk.adada.kz/profile/favorites",
50
- prod: "https://pk.adata.kz/profile/favorites"
48
+ dev: "https://adtdev.kz/favourites",
49
+ staging: "https://adada.kz/favourites",
50
+ prod: "https://adata.kz/favourites"
51
51
  },
52
52
  {
53
53
  id: 9,