开发中...

hewxwshining · Mar 17, 2017 · b71d938 · b71d938
1 parent 59dfb98
commit b71d938
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 93 deletions.
diff --git a/src/components/+rContact/cmpt.html b/src/components/+rContact/cmpt.html
@@ -1,5 +1,5 @@
-<div class="-page">
-    <div>
+<div class="-contact">
+    <div class="-content">
         <div id="contact_head">
             <div id="contact_head1">灵感 代码 梦想 未来</div>
             <div id="contact_head2">

diff --git a/src/components/+rDefault/cmpt.html b/src/components/+rDefault/cmpt.html
@@ -1,5 +1,5 @@
-<div class="-page -default">
-    <div>
+<div class="-default">
+    <div class="-content">
         <div>
             <div class="-photo"></div>
         </div>

diff --git a/src/components/+rDefault/cmpt.js b/src/components/+rDefault/cmpt.js
@@ -6,9 +6,9 @@ export default angular
 	})
 	.name;
 
-ResumeDefaultCtrl.$inject= ["$scope","$element","$window"];
+ResumeDefaultCtrl.$inject = ["resumeData"];
 
-function ResumeDefaultCtrl($scope,$element,$window) {
-
-
+function ResumeDefaultCtrl(resumeData) {
+	let vm = this;
+	resumeData.extend(vm, resumeData.data.default);
 }
diff --git a/src/components/+rDemo/cmpt.html b/src/components/+rDemo/cmpt.html
@@ -1,5 +1,5 @@
-<div class="-page -project">
-    <div>
+<div class="-project">
+    <div class="-content">
         <div>
             <ul class="-info-list">
                 <li class="-info-item">

diff --git a/src/components/+rExperience/cmpt.html b/src/components/+rExperience/cmpt.html
@@ -1,5 +1,5 @@
-<div class="-page -experience">
-    <div class="-contain">
+<div class="-experience">
+    <div class="-content -contain">
         <div class="-banner" touch-three-d >
             <div class="-experience-content">
                 <div class="-left">

diff --git a/src/components/+rExperience/cmpt.js b/src/components/+rExperience/cmpt.js
@@ -8,46 +8,6 @@ export default angular
 			pageIndex:"<"
 		}
 	})
-	.constant("expList",[
-		{
-			title:"壹零陆文化传播有限责任公司",
-			time:"2014年3月~2014年8月",
-			post:"职位：SEO",
-			imgUrl:"img/seo.png",
-			tech:"SEO,SEM,百度（360，搜狗）竞价，百度（360,搜狗）推广等",
-			contentList:[
-				"负责网站后台维护，微博、微信等新媒体创意撰写，营销和推广",
-				"负责百度PPC后台调整",
-				"获得最佳新人奖",
-				"同期工作之余开始系统性的自学web前端各项技术",
-			]
-		},
-		{
-			title:"卓煌企业管理有限公司",
-			time:"2014年8月~2015年6月",
-			post:"职位：网页开发兼SEO优化",
-			tech:"html5,css3,javascript,jquery,bootstrap,underscore等",
-			contentList:[
-				"负责企业站静态页开发",
-				"负责网站后台维护",
-				"负责百度竞价操作及seo优化",
-				"同期工作之余提升自己原生JS的编码能力",
-			]
-		},
-		{
-			title:"兰途网络科技有限公司",
-			time:"2015年6月~至今",
-			post:"职位：web前端研发工程师",
-			tech:"less gulp angular1.x cordova git 原生javascript及若干类库",
-			contentList:[
-				"负责快速构建高质量移动app页面",
-				"git版本控制，less预编译，gulp自动化构建，cordova打包",
-				"使用原生JS+angularJS进行前端开发",
-				"采用组件化,模块化，保证面向未来的单向数据流思想",
-				"同期开始学习ES6及当下热门的vue,react,ng2,并思索设计模式及函数式编程的思想"
-			]
-		}
-	])
 	.directive("touchThreeD",[
 		"$window",
 		function($window){
@@ -136,14 +96,14 @@ export default angular
 	])
 	.name;
 
-ResumeExperienceCtrl.$inject = ["expList"];
+ResumeExperienceCtrl.$inject = ["resumeData"];
 
-function ResumeExperienceCtrl(expList) {
+function ResumeExperienceCtrl(resumeData) {
 
 	var vm = this;
 
-	vm.cutList = new Array(3);
+	resumeData.extend(vm, resumeData.data.experience);
 
-	vm.exp = expList[0];
+	vm.exp = vm.expList[0];
 
 }
diff --git a/src/components/+rInfo/cmpt.html b/src/components/+rInfo/cmpt.html
@@ -1,5 +1,6 @@
-<div class="-page -info">
-    <div>
+<div class="-info">
+    <set-title title="$ctrl.title"></set-title>
+    <div class="-content">
         <div>
             <ul class="-info-list">
                 <li class="-info-item" ng-repeat="item in $ctrl.infoList track by $index">

diff --git a/src/components/+rInfo/cmpt.js b/src/components/+rInfo/cmpt.js
@@ -6,6 +6,9 @@ export default angular
 	})
 	.name;
 
