账户中心登录

frontend/saas-portal-web/config/env.js

@@ -2,14 +2,16 @@ if (process.env.NODE_ENV == 'production') {
     window.env = {
         profile: 'production',
         server: {
-            baseUrl: 'http://192.168.0.181:8560'
+            baseUrl: 'http://192.168.0.181:8560',
+            ssoUrl: 'http://192.168.253.12:32323'
         }
     }
 } else {
     window.env = {
         profile: 'development',
         server: {
-            baseUrl: 'http://192.168.0.181:8560'
+            baseUrl: 'http://192.168.0.174:8560',
+            ssoUrl: 'http://192.168.253.12:32323'
         }
     }
 }

frontend/saas-portal-web/src/css/main.css

@@ -123,10 +123,8 @@ main > section {
     /* width: 100%;
     height: 100%; */
 }
-.box,.box-zc{
+.box{
     display:none;
-    width: 378px;
-    height: 382px; 
     position: fixed;
     background:white; 
     top: 55%;
@@ -135,9 +133,6 @@ main > section {
     margin-top: -225px;
     z-index: 10;
 }
-.box-zc {
-    height: 450px;
-}
 .tc-login {
     text-align: center;
     color: black;
@@ -269,19 +264,24 @@ main > section {
     border: #0080E6 1px solid;
 }
 /* 11/12注册页面 ..........................................*/
-.login {
-    margin-top: 12px;
+.login,.profile {
     color: white;
     font-size: 14px;
 }
-.login img {
+.login {
+    margin-top: 12px;
+}
+.login img,.profile img {
     width: 25px;
     height: 24px;
 }
-.login > span:hover{
+.login > span:hover, .profile > span:hover{
     cursor:pointer;
     color: #0aa6bd;
 }
+.profile .user-info {
+    margin: 0 18px;
+}
 .my-label {
     float: left;
     line-height: 40px;

frontend/saas-portal-web/src/index.html

@@ -35,8 +35,8 @@
 		<!-- bootstrap.min -->
         <link rel="stylesheet" href="css/animate.css">
 		<!-- Main Stylesheet -->
-        <link rel="stylesheet" href="css/main.css">
-
+		<link rel="stylesheet" href="css/main.css">
+		
 		<!-- Modernizer Script for old Browsers -->
         <script src="js/modernizr-2.6.2.min.js"></script>
 
@@ -90,6 +90,13 @@
 							<span class="btn1"><img src="./img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
 							<span class="register"><img src="./img/assets/zhuce3x.png" alt="">注册</span>
 						</li>
+						<li class="profile" style="display:none">
+							<span class="user-info">
+								<img src="./img/assets/denglu3x.png" alt="">
+								<span id="user-info"></span>
+							</span>|
+							<a href="#">账户管理</a>
+						</li>
                     </ul>
                 </nav>
 				<!-- /main nav -->
@@ -99,158 +106,11 @@
 		
 		<main class="site-content" role="main">
 			<!-- 遮罩 -->
-			<div class="zhezhao"></div> 
-		<!-- 登录嵌套 -->
-			<iframe id="box" class="qiantao" src="http://10.1.51.91:3001/sassLogin?appId=sp&returnURL=https://www.usoftchina.com"></iframe>
-		<!-- 注册嵌套 -->
-			<iframe id="box-zc" class="qiantao"src="http://10.1.51.91:3001/sassLogin/register?appId=sp&returnURL=https://www.usoftchina.com "></iframe>
-			<!-- 注册 -->
-			<div id="box-zc1" class="box-zc">
-				<div class="tc-login" id="zhuce">
-					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
-					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-lan3x.png" alt="">企云服</div> -->
-					<div class="tc-title"><hr class="tc-hrleft"/>注册<hr class="tc-hrright"/></div>
-					<form action="#" method="post">
-						<div class="tc-phone">
-							<div class="tc-phonebox">
-								<span><img src="./img/assets/phone.png"></span>
-								<input type="text" class="tc-phonecon" placeholder="请输入您的手机号" name="zc-phone" id="zc-phone">
-							</div>
-							<span class="tishi zc-phone"></span>
-						</div>
-						<div class="tc-over">
-							<div class="tc-phone left" style="margin: 0 0 16px 0;">
-								<div class="tc-phonebox">
-									<input type="text" class="tc-yanzhengma tc-shibiema" name="zc-tuxingma" id="zc-tuxingma">
-								</div>
-								<span class="tishi"><img src="./img/assets/tishi1x.png"/>验证错误</span>
-							</div>
-							<div class="left"><img class="tc-yanzhengimg" src="./img/assets/timg.jpg" alt=""></div>
-							<div class="right" style="line-height: 40px;"><img src="./img/assets/shuaxin.png" alt=""></div>
-						</div>
-						<div style="width: 100%;">
-							<div class="tc-phone left" style="margin: 0 0 16px 0;">
-								<div class="tc-phonebox">
-									<span><img src="./img/assets/yanzhengma.png"></span>
-									<input type="text" class="tc-yanzhengma" placeholder="请输入验证码" name="zc-yanzhengma" id="zc-yanzhengma">
-								</div>
-								<span class="tishi"><img src="./img/assets/tishi1x.png"/>验证错误</span>
-							</div>
-							<button class="tc-huoqu right">获取验证码</button>
-						</div>
-						
-						<div>
-							<button class="tc-login-pwd form-btn" id="login-pwd">注册</button>
-						</div>
-					</form>
-					<div>
-						<div class="xieyi">
-							<input class="checked" type="checkbox" checked name="xieyi"/> 
-							<span>
-								我已阅读并同意
-								<a href="https://sso.ubtob.com/common/agreement">《优软云服务条款》</a>
-							</span>
-						</div>
-						<span class="form-buttom">已有账号，去<a href="#" class="go-login">登录</a></span>
-					</div>
-				</div>
-			</div>
-			<!-- 登录窗 -->
-			<div id="box1" class="box">
-			<!-- 账号登录 -->
-				<div class="tc-login" id="zhanghao">
-					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
-					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-lan3x.png" alt="">企云服</div> -->
-					<div class="tc-title"><hr class="tc-hrleft"/>账号登录<hr class="tc-hrright"/></div>
-					<form action="#" method="post">
-						<div class="tc-phone">
-							<div class="tc-phonebox">
-								<span><img src="./img/assets/phone.png"></span>
-								<input type="text" class="tc-phonecon" placeholder="手机号/优软云账号" name="zh-phone" id="zh-phone">
-							</div>
-							<span class="tishi zh-phone"></span>
-						</div>
-						<div class="tc-phone">
-							<div class="tc-phonebox">
-								<span><img src="./img/assets/password.png"></span>
-								<input type="password" class="tc-phonepwd" placeholder="请输入您的密码" name="pwd" id="zh-pwd">
-							</div>
-							<span class="tishi"><img src="./img/assets/tishi1x.png"/>验证错误</span>
-						</div>
-						<div>
-							<button class="tc-login-pwd" id="zh-login">登录</button>
-						</div>
-					</form>
-					<div class="tc-over" id="qiehuan">
-						<span id="message" class="left tc-duanxin"><a href="#">短信登录</a></span>
-						<span class="right">
-							<a href="#" class="fr tc-color" id="register">注册 | </a>
-							<a href="#" class="fr tc-color" id="example">忘记密码？</a>
-						</span>
-					</div>
-					<!-- <div class="clearfix" style="margin-top: 47px;">
-						<div class="fl" style="color:#999999;font-size: 14px;text-align: center">
-							<span>-----------------第三方登录------------------</span>
-						</div>
-						<div class="aui-form-content-item1" id="weixin-login">
-							<a href="#">
-								<img src="./img/assets/weixin.png">
-								<p class="tc-weixin">微信登录</p>
-							</a>
-						</div>
-					</div> -->
-				</div>
-			<!-- 短信登录 -->
-				<div class="tc-login" id="duanxin" style="display:none">
-					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
-					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-lan3x.png" alt="">企云服</div> -->
-					<div class="tc-title"><hr class="tc-hrleft"/>短信登录<hr class="tc-hrright"/></div>
-					<form action="#" method="post">
-						<div class="tc-phone">
-							<div class="tc-phonebox">
-								<span><img src="./img/assets/phone.png"></span>
-								<input type="text" class="tc-phonecon" placeholder="请输入您的手机号" name="dx-phone" id="dx-phone">
-							</div>
-							<span class="tishi dx-phone"></span>
-						</div>
-						<div style="width: 100%;">
-							<div class="tc-phone left" style="margin: 0 0 16px 0;">
-								<div class="tc-phonebox">
-									<span><img src="./img/assets/yanzhengma.png"></span>
-									<input type="text" class="tc-yanzhengma" placeholder="请输入验证码" name="dx-yanzhengma" id="dx-yanzhengma">
-								</div>
-								<span class="tishi"><img src="./img/assets/tishi1x.png"/>验证错误</span>
-							</div>
-							<button class="tc-huoqu right">获取验证码</button>
-						</div>
-						<div>
-							<button class="tc-login-pwd" id="dx-login">登录</button>
-						</div>
-					</form>
-					<div class="tc-over" id="qiehuan">
-						<span id="user-phone" class="left tc-duanxin"><a href="#">密码登录</a></span>
-						<span class="right">
-							<a href="#" class="fr tc-color dx-zc">注册</a>
-						</span>
-					</div>
-					<!-- <div class="clearfix" style="margin-top: 47px;">
-						<div class="fl" style="color:#999999;font-size: 14px;text-align: center">
-							<span>-----------------第三方登录------------------</span>
-						</div>
-						<div class="aui-form-content-item1" id="weixin-login">
-							<a href="#">
-								<img src="./img/assets/weixin.png">
-								<p class="tc-weixin">微信登录</p>
-							</a>
-						</div>
-					</div> -->
-				</div>
+			<div class="zhezhao"></div>
+			<div id="box" class="box">
+				<iframe width="346" height="511"></iframe>
 			</div>
-<!--Home Slider==================================== -->
-
+			
 		<section id="home-slider">
             <div id="slider" class="sl-slider-wrapper">
 
@@ -626,8 +486,6 @@
         <script src="js/jquery.singlePageNav.min.js"></script>
 		<!-- jquery.fancybox.pack -->
         <script src="js/jquery.fancybox.pack.js"></script>
-		<!-- Google Map API -->
-		<!--<script src="http://maps.google.com/maps/api/js?sensor=false"></script>-->
 		<!-- Owl Carousel -->
         <script src="js/owl.carousel.min.js"></script>
         <!-- jquery easing -->
@@ -637,152 +495,13 @@
         <script src="js/jquery.slitslider.js"></script>
         <script src="js/jquery.ba-cond.min.js"></script>
 		<!-- onscroll animation -->
-        <script src="js/wow.min.js"></script>
+		<script src="js/wow.min.js"></script>
+		<!-- socket -->
+		<script src="js/sockjs.min.js"></script>
+		<script src="js/stomp.min.js"></script>
 		<!-- Custom Functions jq表单提交插件-->
         <!-- <script src="js/jquery.form.min.js"></script> -->
         <!-- <script src="js/jquery.validate.min.js"></script> -->
         <script src="js/main.js"></script>
-        <script>
-        	// $(function() {
-			// 	$.validator.addMethod("isMobile", function(value, element) {       
-			// 		var length = value.length;   
-			// 		var mobile = /^[1][3,4,5,7,8][0-9]{9}$/;   
-			// 		return this.optional(element) || (length == 11 && mobile.test(value));       
-			// 	}, "请正确填写您的手机号码");
-    		// 	$("#contact-form").validate({//自定义验证规则
-    		// 		rules: {
-    		// 			phone: {
-			// 				required: true,
-			// 				isMobile:true
-    		// 				// minlength: 8
-			// 			},
-			// 			// realName: "required",
-    		//             email: {
-    		//                 required: true,
-    		//                 email: true
-    		//             },
-    		// 			subject: {
-    		// 				required: true,
-    		//                 minlength: 2
-    		// 			},
-    		// 			message: {
-    		// 				required: true,
-    		//                 minlength: 2
-    		// 			}
-    		// 		},
-			// 		messages: {//提示文字
-			// 			phone: {
-			// 				required: "号码不能为空",
-			// 				// telephone: '请填写正确的手机号'
-			// 			},
-    		// 			// name: {
-    		// 			// 	required: "姓名不能为空",
-    		// 			// 	minlength: "至少输入8位字母和数字"
-    		// 			// },
-    		//             email: {
-			// 				required: "没有电子邮件",
-			// 				email: "请输入正确格式的电子邮件",
-    		//             },
-    		// 			subject: {
-    		// 				required: "你有理由联系，把它写在这里",
-    		//                 minlength: "这一切？真的？"
-    		// 			},
-    		// 			message: {
-    		// 				required: "嗯……嗯，你必须写一些东西寄这张表格。",
-    		// 				minlength: "这一切？真的？"
-    		// 			}
-    		// 		},
-    				// submitHandler: function(form) {
-    				// 	$(form).ajaxSubmit({//jq表单提交
-    				// 		type:"POST",
-    				// 		data: $(form).serialize(),//获取form中的所有数据
-    				// 		url:"mail.php",
-    				// 		success: function() {
-    				// 			$(".contact-form").fadeTo( "slow", 1, function() {
-    		        //                 $(".contact-form").resetForm();//清空form
-    				// 				$(".success").slideDown("slow");//滑动方式显示隐藏元素
-    				// 			});
-    				// 		},
-    				// 		error: function() {
-    				// 			$(".contact-form").fadeTo( "slow", 1, function() {
-    				// 				$(".error").slideDown("slow");
-    				// 			});
-    				// 		}
-    				// 	});
-    				// },
-    		//         errorPlacement: function(error, element) {
-    		//             element.after(error);
-    		//             error.hide().slideDown();
-    		//         }
-    		// 	});
-			// });
-			// 关闭弹窗X
-			$(".tc-on").click(function(){
-				$('#box-zc').css('display','none');
-				$('#box').css('display','none');
-				$(".zhezhao").css("display","none")
-			})
-			// 登录弹出
-            $(".btn1").click(function(){
-				if($('#box').css('display') =="none") {
-					$('#box').show();
-					$('#box-zc').css('display','none');
-					$(".zhezhao").css("display","block")
-				}else {
-					$('#box').hide();
-					$(".zhezhao").css("display","none")
-				}
-            });
-            /*点击短信登录*/
-            $("#message").click(function(){
-				$("#zhanghao").css("display","none")
-				$("#duanxin").css("display","block")
-			})
-			// 点击账号登录
-            $("#user-phone").click(function(){
-				$("#zhanghao").css("display","block")
-				$("#duanxin").css("display","none")
-
-            })
-
-			// 注册弹出
-			$('.register').click(function(){
-				if($('#box-zc').css('display') =="none") {
-					$('#box-zc').show();
-					$('#box').css('display','none');
-					$(".zhezhao").css("display","block")
-				}else {
-					$('#box-zc').hide();
-					$(".zhezhao").css("display","none")
-				}
-			})
-			$('#register').click(function(){
-				$("#box").css('display','none');
-				$('#box-zc').css('display','block');
-			})
-			$('.dx-zc').click(function(){
-				$("#box").css('display','none');
-				$('#box-zc').css('display','block');
-			})
-			// 返回登录
-			$("#go-login").click(function(){
-				$("#box").css('display','block');
-				$('#box-zc').css('display','none');
-			})
-			$(".go-login").click(function(){
-				$("#box").css('display','block');
-				$('#box-zc').css('display','none');
-			})
-
-		// ----------------
-			$("#callback").click(function(){
-                $("#bbb").css("display","none");
-                $("#aaa").css("display","block");
-            })
-            $("#weixin-login").click(function(){
-                $("#bbb").css("display","block");
-                $("#aaa").css("display","none");
-            })
-        </script>
     </body>
 </html>

frontend/saas-portal-web/src/js/main.js

@@ -7,97 +7,6 @@ jQuery(window).load(function(){
     $("#preloader").fadeOut("slow");
     
     // ........................
-    // 手机验证
-    isPhone = function (phone) {
-        var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
-        if (!myreg.test(phone)) {
-            return false;
-        } else {
-            return true;
-        }
-    };
-    // 密码验证
-    isMima = function(mima){
-        let mimareg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/;
-        if (!mimareg.test(mima)) {
-            return false;
-        } else {
-            return true;
-        }
-    };
-    // $('#pwd').change(function(){
-    //     if (isMima($(this).val())) {
-    //         return
-    //     } else {
-    //         alert("密码格式不对")
-    //     }
-    // })
-    // 注册手机号验证
-    $("#zc-phone").bind('input propertychange',function(){
-        if (isPhone($(this).val())) {
-            $(".zc-phone").html("");
-            $(this).parent().parent().css('border','1px #D8DCE8 solid');
-            $(this).css('outline','');
-        } else {
-            $(".zc-phone").html("<img src='./img/assets/tishi1x.png'/>请输入正确的手机号码");
-            $(this).parent().parent().css('border','1px red solid');
-            $(this).css('outline','none');
-        }
-    })
-    // 账号手机号验证
-    $("#zh-phone").bind('input propertychange',function(){
-        if (isPhone($(this).val())) {
-            $(".zh-phone").html("");
-            $(this).parent().parent().css('border','1px #D8DCE8 solid');
-            $(this).css('outline','');
-        } else {
-            $(".zh-phone").html("<img src='./img/assets/tishi1x.png'/>请输入正确的手机号码");
-            $(this).parent().parent().css('border','1px red solid');
-            $(this).css('outline','none');
-        }
-    })
-    // 短信手机号验证
-    $("#dx-phone").bind('input propertychange',function(){
-        if (isPhone($(this).val())) {
-            $(".dx-phone").html("");
-            $(this).parent().parent().css('border','1px #D8DCE8 solid');
-            $(this).css('outline','');
-        } else {
-            $(".dx-phone").html("<img src='./img/assets/tishi1x.png'/>请输入正确的手机号码");
-            $(this).parent().parent().css('border','1px red solid');
-            $(this).css('outline','none');
-        }
-    })
-    // 账号登录
-    // $("#zh-login").click(function(){
-    //     let name = $("#zh-phone").val();
-    //     let pwd = $("#zh-pwd").val();
-    //     console.log('姓名是'+name+'密码是'+pwd)
-    // })
-    // // 短信登录
-    // $("#dx-login").click(function(){
-    //     let name = $("#dx-phone").val();
-    //     let pwd = $("#dx-yanzhengma").val();
-    //     console.log('姓名是'+name+'密码是'+pwd)
-    // })
-    // // 注册点击
-    // $("#zc-login").click(function(){
-    //     let name = $("#zc-phone").val();
-    //     let tuxingma = $("#zc-tuxingma").val();
-    //     let yanzheng  = $("#zc-yanzhengma").val();
-    //     console.log('姓名是'+name+'图形码是'+tuxingma+'验证码是'+yanzheng)
-    // })
-
-    // 注册协议按钮同意可以点击注册
-    $(".checked").click(function(){
-        if ($(".checked").get(0).checked) {
-            $(".form-btn").attr('disabled',false);
-            $(".form-btn").removeClass("back");
-        } else {
-            $(".form-btn").attr('disabled',true);
-            $(".form-btn").addClass("back");
-        }
-    })
     
     // 帮助中心
     $(".bz-right-conent>div").eq(0).show()
@@ -181,10 +90,80 @@ $(function() {
 
 });
 
-
-
 $(document).ready(function(){
-
+    var Store = (function(){
+        var storeKey = 'app-state', store = window.localStorage;
+        return {
+            get: function(key, defaultValue) {
+                var value = store.getItem(storeKey + '-' + key);
+                return value === undefined? defaultValue : JSON.parse(value);
+            },
+            set: function(key, value) {
+                store.setItem(storeKey + '-' + key, JSON.stringify(value));
+            }
+        };
+    })();
+    var setUserProfile = function(account) {
+        if (account) {
+            $(".login").css("display","none");
+            // 显示用户信息
+            $("#user-info").text(account.realname || account.username);
+            $(".profile").css("display","block")
+        } else {
+            $(".login").css("display","block");
+            $(".profile").css("display","none")
+        }
+    };
+    // 已经登录过从Store取出信息
+    setUserProfile(Store.get('account'));
+    // socket
+    var listenOnCallback = function(clientId, resolve) {
+        var socket = new SockJS(env.server.baseUrl + "/ws");
+        stompClient = Stomp.over(socket);
+        stompClient.connect({}, function(frame) {
+            stompClient.subscribe('/clients/' + clientId + '/sso/callback', function(message){
+                resolve(JSON.parse(message.body));
+            });
+        });
+    };
+    // 关闭弹窗X
+    $(".tc-on").click(function(){
+        $('#box-zc').css('display','none');
+        $('#box').css('display','none');
+        $(".zhezhao").css("display","none")
+    })
+    // 登录弹出
+    $(".btn1").click(function(){
+        if ($('#box').css('display') =="none") {
+            // 随机生成clientId
+            var clientId = Math.random().toString(36).substr(2);
+            $(".zhezhao").css("display","block");
+            $('#box iframe').attr('src', env.server.ssoUrl + '/sassLogin?appId=sp&baseUrl=' + 
+                encodeURIComponent(env.server.baseUrl + '/api/auth/sso/callback/' + clientId));
+            $('#box').show();
+            listenOnCallback(clientId, function(data){
+                var account = data.account;
+                Store.set('account', account);
+                setUserProfile(account);
+                $('#box').hide();
+                $(".zhezhao").css("display","none");
+            });
+        } else {
+            $('#box').hide();
+            $(".zhezhao").css("display","none")
+        }
+    });
+    // 注册弹出
+    $('.register').click(function(){
+        if ($('#box').css('display') =="none") {
+            $(".zhezhao").css("display","block");
+            $('#box iframe').attr('src', env.server.ssoUrl + '/sassLogin/register?appId=sp');
+            $('#box').show();
+        } else {
+            $('#box').hide();
+            $(".zhezhao").css("display","none")
+        }
+    });
     /* ========================================================================= */
     /*  Portfolio
     /* ========================================================================= */
@@ -302,97 +281,6 @@ $(document).ready(function(){
 	
 });
 
-
-/* ==========  START GOOGLE MAP ========== */
-
-/**
-// When the window has finished loading create our google map below
- google.maps.event.addDomListener(window, 'load', init);
-
-function init() {
-    // Basic options for a simple Google Map
-    // For more options see: https://developers.google.com/maps/documentation/javascript/reference#MapOptions
-
-	    var myLatLng = new google.maps.LatLng(22.402789, 91.822156);
-
-	    var mapOptions = {
-	        zoom: 15,
-	        center: myLatLng,
-	        disableDefaultUI: true,
-	        scrollwheel: false,
-	        navigationControl: true,
-	        mapTypeControl: false,
-	        scaleControl: false,
-	        draggable: true,
-
-        // How you would like to style the map. 
-        // This is where you would paste any style found on Snazzy Maps.
-        styles: [{
-            featureType: 'water',
-            stylers: [{
-                color: '#46bcec'
-            }, {
-                visibility: 'on'
-            }]
-        }, {
-            featureType: 'landscape',
-            stylers: [{
-                color: '#f2f2f2'
-            }]
-        }, {
-            featureType: 'road',
-            stylers: [{
-                saturation: -100
-            }, {
-                lightness: 45
-            }]
-        }, {
-            featureType: 'road.highway',
-            stylers: [{
-                visibility: 'simplified'
-            }]
-        }, {
-            featureType: 'road.arterial',
-            elementType: 'labels.icon',
-            stylers: [{
-                visibility: 'off'
-            }]
-        }, {
-            featureType: 'administrative',
-            elementType: 'labels.text.fill',
-            stylers: [{
-                color: '#444444'
-            }]
-        }, {
-            featureType: 'transit',
-            stylers: [{
-                visibility: 'off'
-            }]
-        }, {
-            featureType: 'poi',
-            stylers: [{
-                visibility: 'off'
-            }]
-        }]
-    };
-
-    // Get the HTML DOM element that will contain your map 
-    // We are using a div with id="map" seen below in the <body>
-    var mapElement = document.getElementById('map-canvas');
-
-    // Create the Google Map using our element and options defined above
-    var map = new google.maps.Map(mapElement, mapOptions);
-
-    // Let's also add a marker while we're at it
-    var marker = new google.maps.Marker({
-        position: new google.maps.LatLng(22.402789, 91.822156),
-        map: map,
-		icon: 'img/icons/map-marker.png',
-    });
-}
-**/
-// ========== END GOOGLE MAP ========== //
-
 var wow = new WOW ({
 	offset:       75,          // distance to the element when triggering the animation (default is 0)
 	mobile:       false,       // trigger animations on mobile devices (default is true)