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.

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

Dev/mew decision tree new #1442

Merged
merged 50 commits into from Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
cf38bb4
Fix error messages
hsurf22 Sep 7, 2019
047b42e
Add DecisionTree component
hsurf22 Sep 7, 2019
be62ab8
Add Mdcontainer component
hsurf22 Sep 7, 2019
3c65ae6
remove md
hsurf22 Sep 9, 2019
894bb4c
commit error fixed
hsurf22 Sep 10, 2019
f99abcd
QA list style update
hsurf22 Sep 10, 2019
76c2d14
Add search component
hsurf22 Sep 11, 2019
2343c69
Update style
hsurf22 Sep 11, 2019
144275a
icons added
hsurf22 Sep 11, 2019
b39f2f4
Update ui
hsurf22 Sep 11, 2019
fcfcd7e
Cloase button added
hsurf22 Sep 11, 2019
247037f
update header
hsurf22 Sep 11, 2019
5fe486c
Add md data
hsurf22 Sep 12, 2019
355571d
Fix index.js content
hsurf22 Sep 12, 2019
67bd975
Add customer support modal
hsurf22 Sep 12, 2019
b6adafc
Keyword search function added
hsurf22 Sep 12, 2019
a1a2a3d
Search works
hsurf22 Sep 13, 2019
cb7aa6a
Update search layout
hsurf22 Sep 13, 2019
aa43f88
Search works now
hsurf22 Sep 13, 2019
fa835dd
MD data update
hsurf22 Sep 16, 2019
2125db2
Update md content style and content
hsurf22 Sep 17, 2019
8c06e60
Add no search results message
hsurf22 Sep 17, 2019
88b96e3
Update decision tree show button
hsurf22 Sep 17, 2019
a38177f
Update mobile style
hsurf22 Sep 17, 2019
5dc49b5
Update modal style
hsurf22 Sep 17, 2019
ecb9f1b
Update md content
hsurf22 Sep 18, 2019
dc2de49
commit before remove vue-search-select
hsurf22 Sep 18, 2019
6bec55c
vue-multiselect installed
hsurf22 Sep 18, 2019
ae8ee29
vue-multiselect works
hsurf22 Sep 19, 2019
9a271c5
Update search input and result style
hsurf22 Sep 19, 2019
54391c4
Update footer style
hsurf22 Sep 19, 2019
046aa48
Update changelog
hsurf22 Sep 19, 2019
d2c7c8b
Fix conflicts
gamalielhere Sep 19, 2019
148748f
Fix build
gamalielhere Sep 19, 2019
112ebcd
Search block style bug fix
hsurf22 Sep 19, 2019
ab1d9a4
Update list style
hsurf22 Sep 19, 2019
1d1aa6b
Remove search
hsurf22 Sep 19, 2019
48b2deb
Update md contents
hsurf22 Sep 19, 2019
d1f2dbf
Update data
hsurf22 Sep 20, 2019
c22bb72
Fix md data
hsurf22 Sep 20, 2019
63b84c5
Header: Category history added
hsurf22 Sep 20, 2019
b19e054
Update md contents
hsurf22 Sep 20, 2019
02f3696
Update md contents
hsurf22 Sep 20, 2019
e2086b0
Home button is hidden when user is ont top category.
hsurf22 Sep 20, 2019
dff3de9
Markdown data update
hsurf22 Sep 23, 2019
650d2fe
Breadcrumb added
hsurf22 Oct 2, 2019
cf006bb
Update md index
hsurf22 Oct 2, 2019
c52268b
Fix conflicts
gamalielhere Oct 9, 2019
49c6164
Fix test
gamalielhere Oct 9, 2019
32d6e12
Fix conflicts
gamalielhere Oct 10, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,7 @@
### Devop

- Remove Aldo from team page [#1482](https://github.com/MyEtherWallet/MyEtherWallet/pull/1482)
- Add decision tree [#1442](https://github.com/MyEtherWallet/MyEtherWallet/pull/1442)
- Update packages [#1474](https://github.com/MyEtherWallet/MyEtherWallet/pull/1474)

### Release v5.1.5
Expand Down Expand Up @@ -39,6 +40,7 @@
- Gas price not saving properly [#1434](https://github.com/MyEtherWallet/MyEtherWallet/pull/1434)
- Fix u2f timeout for bitbox on windows [#1423](https://github.com/MyEtherWallet/MyEtherWallet/pull/1423)


### Release v5.1.3

### Feature
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Expand Up @@ -29,7 +29,8 @@ module.exports = {
'^@@/(.*)$': '<rootDir>/tests/unit/$1',
'^@/tests$': '<rootDir>/tests/index.js',
'^@/tests/(.*)$': '<rootDir>/tests/$1',
'\\.worker.js': '<rootDir>/tests/unit/__mocks__/workerMock.js'
'\\.worker.js': '<rootDir>/tests/unit/__mocks__/workerMock.js',
'\\.md': '<rootDir>/tests/unit/__mocks__/mdMockup.js'
},
transformIgnorePatterns: [
'node_modules/(?!(vue-router|bootstrap|register-service-worker|vue-tel-input))'
Expand Down
1,356 changes: 929 additions & 427 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -50,6 +50,7 @@
"vue": "2.6.10",
"vue-datetime": "1.0.0-beta.10",
"vue-mq": "1.0.1",
"vue-multiselect": "2.1.6",
"vue-router": "3.1.3",
"vue-toasted": "1.1.27",
"vuex": "3.1.1",
Expand Down Expand Up @@ -102,6 +103,7 @@
"jest-skipped-reporter": "0.0.4",
"jspdf": "1.5.3",
"keccak": "2.0.0",
"marked": "0.7.0",
"mew-maker-plugin": "0.0.2",
"multicoin-address-validator": "git+https://github.com/MyEtherWallet/multicoin-address-validator.git",
"node-fetch": "2.6.0",
Expand All @@ -110,6 +112,7 @@
"postcss-import": "12.0.1",
"postcss-url": "8.0.0",
"prettier": "1.18.2",
"raw-loader": "3.1.0",
"remark-cli": "7.0.0",
"remark-preset-lint-recommended": "3.0.3",
"rskjs-util": "1.0.3",
Expand Down
16 changes: 16 additions & 0 deletions src/assets/images/icons/DecisionTree/home.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/assets/images/icons/DecisionTree/need-help.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions src/assets/images/icons/DecisionTree/question.svg
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/images/icons/qa.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/components/CustomerSupport/CustomerSupport.vue
Expand Up @@ -49,6 +49,10 @@ export default {
noIcon: {
type: Boolean,
default: false
},
show: {
type: Boolean,
default: false
}
},
data() {
Expand Down Expand Up @@ -80,6 +84,11 @@ export default {
)}&body=${encodeURIComponent(body)}`;
}
},
watch: {
show() {
this.showModal();
}
},
mounted() {
this.browser = platform.name;
this.os = platform.os.family;
Expand Down