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

Feature/dapp submission #1339

Merged
merged 63 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c2f5ad3
First commit
Aug 7, 2019
5c65392
-m
Aug 8, 2019
088db28
Sync with develop
Aug 13, 2019
7336dc6
linter changes
Aug 13, 2019
86a8e38
Fix build
gamalielhere Aug 13, 2019
95efb00
Merge branch 'feature/dapp-submission' of github.com:MyEtherWallet/My…
gamalielhere Aug 13, 2019
425573c
Sync
gamalielhere Aug 13, 2019
5db11de
Tag
gamalielhere Aug 13, 2019
db6c9e3
Committing
Aug 13, 2019
7f97ea3
Committing what i have so far
Aug 14, 2019
9c164ed
Merge branch 'develop' of github.com:MyEtherWallet/MyEtherWallet into…
Aug 14, 2019
c52b830
Committing what I have
Aug 15, 2019
73ebbf7
Committing what I have
Aug 15, 2019
e3cad8e
Got the tags input to work
Aug 19, 2019
25bed7d
Adding drag and drop
Aug 19, 2019
19ee261
Committing the social links
Aug 20, 2019
3f9c08b
Fix modal placement
Aug 20, 2019
a7c569e
Finished the pages
Aug 21, 2019
91029f5
Adding scss update
Aug 21, 2019
84d51ce
Adding confirmation modal
Aug 21, 2019
5e200ea
Getting latest develop
Aug 21, 2019
aab171b
Fixing lint
Aug 21, 2019
ddb40ae
Fixing build
Aug 21, 2019
768faab
Fixing vue config
Aug 21, 2019
c56a47f
Testing formspree
Aug 22, 2019
e8a7759
fix linters
Aug 22, 2019
916dcea
Adding meta name
Aug 22, 2019
8be6eae
Adding meta name
Aug 22, 2019
ce00ad1
Adding validations
Aug 22, 2019
6fc22c9
Adding link to homepage
Aug 22, 2019
aba1040
Fixing linters
Aug 22, 2019
0018acd
Adding referrer
Aug 22, 2019
0d24607
Cleaning up the code
Aug 22, 2019
2f33d10
Adding translation files'
Aug 22, 2019
57f4fa9
Fixing updateBanner
Aug 22, 2019
a8af885
Some more cleaning
Aug 22, 2019
9c3521b
Cleaning
Aug 22, 2019
4054f5e
More cleanup
Aug 22, 2019
2c4a517
More cleaning
Aug 22, 2019
1067bef
Cleaning up
Aug 23, 2019
7645c1f
Cleaning up validations
Aug 23, 2019
6763ca3
Trying file upload
Aug 23, 2019
4ea0a70
Trying to get it to build
Aug 23, 2019
a9afa9d
Updating success modal
Aug 26, 2019
609888e
Fix typo
Aug 26, 2019
10bbfd8
Got photo upload to work
Aug 26, 2019
0ffdfec
Adding the missing info
Aug 26, 2019
dbf8361
switching the email
Aug 26, 2019
4d72645
Fixing responsiveness
Aug 27, 2019
ea9d3be
Add greenkeeper packages
gamalielhere Aug 27, 2019
eb39a1c
Update CHANGELOG.md
gamalielhere Aug 27, 2019
38c1e70
Fix build
gamalielhere Aug 27, 2019
dc13d14
Merge branch 'feature/dapp-submission' of github.com:MyEtherWallet/My…
gamalielhere Aug 27, 2019
9c8fa44
Improving file upload
Aug 29, 2019
ab1ab34
Updating dapp submission page
Aug 30, 2019
9713f86
Updating validation names
Sep 3, 2019
da140d6
Merge branch 'develop' into feature/dapp-submission
gamalielhere Sep 4, 2019
77b2d4c
Updating with develop
Sep 5, 2019
75e6a96
Updating bootstrap modal
Sep 5, 2019
9bde89f
Update with latest develop
Oct 4, 2019
2e4e34d
Added SOTD wording
Oct 4, 2019
2a0c847
Fixed component text
Oct 4, 2019
38a8fab
Fix conflicts
gamalielhere Oct 9, 2019
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
### Release v5.1.6

### Feature

