adata-ui 0.3.10 → 0.3.11

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.
package/package-lock.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adata-ui",
3
- "version": "0.3.3",
3
+ "version": "0.3.6",
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.10",
3
+ "version": "0.3.11",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/public/index.html CHANGED
@@ -1,17 +1,17 @@
1
- <!DOCTYPE html>
2
- <html lang="">
3
- <head>
4
- <meta charset="utf-8">
5
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
- <meta name="viewport" content="width=device-width,initial-scale=1.0">
7
- <link rel="icon" href="<%= BASE_URL %>logo.svg">
8
- <title>Adata UI</title>
9
- </head>
10
- <body>
11
- <noscript>
12
- <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
13
- </noscript>
14
- <div id="app"></div>
15
- <!-- built files will be auto injected -->
16
- </body>
17
- </html>
1
+ <!DOCTYPE html>
2
+ <html lang="">
3
+ <head>
4
+ <meta charset="utf-8">
5
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
+ <meta name="viewport" content="width=device-width,initial-scale=1.0">
7
+ <link rel="icon" href="<%= BASE_URL %>logo.svg">
8
+ <title>Adata UI</title>
9
+ </head>
10
+ <body>
11
+ <noscript>
12
+ <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
13
+ </noscript>
14
+ <div id="app"></div>
15
+ <!-- built files will be auto injected -->
16
+ </body>
17
+ </html>
package/src/App.vue CHANGED
@@ -1,17 +1,20 @@
1
1
  <template>
2
2
  <div id="app">
3
- <a-internal-server-error/>
4
- <a-not-found/>
5
- <a-forbidden/>
6
- <a-unavailable/>
7
- <a-bad-gateway/>
8
3
 
4
+ <a-header active-tab-key="" login-url="" mode=""></a-header>
5
+
6
+ <Footer/>
9
7
  </div>
10
8
  </template>
11
9
 
12
10
  <script>
11
+ import Footer from "@/components/Footer/Footer";
12
+
13
13
  export default {
14
14
  name: "App",
15
+ components: {
16
+ Footer
17
+ }
15
18
  };
16
19
  </script>
17
20
 
@@ -21,5 +24,6 @@ export default {
21
24
  -webkit-font-smoothing: antialiased;
22
25
  -moz-osx-font-smoothing: grayscale;
23
26
  color: #2c3e50;
27
+
24
28
  }
25
29
  </style>
@@ -1,6 +1,18 @@
1
1
  *:focus {
2
2
  outline: none;
3
3
  }
4
+ .mobile {
5
+ display: none;
6
+ @media(max-width: 1025px) {
7
+ display: block;
8
+ }
9
+ }
10
+ .desktop {
11
+ display: block;
12
+ @media(max-width: 1025px) {
13
+ display: none;
14
+ }
15
+ }
4
16
 
