Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/Added GTAG (Google analytics) #52

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open

Feature/Added GTAG (Google analytics) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a33dc49
feat(gtag): addded google alanytics
Jul 6, 2022
4fba8d9
Merge branch 'next' of https://github.com/carrier-io/design-system in…
Jul 6, 2022
982349f
feat(gtag): merged next
Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions static/assets/js/dropdowns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ const TreeList = {
console.log(`SELECTED TREE ITEMS: ${val}`)
}
},
<<<<<<< Updated upstream
=======
// mounted() {
// if (this.allSelected) this.selectAllItems(this.itemsListTree);
// },
>>>>>>> Stashed changes
methods: {
selectAllItems(values) {
values.forEach(value => {
Expand All @@ -97,6 +103,20 @@ const TreeList = {
if(type === 'group' && !e.target.checked && e.target.checked !== undefined) {
console.log(e)
}


// if(!relatedId) {
// this.selectedItems.push(item.id)
// }
// console.log(relatedId, item, e);

// if (!e.target.checked && e.target.checked !== undefined) {
// this.selectedItems = this.selectedItems
// .filter(v => !this.selectRelatedItems(item).includes(v))
// .filter(v => v !== item.id)
// } else if (e.target.checked) {
// this.selectedItems = [...this.selectedItems, ...this.selectRelatedItems(item), item.id];
// }
}
},
template: `
Expand Down Expand Up @@ -131,6 +151,18 @@ const TreeList = {
></i>
<label
@click="toggleItem(item1lvl, $event, null, item1lvl.type)"
<<<<<<< Updated upstream
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
<input
type="checkbox">
<span class="w-100 d-inline-block ml-3">{{ item1lvl.title }}</span>
</label>
</p>
<p v-else class="d-flex align-items-center px-3 position-relative">
<label
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
<input
=======
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
<input
type="checkbox">
Expand All @@ -141,13 +173,31 @@ const TreeList = {
<label
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
<input
>>>>>>> Stashed changes
@click="toggleItem(item1lvl, $event)"
type="checkbox">
<span class="w-100 d-inline-block ml-3">{{ item1lvl.title }}</span>
</label>
</p>
<div v-if="item1lvl.items && item1lvl.showItems" class="ml-4">
<div v-for="item2lvl in item1lvl.items" :key="item2lvl.id">
<<<<<<< Updated upstream
=======
<!-- <p v-if="item2lvl.type === 'group'" class="d-flex align-items-center px-3 position-relative">-->
<!-- <i class="fa fa-sort-down position-absolute"-->
<!-- v-if="item2lvl.items"-->
<!-- @click="item2lvl.showItems = !item2lvl.showItems"-->
<!-- :style="[!item2lvl.showItems ? 'transform: rotate(270deg)' : '']"-->
<!-- ></i>-->
<!-- <label-->
<!-- @click="checkItem(item2lvl, $event)"-->
<!-- class="mb-0 w-100 d-flex align-items-center custom-checkbox">-->
<!-- <input-->
<!-- type="checkbox">-->
<!-- <span class="w-100 d-inline-block ml-3">{{ item2lvl.title }}</span>-->
<!-- </label>-->
<!-- </p>-->
>>>>>>> Stashed changes
<p v-if="item2lvl.type !== 'group'" class="d-flex align-items-center px-3 position-relative">
<label
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
Expand All @@ -157,6 +207,23 @@ const TreeList = {
<span class="w-100 d-inline-block ml-3">{{ item2lvl.title }}</span>
</label>
</p>
<<<<<<< Updated upstream
=======
<!-- <div v-if="item2lvl.items && item2lvl.showItems" class="ml-4">-->
<!-- <div v-for="item3lvl in item2lvl.items" :key="item3lvl.id">-->
<!-- <p class="d-flex align-items-center px-3">-->
<!-- <label-->
<!-- class="mb-0 w-100 d-flex align-items-center custom-checkbox">-->
<!-- <input-->
<!-- :value="item3lvl.id"-->
<!-- v-model="selectedItems"-->
<!-- type="checkbox">-->
<!-- <span class="w-100 d-inline-block ml-3">{{ item3lvl.title }}</span>-->
<!-- </label>-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
>>>>>>> Stashed changes
</div>
</div>
</div>
Expand Down Expand Up @@ -337,6 +404,7 @@ const ComplexListFilter = {
<label
class="mb-0 w-100 d-flex align-items-center custom-checkbox"
:class="{ 'custom-checkbox__minus': isAllSelected }">
<<<<<<< Updated upstream
<input
@click="handlerSelectAll"
:ref="refSearchId"
Expand All @@ -349,6 +417,8 @@ const ComplexListFilter = {
v-for="item in foundItems" :key="item.id">
<label
class="mb-0 w-100 d-flex align-items-center custom-checkbox">
=======
>>>>>>> Stashed changes
<input
:value="item"
v-model="selectedItems"
Expand Down
130 changes: 130 additions & 0 deletions static/assets/js/mock/data-analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
const dataAnalytics = {
'All': {
'Users': "getData('Users', 'All')",
'Throughput': "getData('Throughput', 'All')",
'Errors': "getData('Errors', 'All')",
'Min': "getData('Min', 'All')",
'Median': "getData('Median', 'All')",
'Max': "getData('Max', 'All')",
'pct90': "getData('pct90', 'All')",
'pct95': "getData('pct95', 'All')",
'pct99': "getData('pct99', 'All')",
'1xx': "getData('1xx', 'All')",
'2xx': "getData('2xx', 'All')",
'3xx': "getData('3xx', 'All')",
'4xx': "getData('4xx', 'All')",
'5xx': "getData('5xx', 'All')"
},
'Authenticate': {
'Users': "getData('Users', 'Authenticate')",
'Throughput': "getData('Throughput', 'Authenticate')",
'Errors': "getData('Errors', 'Authenticate')",
'Min': "getData('Min', 'Authenticate')",
'Median': "getData('Median', 'Authenticate')",
'Max': "getData('Max', 'Authenticate')",
'pct90': "getData('pct90', 'Authenticate')",
'pct95': "getData('pct95', 'Authenticate')",
'pct99': "getData('pct99', 'Authenticate')",
'1xx': "getData('1xx', 'Authenticate')",
'2xx': "getData('2xx', 'Authenticate')",
'3xx': "getData('3xx', 'Authenticate')",
'4xx': "getData('4xx', 'Authenticate')",
'5xx': "getData('5xx', 'Authenticate')"
},
'BuyProduct': {
'Users': "getData('Users', 'BuyProduct')",
'Throughput': "getData('Throughput', 'BuyProduct')",
'Errors': "getData('Errors', 'BuyProduct')",
'Min': "getData('Min', 'BuyProduct')",
'Median': "getData('Median', 'BuyProduct')",
'Max': "getData('Max', 'BuyProduct')",
'pct90': "getData('pct90', 'BuyProduct')",
'pct95': "getData('pct95', 'BuyProduct')",
'pct99': "getData('pct99', 'BuyProduct')",
'1xx': "getData('1xx', 'BuyProduct')",
'2xx': "getData('2xx', 'BuyProduct')",
'3xx': "getData('3xx', 'BuyProduct')",
'4xx': "getData('4xx', 'BuyProduct')",
'5xx': "getData('5xx', 'BuyProduct')"
},
'FillOrderNowForm': {
'Users': "getData('Users', 'FillOrderNowForm')",
'Throughput': "getData('Throughput', 'FillOrderNowForm')",
'Errors': "getData('Errors', 'FillOrderNowForm')",
'Min': "getData('Min', 'FillOrderNowForm')",
'Median': "getData('Median', 'FillOrderNowForm')",
'Max': "getData('Max', 'FillOrderNowForm')",
'pct90': "getData('pct90', 'FillOrderNowForm')",
'pct95': "getData('pct95', 'FillOrderNowForm')",
'pct99': "getData('pct99', 'FillOrderNowForm')",
'1xx': "getData('1xx', 'FillOrderNowForm')",
'2xx': "getData('2xx', 'FillOrderNowForm')",
'3xx': "getData('3xx', 'FillOrderNowForm')",
'4xx': "getData('4xx', 'FillOrderNowForm')",
'5xx': "getData('5xx', 'FillOrderNowForm')"
},
'Home_Page': {
'Users': "getData('Users', 'Home_Page')",
'Throughput': "getData('Throughput', 'Home_Page')",
'Errors': "getData('Errors', 'Home_Page')",
'Min': "getData('Min', 'Home_Page')",
'Median': "getData('Median', 'Home_Page')",
'Max': "getData('Max', 'Home_Page')",
'pct90': "getData('pct90', 'Home_Page')",
'pct95': "getData('pct95', 'Home_Page')",
'pct99': "getData('pct99', 'Home_Page')",
'1xx': "getData('1xx', 'Home_Page')",
'2xx': "getData('2xx', 'Home_Page')",
'3xx': "getData('3xx', 'Home_Page')",
'4xx': "getData('4xx', 'Home_Page')",
'5xx': "getData('5xx', 'Home_Page')"
},
'OrderProduct': {
'Users': "getData('Users', 'OrderProduct')",
'Throughput': "getData('Throughput', 'OrderProduct')",
'Errors': "getData('Errors', 'OrderProduct')",
'Min': "getData('Min', 'OrderProduct')",
'Median': "getData('Median', 'OrderProduct')",
'Max': "getData('Max', 'OrderProduct')",
'pct90': "getData('pct90', 'OrderProduct')",
'pct95': "getData('pct95', 'OrderProduct')",
'pct99': "getData('pct99', 'OrderProduct')",
'1xx': "getData('1xx', 'OrderProduct')",
'2xx': "getData('2xx', 'OrderProduct')",
'3xx': "getData('3xx', 'OrderProduct')",
'4xx': "getData('4xx', 'OrderProduct')",
'5xx': "getData('5xx', 'OrderProduct')"
},
'ProductPage': {
'Users': "getData('Users', 'ProductPage')",
'Throughput': "getData('Throughput', 'ProductPage')",
'Errors': "getData('Errors', 'ProductPage')",
'Min': "getData('Min', 'ProductPage')",
'Median': "getData('Median', 'ProductPage')",
'Max': "getData('Max', 'ProductPage')",
'pct90': "getData('pct90', 'ProductPage')",
'pct95': "getData('pct95', 'ProductPage')",
'pct99': "getData('pct99', 'ProductPage')",
'1xx': "getData('1xx', 'ProductPage')",
'2xx': "getData('2xx', 'ProductPage')",
'3xx': "getData('3xx', 'ProductPage')",
'4xx': "getData('4xx', 'ProductPage')",
'5xx': "getData('5xx', 'ProductPage')"
},
'Search': {
'Users': "getData('Users', 'Search')",
'Throughput': "getData('Throughput', 'Search')",
'Errors': "getData('Errors', 'Search')",
'Min': "getData('Min', 'Search')",
'Median': "getData('Median', 'Search')",
'Max': "getData('Max', 'Search')",
'pct90': "getData('pct90', 'Search')",
'pct95': "getData('pct95', 'Search')",
'pct99': "getData('pct99', 'Search')",
'1xx': "getData('1xx', 'Search')",
'2xx': "getData('2xx', 'Search')",
'3xx': "getData('3xx', 'Search')",
'4xx': "getData('4xx', 'Search')",
'5xx': "getData('5xx', 'Search')"
}
}
6 changes: 6 additions & 0 deletions static/assets/style/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion static/assets/style/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions static/assets/style/scss/controls/_checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@
background-size: 10px;
}
}
&__minus {
input[type=checkbox]::before {
border-color: var(--purple);
background-color: var(--purple);
background-image: url("../../../../../static/assets/ico/minus.svg");
background-size: 10px;
}
}
}

/* checkbox multicolor */
Expand Down
Loading