Merge pull request #19 from mazeyqian/feature/2.1.0/fill_in_fri_mar_10th_2023

chengchuu · web-flow · commit 01f630d2e127 · 2023-03-31T00:10:02.000+08:00
feature/2.1.0/fill in
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ selenium-debug.log
 
 # Editor directories and files
 .idea
-.vscode
+# .vscode
 *.suo
 *.ntvs*
 *.njsproj
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "window.title": "Resume${separator}${dirty}${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}${appName}"
+}
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ## 预览
 
-![](./images/json-to-resume-print-w800.jpg)
+![](./images/json-to-resume-print-v1-w800.jpg)
 
 ## 使用指南
 
@@ -19,8 +19,8 @@ JSON 文件位于路径：`src/conf/resume.js`
 | personInfo.left | 个人信息 - 右边栏  |  院校、专业 |
 | companies | 工作经历 | - |
 | projects | 项目经验 | - |
-| skills | 技能 | - |
-| patents | 其他 | - |
+| skills | 技能 | 喂猫、遛狗、拍照、旅游、铲猫砂 |
+| others | 其他 | ⾃我总结、个人优势、职业资格 |
 
 ## 本地启动
 
diff --git a/images/json-to-resume-print-v1-w800.jpg b/images/json-to-resume-print-v1-w800.jpg
diff --git a/images/json-to-resume-print-w800.jpg b/images/json-to-resume-print-w800.jpg
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "mazey-resume",
-  "version": "2.0.0",
+  "name": "json-to-resume",
+  "version": "2.1.0",
   "description": "A tool to generate the resume.",
   "author": "Mazey <mazey@mazey.net>",
   "private": true,
@@ -27,7 +27,7 @@
     "bootstrap-vue": "^2.0.0-rc.11",
     "element-ui": "^2.0.11",
     "jquery": "^3.3.1",
-    "mazey-ui": "^1.0.2",
+    "mazey": "^3.5.4",
     "normalize.css": "^7.0.0",
     "vue": "^2.5.2",
     "vue-aplayer": "^1.0.1",
diff --git a/scripts/dev.sh b/scripts/dev.sh
@@ -0,0 +1,2 @@
+# Node Version
+nvm use 12.22.12
diff --git a/src/assets/img/cat-pad.png b/src/assets/img/cat-pad.png
diff --git a/src/assets/img/red-cat-pad.png b/src/assets/img/red-cat-pad.png
diff --git a/src/components/m-resume-experience.vue b/src/components/m-resume-experience.vue
@@ -10,34 +10,40 @@
       <div class="resume-experience-content">
         <div class="content-title">
           <div class="company project">
-          <span class="company-name project-name">
-            <span v-if="project.iconName" :class="`company-logo-${project.iconName}`">
-              <i class="icon-company"></i>
+            <span class="company-name project-name">
+              <span v-if="project.iconName" :class="`company-logo-${project.iconName}`">
+                <i class="icon-company"></i>
+              </span>
+              <div v-if="project.iconLink" :class="`project-logo`">
+                <i class="icon" :style="{ backgroundImage: `url(${project.iconLink})` }"></i>
+              </div>
+              <span>{{ project.name }}</span>
+              <span class="project-badges">
+                <b-badge v-for="(tag, index) in project.tags"
+                  :key="`project-badges-${index}`"
+                  :pill="true"
+                  class="project-badge"
+                  :class="tag.bgc"
+                >
+                  {{ tag.name }}
+                </b-badge>
+              </span>
             </span>
-            <div v-if="project.iconLink" :class="`project-logo`">
-              <i class="icon" :style="{ backgroundImage: `url(${project.iconLink})` }"></i>
-            </div>
-            <span>{{ project.name }}</span>
-            <span class="project-badges">
-              <b-badge v-for="(tag, index) in project.tags"
-                :key="`project-badges-${index}`"
-                :pill="true"
-                class="project-badge"
-                :class="tag.bgc"
-              >
-                {{ tag.name }}
-              </b-badge>
+            <span>
+              <span>{{ project.timeRangeStart }}</span>
+              &nbsp;
+              <span v-if="project.timeRangeStart && project.timeRangeEnd">-</span>
+              &nbsp;
+              <span>{{ project.timeRangeEnd }}</span>
             </span>
-          </span>
-            <span>{{ project.timeRangeStart }} - {{ project.timeRangeEnd }}</span>
           </div>
           <div class="department">
             <span>{{ project.department }}</span>
             <span>{{ project.position }}</span>
           </div>
         </div>
         <div class="content-description">