- Dapp submission page [#1339](https://github.com/MyEtherWallet/MyEtherWallet/pull/1339)

### Devop

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


### Release v5.1.5

### Feature
Expand Down
681 changes: 463 additions & 218 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const CUSTOM_DIST = {
['babel-core']: 'bridge'
};
const ALL_PACKAGES = Object.assign(
{},
package.dependencies,
package.devDependencies
);
Expand Down
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<meta name="theme-color" content="#0B2840" />
<meta name="referrer" content="origin" />
<meta name="description"
content="MyEtherWallet (MEW) is a free, open-source, client-side interface for generating Ethereum wallets & more. Interact with the Ethereum blockchain easily & securely." />
<meta property="og:title" content="MyEtherWallet.com: Your Key to Ethereum" />
Expand Down
Binary file added src/assets/images/banners/bg.png
Loading
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/dapps/sotd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/assets/images/icons/linkedin.svg
Loading
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/remove.png
Loading
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/message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions src/builds/configs/base-routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ const NotFoundLayout = () => import('@/layouts/NotFoundLayout');
const GettingStarted = () => import('@/layouts/GettingStarted');
const SendOfflineHelper = () => import('@/layouts/SendOfflineHelper');
const VerifyMessageLayout = () => import('@/layouts/VerifyMessageLayout');
const DappSubmission = () => import('@/layouts/DappSubmissionLayout');
const AboutYourDapp = () =>
import('@/layouts/DappSubmissionLayout/containers/AboutYourDappContainer');
const AboutYourTeam = () =>
import('@/layouts/DappSubmissionLayout/containers/AboutYourTeamContainer');
const DappSummary = () =>
import('@/layouts/DappSubmissionLayout/containers/SummaryContainer');

const DappsContainer = () =>
import('@/layouts/InterfaceLayout/containers/DappsContainer');
Expand Down Expand Up @@ -90,6 +97,36 @@ const router = [
component: SendOfflineHelper,
meta: { requiresAuth: false }
},
{
path: '/dapp-submission',
component: DappSubmission,
children: [
{
path: '',
name: 'DappSubmission',
component: AboutYourDapp,
meta: { requiresAuth: false }
},
{
path: 'about-your-dapp',
name: 'AboutYourDapp',
component: AboutYourDapp,
meta: { requiresAuth: false }
},
{
path: 'about-your-team',
name: 'AboutYourTeam',
component: AboutYourTeam,
meta: { requiresAuth: false }
},
{
path: 'dapp-summary',
name: 'DappSummary',
component: DappSummary,
meta: { requiresAuth: false }
}
]
},
{
path: '/verify-message',
name: 'VerifyMessageLayout',
Expand Down
7 changes: 6 additions & 1 deletion src/builds/web/app.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<template>
<div id="app">
<logout-warning-modal ref="logoutWarningModal" />
<header-container v-show="$route.fullPath !== '/getting-started'" />
<header-container
v-show="
$route.fullPath !== '/getting-started' &&
!$route.fullPath.includes('/dapp-submission')
"
/>
<welcome-modal ref="welcome" />
<router-view />
<footer-container />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
@media all and (max-width: $mobile-width) {
padding: 40px 20px;
}

img {
left: 0;
position: absolute;
top: 0;
width: 100%;
}
}

.buttons {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
lazy
>
<div class="modal-content-block">
<img src="@/assets/images/modal/garlands.png" />
<div class="d-block text-center">
<i class="check-icon fa fa-check" aria-hidden="true" />
<h2 class="title">{{ $t('confirmation.success') }}</h2>
<h2 class="title">
{{ successTitle ? successTitle : $t('confirmation.success') }}
</h2>
<p>{{ message }}</p>
</div>

Expand Down Expand Up @@ -56,6 +59,10 @@ export default {
etherscanLink: {
type: String,
default: null
},
successTitle: {
type: String,
default: null
}
},
computed: {
Expand Down Expand Up @@ -83,6 +90,11 @@ export default {
hideModal() {
if (this.linkTo !== '/') {
this.$router.push({ path: this.linkTo });
} else if (
this.linkTo === '/' &&
this.successTitle === 'Congratulations'
) {
this.$router.push({ path: '/' });
}
this.$refs.success.hide();
}
Expand Down
4 changes: 4 additions & 0 deletions src/containers/FooterContainer/FooterContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ export default {
{
text: this.$t('footer.verifyMessage'),
to: '/verify-message'
},
{
text: 'Submit DApp',
to: '/dapp-submission'
}
]
},
Expand Down
8 changes: 8 additions & 0 deletions src/containers/FooterContainer/affiliates.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ const affiliates = [
href: 'http://lddy.no/a4im',
currency: '$',
logo: 'keepkey'
},
{
text: 'footer.sotd',
price: '',
description: '',
href: 'https://www.stateofthedapps.com/',
currency: '',
logo: ''
}
];

Expand Down
24 changes: 24 additions & 0 deletions src/layouts/DappSubmissionLayout/DappSubmissionLayout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@import '~@/scss/GlobalVariables';
body {
font-family: 'Avenir Next';
}

.dapp-container-right {
display: inline-block;
vertical-align: top;
position: sticky;
position: -webkit-sticky;
top: 60px;
}

.dapp-container {
text-align: center;
}

.dapp-progress-bar {
height: 5px;
}

.fake-form {
opacity: 0;
}
Loading