-function ResumeInfoCtrl() {
-	console.log("footer");
+ResumeInfoCtrl.$inject = ["resumeData"];
+
+function ResumeInfoCtrl(resumeData) {
+	let vm = this;
+	resumeData.extend(vm, resumeData.data.info);
 }
diff --git a/src/components/+rSkill/cmpt.html b/src/components/+rSkill/cmpt.html
@@ -1,5 +1,5 @@
-<div class="-page -skill">
-    <div>
+<div class="-skill">
+    <div class="-content">
         <div class="-skill-circle">
             <div>
                 <ul class="-outCircle">

diff --git a/src/components/+rSkill/cmpt.js b/src/components/+rSkill/cmpt.js
@@ -7,6 +7,9 @@ export default angular
 	})
 	.name;
 
-function ResumeSkillCtrl() {
-	console.log("footer");
+ResumeSkillCtrl.$inject = ["resumeData"];
+
+function ResumeSkillCtrl(resumeData) {
+	let vm = this;
+	resumeData.extend(vm, resumeData.data.skill);
 }
diff --git a/src/components/rHeader/cmpt.html b/src/components/rHeader/cmpt.html
@@ -8,7 +8,7 @@
             {{$ctrl.titleList[$ctrl.pageIndex]}}
         </div>
         <div class="-language">
-            <span ng-repeat="item in $ctrl.langList">{{item}}</span>
+            <span ng-repeat="item in $ctrl.langList track by $index" ng-click="$ctrl.switchLang($index)">{{item}}</span>
         </div>
     </div>
     <div class="-header-nav" ng-class="{'-show-nav':$ctrl.isShowNav}" opacity-callback>

diff --git a/src/components/rHeader/cmpt.js b/src/components/rHeader/cmpt.js
@@ -49,16 +49,25 @@ export default angular
     ])
     .name;
 
-ResumeHeaderCtrl.$inject = ["resumeData","$scope"];
+ResumeHeaderCtrl.$inject = ["resumeData","$window"];
 
-function ResumeHeaderCtrl(resumeData) {
+function ResumeHeaderCtrl(resumeData,$window) {
 
     let vm = this;
 
     console.log(vm);
 
-    resumeData.extend(vm, resumeData.data.cn.header);
+    resumeData.extend(vm, resumeData.data.header);
 
     vm.pageIndex = 0;
+
+    vm.switchLang = switchLang;
+
+    function switchLang(index){
+
+        $window.localStorage.setItem("storageLang",index+1);
+
+        $window.location.reload();
+    }
 
 }
diff --git a/src/components/rMain/cmpt.js b/src/components/rMain/cmpt.js
@@ -279,5 +279,16 @@ export default angular
 			}
 		}
 	])
+	.directive("setTitle",[
+		function(){
+			return{
+				restrict:"E",
+				scope:{
+					title:"="
+				},
+				template:'<div><div class="-title">{{$scope.title}}</div></div>'
+			}
+		}
+	])
 
 	.name;