5
17
  .adt-text-block {
6
18
  $self: &;
@@ -194,8 +194,9 @@ export default {
194
194
  align-items: center;
195
195
  gap: 40px;
196
196
  @media only screen and (max-width: 820px) {
197
+ margin: 0 16px;
197
198
  height: 100%;
198
- margin: 24px 16px 0;
199
+ margin-top: 24px;
199
200
  }
200
201
 
201
202
  &__images {
@@ -435,8 +435,9 @@ export default {
435
435
  align-items: center;
436
436
  gap: 40px;
437
437
  @media only screen and (max-width: 820px) {
438
+ margin: 0 16px;
438
439
  height: 100%;
439
- margin: 24px 16px 0;
440
+ margin-top: 24px;
440
441
  }
441
442
 
442
443
  &__images {
@@ -896,7 +896,7 @@
896
896
  <h3 class="title">404</h3>
897
897
  <p class="title-bottom">Запрашиваемая страница не найдена</p>
898
898
  <p class="text">Похоже вы допустили опечатку, набирая адрес, или воспользовались неисправной ссылкой.</p>
899
- <p class="text">Что найти нужную информацию, воспользуйтесь формой поиска на главной странице.</p>
899
+ <p class="text">Чтобы найти нужную информацию, воспользуйтесь формой поиска на главной странице.</p>
900
900
  </div>
901
901
  <div class="error__info__button">
902
902
  <a-button variant="yellow" size="sm" nuxt-url="/">Перейти на главную</a-button>
@@ -961,8 +961,9 @@ export default {
961
961
  align-items: center;
962
962
  gap: 40px;
963
963
  @media only screen and (max-width: 820px) {
964
+ margin: 0 16px;
964
965
  height: 100%;
965
- margin: 24px 16px 0;
966
+ margin-top: 24px;
966
967
  }
967
968
 
968
969
  &__images {
@@ -2,7 +2,7 @@
2
2
  <footer class="a-footer" :class="[{'paddinged': hasBottomMenu}]">
3
3
  <div class="a-footer__top">
4
4
  <div class="nav">
5
- <a class="logo adata-logo" href="https://adata.kz">
5
+ <a class="adata-logo mobile" href="https://adata.kz">
6
6
  <svg fill="#2C3E50" xmlns="http://www.w3.org/2000/svg"
7
7
  viewBox="0 0 166 48" version="1.1">
8
8
  <path
@@ -64,12 +64,20 @@
64
64
  <a href="https://adata.kz/vacancy" class="nav__item nav__link">
65
65
  Вакансии
66
66
  </a>
67
+ <a href="https://pk.adata.kz/counterparty" class="nav__item nav__link desktop">
68
+ Каталог предприятий
69
+ </a>
67
70
  <a href="https://adata.kz/contacts" class="nav__item nav__link">
68
71
  Контакты
69
72
  </a>
70
73
  </div>
71
74
  </div>
72
- <div class="a-footer__bottom"><span>2022 © ТОО "Alldata"</span></div>
75
+ <div class="a-footer__bottom">
76
+ <span>2022 © ТОО "Alldata"</span>
77
+ <a href="https://pk.adata.kz/counterparty" class="a-footer__bottom__link mobile">
78
+ Каталог предприятий
79
+ </a>
80
+ </div>
73
81
  </footer>
74
82
  </template>
75
83
 
@@ -115,10 +123,7 @@ a {
115
123
  }
116
124
 
117
125
  &__top {
118
- display: flex;
119
- justify-content: space-between;
120
- max-width: 900px;
121
- width: 100%;
126
+
122
127
  margin: 0 auto;
123
128
  padding: 20px 24px;
124
129
  @media(max-width: 1025px) {
@@ -127,21 +132,18 @@ a {
127
132
  }
128
133
 
129
134
  .adata-logo {
130
- display: none;
131
- @media(max-width: 1025px) {
132
- display: flex;
133
135
  svg {
134
136
  width: 77px;
135
137
  height: 24px;
136
138
  }
137
- }
138
139
  }
139
140
 
140
141
  .nav {
141
142
  width: 100%;
142
143
  display: flex;
143
- justify-content: space-between;
144
+ justify-content: center;
144
145
  align-items: center;
146
+ gap: 16px;
145
147
  @media(max-width: 1025px) {
146
148
  display: grid;
147
149
  grid-template-columns: 0.7fr 1fr;
@@ -240,6 +242,8 @@ a {
240
242
  background: #EFEFF0;
241
243
  border: none;
242
244
  border-top: 1px solid #bdc7ce;
245
+ display: grid;
246
+ gap: 8px;
243
247
  }
244
248
 
245
249
  span {
@@ -247,11 +251,20 @@ a {
247
251
  line-height: 12px;
248
252
  color: #71757a;
249
253
  @media(max-width: 1025px) {
250
- font-size: 10px;
251
- line-height: 16px;
254
+ font-size: 12px;
255
+ line-height: 20px;
256
+
252
257
  }
253
258
  }
259
+
260
+ &__link {
261
+ font-size: 12px;
262
+ line-height: 20px;
263
+ color: #71757a;
264
+
265
+ }
254
266
  }
267
+
255
268
  }
256
269
 
257
270
  .mobile-head-wrapper {
@@ -259,4 +272,5 @@ a {
259
272
  justify-content: space-between;
260
273
  align-items: center;
261
274
  }
275
+
262
276
  </style>
@@ -49,8 +49,8 @@
49
49
  {{ item.name }}
50
50
  </a>
51
51
  </div>
52
- <div v-show="hasSearchField || hasFavourites" class="mobile-search">
53
- <div v-show="hasSearchField" @click="$emit('search')" class="search-input">
52
+ <div v-show="hasSearchField" class="mobile-search">
53
+ <div @click="$emit('search')" class="search-input">
54
54
  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
55
55
  <path d="M14 13.9995L10.5967 10.596" stroke="#2C3E50" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
56
56
  <circle cx="7" cy="7" r="5" stroke="#2C3E50" stroke-linecap="round" stroke-linejoin="round"/>
@@ -1124,7 +1124,6 @@ export default {
1124
1124
  @media (max-width: 1025px) {
1125
1125
  display: flex;
1126
1126
  align-items: center;
1127
- justify-content: flex-end;
1128
1127
  gap: 8px;
1129
1128
  width: 100%;
1130
1129
  }
@@ -1142,10 +1141,6 @@ export default {
1142
1141
  line-height: 20px;
1143
1142
  cursor: pointer;
1144
1143
  }
1145
- a {
1146
- height: 100%;
1147
- max-height: 100%;
1148
- }
1149
1144
  .favorite-btn {
1150
1145
  background: rgba(189, 199, 206, 0.2);
1151
1146
  display: flex;
@@ -12,11 +12,11 @@ import ASearchTextField from "./SearchTextField/SearchTextField";
12
12
  import AMailTo from "./MailTo/MailTo";
13
13
  import ATable from "./Table/ATable";
14
14
  import ALoader from "./Loader/Loader";
15
- import ABadGateway from "./ErrorPages/BadGateway";
16
- import AForbidden from "./ErrorPages/Forbidden";
17
- import AInternalServerError from "./ErrorPages/InternalServerError";
18
- import ANotFound from "./ErrorPages/NotFound";
19
- import AUnavailable from "./ErrorPages/Unavailable";
15
+ // import ABadGateway from "./ErrorPages/BadGateway";
16
+ // import AForbidden from "./ErrorPages/Forbidden";
17
+ // import AInternalServerError from "./ErrorPages/InternalServerError";
18
+ // import ANotFound from "./ErrorPages/NotFound";
19
+ // import AUnavailable from "./ErrorPages/Unavailable";
20
20
 
21
21
  const Components = {
22
22
  ACheckbox,
@@ -32,11 +32,11 @@ const Components = {
32
32
  ATable,
33
33
  ALoader,
34
34
  ACheckboxMenu,
35
- ABadGateway,
36
- AForbidden,
37
- AInternalServerError,
38
- ANotFound,
39
- AUnavailable,
35
+ // ABadGateway,
36
+ // AForbidden,
37
+ // AInternalServerError,
38
+ // ANotFound,
39
+ // AUnavailable,
40
40
  };
41
41
 
42
42
  Object.keys(Components).forEach((name) => {
@@ -20,7 +20,7 @@ export const profileDropDown = [
20
20
  },
21
21
  {
22
22
  id: 3,
23
- name: "Историй платежей",
23
+ name: "История платежей",
24
24
  dev: "https://adtdev.kz/profile?tab=payments",
25
25
  staging: "https://adada.kz/profile?tab=payments",
26
26
  prod: "https://adata.kz/profile?tab=payments",