update main page ui

beauty-enjoy · Mar 16, 2017 · 7ffa185 · 7ffa185
1 parent 386653c
commit 7ffa185
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 187 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 <div align="center">
-  <a href="https://github.com/beauty-enjoy/dbmeinv-firebase-ap">
+  <a href="https://beauty.now.sh ">
         <img width="200" heigth="200" src="https://olxvlcccu.qnssl.com/blog/1b1yv.png?imageslim">
   </a>
   <h1>Beauty</h1>
   <p>  
-      豆瓣美女 clone built with Vue 2.0 + vue-router + vuex + bulma + ssr <br/>    
+      豆瓣美女 clone , built with Vue 2.0 + vue-router + vuex + bulma + ssr <br/>    
       Enjoy it ! <br/>
       https://beauty.now.sh 
   <p>
@@ -35,6 +35,7 @@
 <h2 align="center">TODO </h2>
 
 - [x] upgrade to SSR
+- [ ] add cache for api
 - [ ] list all girls page
 - [ ] list all location page
 - [ ] add commit to posts
@@ -47,14 +48,9 @@
       <td align="center" valign="top">
         <img width="150" height="150" src="https://github.com/netpi.png?s=150">
         <br>
-        <a href="https://github.com/netpi">Netpi Chen</a>
-        <p>beauty spider</p>
-        <br>
+        <a href="https://github.com/netpi">Netpi Chen</a>        
         <p>Founder for this repo</p>
       </td>      
      </tr>
   </tbody>
 </table>
-
-
-
diff --git a/build/build.js b/build/build.js
diff --git a/build/check-versions.js b/build/check-versions.js
diff --git a/build/dev-client.js b/build/dev-client.js
diff --git a/build/dev-server.js b/build/dev-server.js
diff --git a/config/index.js b/config/index.js
@@ -7,7 +7,7 @@ module.exports = {
     index: path.resolve(__dirname, '../dist/index.html'),
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/dist',
+    assetsPublicPath: '/dist/',
     productionSourceMap: true,
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
@@ -26,7 +26,7 @@ module.exports = {
     port: 8080,
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/dist',
+    assetsPublicPath: '/dist/',
     proxyTable: {},
     // CSS Sourcemaps off by default because relative paths are "buggy"
     // with this option, according to the CSS-Loader README

diff --git a/index.html b/index.html
@@ -5,7 +5,6 @@
     <meta charset="utf-8">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
   </head>
   <body>            
     <!-- APP -->

diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "es6-promise": "^4.1.0",
     "express": "^4.14.0",
     "firebase": "^3.6.9",
+    "font-awesome": "^4.7.0",
     "js-base64": "^2.1.9",
     "koa": "next",
     "koa-connect-history-api-fallback": "https://github.com/davezuko/koa-connect-history-api-fallback",
@@ -30,7 +31,7 @@
     "serialize-javascript": "^1.3.0",
     "serve-favicon": "^2.3.2",
     "vue": "^2.1.0",
-    "vue-bulma-pagination": "^1.1.3",
+    "vue-bulma-pagination": "^1.1.4",
     "vue-router": "^2.1.0",
     "vue-server-renderer": "^2.1.10",
     "vue-spinner": "^1.0.2",

diff --git a/src/App.vue b/src/App.vue
@@ -85,6 +85,8 @@ export default {
 .animated {
   animation-duration: .377s;
 }
+$fa-font-path: '~font-awesome/fonts/';
+@import '~font-awesome/scss/font-awesome';
 @import "./scss/variable";
 @import "~bulma" ;
 @import "./scss/global" ;

diff --git a/src/components/CardList.vue b/src/components/CardList.vue
@@ -64,14 +64,19 @@ export default {
 @import '../scss/variable.scss';
 .wrap_card {
     padding-top: 1.2rem;
+    padding-bottom: 0.1em;
+    padding-right: 0.1em;
+    padding-left: 0.1em;
     overflow: hidden;
     width: 100%
 }
 .wrap_card_column {
     padding: 10px 10px 10px 10px;
+    
     .card {
         width:100%;
         height:100%;
+        
     }
 }
 </style>
diff --git a/src/components/ItemList.vue b/src/components/ItemList.vue
@@ -5,7 +5,7 @@
             <pagination modifiers='' :urlPrefix="'/'+cidtype" :currentPage=currentPage :lastPage='Math.ceil( keys.length / pageSize)'/>
         </div>
     </div>
-    <div class='wrap_items'> 
+    <div class='wrap_items wrap_posts' v-if="!loading"> 
       <CardList :items="items" :loading='loading' :enterActiveClass='enterActiveClass' /> 
     </div>        
   </div>  
@@ -89,7 +89,7 @@ export default {
 .wrap_items {
     margin: 50px 0;
     width: 100%;
-    border-radius: 2px;
+    border-radius: 2px;    
     // overflow: hidden;
 }
 .wrapper {

diff --git a/yarn.lock b/yarn.lock
@@ -2101,6 +2101,10 @@ follow-redirects@1.0.0:
   dependencies:
     debug "^2.2.0"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
 for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4863,9 +4867,9 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
-vue-bulma-pagination@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/vue-bulma-pagination/-/vue-bulma-pagination-1.1.3.tgz#fc54ced356c5a7943f6ddeae54af65fb23626687"
+vue-bulma-pagination@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/vue-bulma-pagination/-/vue-bulma-pagination-1.1.4.tgz#6ed685de031fd213a4b66a00daa0d49080c7c2e2"
 
 vue-hot-reload-api@^2.0.11:
   version "2.0.11"