diff --git a/src/components/zkyResume/cmpt.js b/src/components/zkyResume/cmpt.js
@@ -9,52 +9,107 @@ export default angular
 		rMain
 	])
 	.service("resumeData",[
-		function(){
-            this.data = {
+		"$window",
+		function($window){
+
+			let data = {
 				cn:{
 					header:{
 						langList:["中","英"],
 						titleList:["首页","我的信息","我的技能","我的经历","我的作品","联系我"]
 					},
 					footer:{},
 					default:{
-                    	quote:"生活是一种绵延不绝的渴望，渴望不断上升，变得更伟大而高贵。",
+						quote:"生活是一种绵延不绝的渴望，渴望不断上升，变得更伟大而高贵。",
 						desList:[
 							"我叫赵柯宇",
 							"一名前端研发工程师",
 							"[email protected]"
 						]
 					},
 					info:{
+						title:"关于我",
 						infoList:[
-                            {icon:"1.png",key:"年龄",value:"26岁"},
+							{icon:"1.png",key:"年龄",value:"26岁"},
 							{icon:"2.png",key:"学历",value:"本科"},
 							{icon:"3.png",key:"坐标",value:"成都"},
 							{icon:"4.png",key:"状态",value:"在职"}
 						],
-                        desList:[
-                            "三年互联网经验,两年半全职前端开发经验",
-                            "项目常用原生JS开发,深谙组件化,模块化开发之道",
-                            "高效的自学能力,独立分析解决问题能力,代码强迫症患者"
-                        ]
+						desList:[
+							"三年互联网经验,两年半全职前端开发经验",
+							"常用原生JS开发,深谙组件化,模块化开发之道",
+							"高效的自学能力,独立分析解决问题能力,代码强迫症患者"
+						]
 					},
 					skill:{
-                        outCircleList:["git","webpack","gulp","less","cordova","angular","nodejs","react"],
+						title:"技能栈",
+						outCircleList:["git","webpack","gulp","less","cordova","angular","nodejs","react"],
 						innerCircleList:["es6","vue","ng2","fp"],
 						desList:[
-                            "三年互联网经验，两年半全职前端开发经验",
-                            "项目常用原生JS开发，深谙组件化，模块化开发之道",
-                            "高效的自学能力,独立分析解决问题能力，代码强迫症患者"
-                        ]
+							"熟练使用angularJs1.x及各种类库的指令封装",
+							"常驻PC/APP/微信三平台前端研发，自动化构建项目工程",
+							"编码常思其健壮性，扩展性，维护性"
+						]
+					},
+					demo:{
+						title:"项目集"
+					},
+					experience:{
+						title:"经历过",
+						expList:[
+							{
+								title:"壹零陆文化传播有限责任公司",
+								time:"2014年3月~2014年8月",
+								post:"职位：SEO",
+								imgUrl:"img/seo.png",
+								tech:"SEO,SEM,百度（360，搜狗）竞价，百度（360,搜狗）推广等",
+								contentList:[
+									"负责网站后台维护，微博、微信等新媒体创意撰写，营销和推广",
+									"负责百度PPC后台调整",
+									"获得最佳新人奖",
+									"同期工作之余开始系统性的自学web前端各项技术",
+								]
+							},
+							{
+								title:"卓煌企业管理有限公司",
+								time:"2014年8月~2015年6月",
+								post:"职位：网页开发兼SEO优化",
+								tech:"html5,css3,javascript,jquery,bootstrap,underscore等",
+								contentList:[
+									"负责企业站静态页开发",
+									"负责网站后台维护",
+									"负责百度竞价操作及seo优化",
+									"同期工作之余提升自己原生JS的编码能力",
+								]
+							},
+							{
+								title:"兰途网络科技有限公司",
+								time:"2015年6月~至今",
+								post:"职位：web前端研发工程师",
+								tech:"less gulp angular1.x cordova git 原生javascript及若干类库",
+								contentList:[
+									"负责快速构建高质量移动app页面",
+									"git版本控制，less预编译，gulp自动化构建，cordova打包",
+									"使用原生JS+angularJS进行前端开发",
+									"采用组件化,模块化，保证面向未来的单向数据流思想",
+									"同期开始学习ES6及当下热门的vue,react,ng2,并思索设计模式及函数式编程的思想"
+								]
+							}
+						]
 					},
-					demo:{},
-					experience:{},
-					contact:{}
+					contact:{
+						title:"联系我"
+					}
 				},
 				en:{
 
 				}
 			};
+
+			let storageLang = $window.localStorage.getItem("storageLang");
+
+			this.data = (storageLang && storageLang == "2") ? data.en : data.cn;
+
             this.extend = function(destination,source){
                 for (let prop in source) {
                     if (!source.hasOwnProperty(prop)) {
@@ -65,7 +120,6 @@ export default angular
 			}
 		}
 	])
-
 	.component("zkyResume", {
 		templateUrl : "components/zkyResume/cmpt.html",
 		controllerAs: "zr",

diff --git a/src/index.less b/src/index.less
@@ -7,11 +7,4 @@ ul,li{
 	list-style: none;
 	margin: 0;
 	padding: 0;
-}
-.-page{
-	position: absolute;
-	top:140px;
-	bottom: 0;
-	left: 0;
-	right: 0;
 }