Merge branch 'master' of github.com:eosdac/eosdac-client

quasar.conf.js

@@ -83,6 +83,7 @@ module.exports = function (ctx) {
           new CopyWebpackPlugin([
               { context: `${__dirname}/src/extensions/branding/images/`,from:'*.*', to:'branding/images', toType: 'dir'},
               { context: `${__dirname}/src/extensions/branding/images/icons`,from:'*.*', to:'branding/images/icons', toType: 'dir'},
+              { context: `${__dirname}/src/extensions/branding/images/logo`,from:'*.*', to:'branding/images/logo', toType: 'dir'},
               { context: `${__dirname}/src/extensions/branding/images/social_share_preview`,from:'*.*', to:'branding/images/social_share_preview', toType: 'dir'}
             ]
            ) 

src/App.vue

@@ -90,6 +90,15 @@ export default {
         default: this.$t("meta.noscript")
       }
     };
+  },
+
+  watch: {
+    "$route.query.theme": function(v) {
+      console.log(v);
+      if (v) {
+        this.$store.dispatch("ui/loadTheme", JSON.parse(v));
+      }
+    }
   }
 };
 </script>

src/components/ui/token-statistics.vue

@@ -4,7 +4,7 @@
       <div class="col-xs-12 col-md-4">
         <div class="bg-bg1 round-borders shadow-4 q-pa-md full-height">
           <div v-if="market_data">
-            <div>value {{ market_data.current_price.usd.toFixed(4) }} USD</div>
+            <div>value {{ market_data.current_price.usd.toFixed(5) }} USD</div>
             <div v-if="market_data.price_change_percentage_24h >= 0">
               <span class="text-positive">
                 +{{ market_data.price_change_percentage_24h }}%</span
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="col-xs-12 col-md-4">
-        <div class="bg-bg1 round-borders shadow-4 q-pa-md full-height">
+        <div class="bg-bg1 round-borders shadow-4 q-pa-md full-height bg-logo">
           ddddd
         </div>
       </div>

src/store/ui/actions.js

@@ -0,0 +1,26 @@
+import { colors } from "quasar";
+
+// {
+//     "is_dark": false,
+//     "colors": {
+//       "$primary": "#6677d9",
+//       "$bg1": "#d7dcf7",
+//       "$bg2": "#f0f1fa",
+//       "$text1": "#292829",
+//       "$text2": "#332f33",
+//       "$info": "#949ed4",
+//       "$positive": "#78c48a",
+//       "$negative": "#d67878",
+//       "$dark": "#afb6e0"
+//     }
+//   }
+
+export async function loadTheme({ commit }, theme) {
+  let colorvars = Object.keys(theme.colors);
+
+  commit("setIsDark", theme.isDark);
+  for (let i = 0; i < colorvars.length; i++) {
+    let cv = colorvars[i].replace("$", "");
+    colors.setBrand(cv, theme.colors[colorvars[i]]);
+  }
+}