-          <span>{{ project.description }}</span>
+          <span v-html="project.description"></span>
         </div>
         <div class="project-detail" v-for="(detail, index) in project.details" :key="`project-detail-${index}`">
           <div class="detail-name">{{ detail.name }}：</div>
diff --git a/src/components/m-resume.vue b/src/components/m-resume.vue
@@ -46,12 +46,17 @@
         </div>
       </div>
       <!--其他-->
-      <div class="resume-item" :class="{ 'hide': resume.patents.length === 0 }">
+      <div class="resume-item" :class="{ 'hide': resume.others.length === 0 }">
         <h3>其他</h3>
         <div class="patent">
-          <div class="patent-item" v-for="( patent, index ) in resume.patents" :key="`patent-item-${index}`">
+          <div class="patent-item" v-for="( patent, index ) in resume.others" :key="`patent-item-${index}`">
             <span :class="`icon-${patent.iconName}`" alt="Patent ICON"></span>
-            <span>{{ patent.name }}[<a :href="patent.link" target="_blank" rel="noopener">{{ patent.publishNumber }}</a>]</span>
+            <span>
+              {{ patent.name }}
+              <span v-if="patent.linkContent">
+                [<a :href="patent.link" target="_blank" rel="noopener">{{ patent.linkContent }}</a>]
+              </span>
+            </span>
           </div>
         </div>
       </div>
@@ -68,8 +73,9 @@
 </template>
 
 <script>
-  import resume from '../conf/resume.js'
+  import resume from '../conf/resume'
   import MResumeExperience from './m-resume-experience.vue'
+  // import { addStyle } from 'mazey'
   export default {
     name: 'm-resume',
     components: {
@@ -82,6 +88,9 @@
     },
     created () {
       document.title = this.resume.pageAndFileName // `${this.name}-${this.position}-${this.experience.replace(/\s/gmi, '')}`
+    },
+    mounted () {
+      // addStyle('@media screen { .m-layout { background-color: #f2f2f2; } }', { id: 'resume-fill-in' })
     }
   }
 </script>
diff --git a/src/conf/resume.js b/src/conf/resume.js
@@ -149,7 +149,7 @@ export default {
   individualProjects: [/* Disable */],
   _individualProjects: [
     {
-      name: '小栗读书会',
+      name: '小猫读书会',
       iconName: 'nut-read',
       timeRangeStart: '',
       timeRangeEnd: '',
@@ -170,7 +170,7 @@ export default {
       details: [
         {
           name: '项目描述',
-          value: `提供一个读书分享的平台，访问地址：<a href="https://mazey.cn/t/fc" target="_blank" rel="noopener">mazey.cn/t/fc</a>。`
+          value: `提供一个读书分享的平台`
         }
       ],
     },
@@ -210,19 +210,23 @@ export default {
       level: 70
     },
   ],
-  _patents: [/* Disable */],
-  patents: [
+  _others: [/* Disable */],
+  others: [
     {
       name: '专利：贵族猫粮•贵芬溶菌酶无谷猫粮',
       iconName: 'gray-cat',
-      publishNumber: 'B0F2000000002103AD1C',
+      linkContent: 'B0F2000000002103AD1C',
       link: 'https://example.com',
     },
     {
       name: '展览：文明在这里丨USHOWART《猫》公益艺术展让爱持续发电',
       iconName: 'line-cat',
-      publishNumber: '长宁天山',
+      linkContent: '长宁天山',
       link: 'https://example.com',
     },
+    {
+      name: '⾃我总结：⾃学能⼒强，有较好的探索、研究精神，较好的信息检索和动⼿解决问题的能⼒',
+      iconName: 'red-cat-pad',
+    },
   ],
 }
diff --git a/src/router/index.js b/src/router/index.js
@@ -17,7 +17,7 @@ export default new Router({
     },
     {
       path: '/',
-      redirect: {name: 'home'}
+      redirect: {name: 'resume'}
     }
   ]
 })
diff --git a/src/style/__m-layout.scss b/src/style/__m-layout.scss
@@ -0,0 +1,4 @@
+.m-layout {
+  min-height: 100vh;
+  // background-color: #f2f2f2;
+}
diff --git a/src/style/__m-resume.scss b/src/style/__m-resume.scss

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "window.title": "Resume${separator}${dirty}${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}${appName}"`
	`3`	`+}`