Fix conflicts

CHANGELOG.md

@@ -1,12 +1,15 @@
 ### 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)
 - 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
 
 ### Feature

package-test.js

@@ -22,7 +22,6 @@ const CUSTOM_DIST = {
   ['babel-core']: 'bridge'
 };
 const ALL_PACKAGES = Object.assign(
-  {},
   package.dependencies,
   package.devDependencies
 );

public/index.html

@@ -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" />

src/builds/configs/base-routes.js

@@ -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');
@@ -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',

src/builds/web/app.vue

@@ -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 />

src/containers/ConfirmationContainer/components/SuccessModal/SuccessModal.scss

@@ -16,6 +16,13 @@
   @media all and (max-width: $mobile-width) {
     padding: 40px 20px;
   }
+
+  img {
+    left: 0;
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
 }
 
 .buttons {

src/containers/ConfirmationContainer/components/SuccessModal/SuccessModal.vue

@@ -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>
 
@@ -56,6 +59,10 @@ export default {
     etherscanLink: {
       type: String,
       default: null
+    },
+    successTitle: {
+      type: String,
+      default: null
     }
   },
   computed: {
@@ -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();
     }

src/containers/FooterContainer/FooterContainer.vue

@@ -199,6 +199,10 @@ export default {
             {
               text: this.$t('footer.verifyMessage'),
               to: '/verify-message'
+            },
+            {
+              text: 'Submit DApp',
+              to: '/dapp-submission'
             }
           ]
         },

src/containers/FooterContainer/affiliates.js

@@ -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: ''
   }
 ];
 

src/layouts/DappSubmissionLayout/DappSubmissionLayout.scss

@@ -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;
+}