new page

Docademic · Feb 14, 2018 · 5bc62c4 · 5bc62c4
2 parents 9856715 + 712729b
commit 5bc62c4
Show file tree

Hide file tree

Showing 120 changed files with 86 additions and 48 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/css/bootstrap.min.css b/assets/css/bootstrap.min.css
diff --git a/assets/css/mtc.css b/assets/css/mtc.css
diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/fav/android-icon-144x144.png b/assets/fav/android-icon-144x144.png
diff --git a/assets/fav/android-icon-192x192.png b/assets/fav/android-icon-192x192.png
diff --git a/assets/fav/android-icon-36x36.png b/assets/fav/android-icon-36x36.png
diff --git a/assets/fav/android-icon-48x48.png b/assets/fav/android-icon-48x48.png
diff --git a/assets/fav/android-icon-72x72.png b/assets/fav/android-icon-72x72.png
diff --git a/assets/fav/android-icon-96x96.png b/assets/fav/android-icon-96x96.png
diff --git a/assets/fav/apple-icon-114x114.png b/assets/fav/apple-icon-114x114.png
diff --git a/assets/fav/apple-icon-120x120.png b/assets/fav/apple-icon-120x120.png
diff --git a/assets/fav/apple-icon-144x144.png b/assets/fav/apple-icon-144x144.png
diff --git a/assets/fav/apple-icon-152x152.png b/assets/fav/apple-icon-152x152.png
diff --git a/assets/fav/apple-icon-180x180.png b/assets/fav/apple-icon-180x180.png
diff --git a/assets/fav/apple-icon-57x57.png b/assets/fav/apple-icon-57x57.png
diff --git a/assets/fav/apple-icon-60x60.png b/assets/fav/apple-icon-60x60.png
diff --git a/assets/fav/apple-icon-72x72.png b/assets/fav/apple-icon-72x72.png
diff --git a/assets/fav/apple-icon-76x76.png b/assets/fav/apple-icon-76x76.png
diff --git a/assets/fav/apple-icon-precomposed.png b/assets/fav/apple-icon-precomposed.png
diff --git a/assets/fav/apple-icon.png b/assets/fav/apple-icon.png
diff --git a/assets/fav/favicon-16x16.png b/assets/fav/favicon-16x16.png
diff --git a/assets/fav/favicon-32x32.png b/assets/fav/favicon-32x32.png
diff --git a/assets/fav/favicon-96x96.png b/assets/fav/favicon-96x96.png
diff --git a/assets/fav/favicon.ico b/assets/fav/favicon.ico
diff --git a/assets/fav/ms-icon-144x144.png b/assets/fav/ms-icon-144x144.png
diff --git a/assets/fav/ms-icon-150x150.png b/assets/fav/ms-icon-150x150.png
diff --git a/assets/fav/ms-icon-310x310.png b/assets/fav/ms-icon-310x310.png
diff --git a/assets/fav/ms-icon-70x70.png b/assets/fav/ms-icon-70x70.png
diff --git a/assets/img/advisors/james.png b/assets/img/advisors/james.png
diff --git a/assets/img/advisors/john.png b/assets/img/advisors/john.png
diff --git a/assets/img/advisors/oswaldo.png b/assets/img/advisors/oswaldo.png
diff --git a/assets/img/advisors/renato.png b/assets/img/advisors/renato.png
diff --git a/assets/img/advisors/ulloa.png b/assets/img/advisors/ulloa.png
diff --git a/assets/img/bg-home.png b/assets/img/bg-home.png
diff --git a/assets/img/change.png b/assets/img/change.png
diff --git a/assets/img/chart-1.png b/assets/img/chart-1.png
diff --git a/assets/img/chart-2.png b/assets/img/chart-2.png
diff --git a/assets/img/consulta.png b/assets/img/consulta.png
diff --git a/assets/img/cryptodaily.png b/assets/img/cryptodaily.png
diff --git a/assets/img/desktop.png b/assets/img/desktop.png
diff --git a/assets/img/fondo-d.png b/assets/img/fondo-d.png
diff --git a/assets/img/fondo-p.png b/assets/img/fondo-p.png
diff --git a/assets/img/home-line.svg b/assets/img/home-line.svg
diff --git a/assets/img/icobench.png b/assets/img/icobench.png
diff --git a/assets/img/icoholder.png b/assets/img/icoholder.png
diff --git a/assets/img/isometric.png b/assets/img/isometric.png
diff --git a/assets/img/key-1.png b/assets/img/key-1.png
diff --git a/assets/img/key-2.png b/assets/img/key-2.png
diff --git a/assets/img/key-3.png b/assets/img/key-3.png
diff --git a/assets/img/key-4.png b/assets/img/key-4.png
diff --git a/assets/img/key-5.png b/assets/img/key-5.png
diff --git a/assets/img/key-6.png b/assets/img/key-6.png
diff --git a/assets/img/logo-bar.png b/assets/img/logo-bar.png
diff --git a/assets/img/logo-etherscan.png b/assets/img/logo-etherscan.png
diff --git a/assets/img/logo-modal.png b/assets/img/logo-modal.png
diff --git a/assets/img/logo.png b/assets/img/logo.png
diff --git a/assets/img/mtc_w.png b/assets/img/mtc_w.png
diff --git a/assets/img/partners/foley.png b/assets/img/partners/foley.png
diff --git a/assets/img/partners/hogan.png b/assets/img/partners/hogan.png
diff --git a/assets/img/partners/iqvia.png b/assets/img/partners/iqvia.png
diff --git a/assets/img/partners/startup.png b/assets/img/partners/startup.png
diff --git a/assets/img/review-1.png b/assets/img/review-1.png
diff --git a/assets/img/review-2.png b/assets/img/review-2.png
diff --git a/assets/img/table.png b/assets/img/table.png
diff --git a/assets/img/team/chepo.png b/assets/img/team/chepo.png
diff --git a/assets/img/telegram.png b/assets/img/telegram.png
diff --git a/assets/img/texture.png b/assets/img/texture.png
diff --git a/assets/img/triangule.png b/assets/img/triangule.png
diff --git a/assets/js/app.js b/assets/js/app.js
diff --git a/assets/js/buy.js b/assets/js/buy.js
@@ -442,12 +442,26 @@ setBuyButtonText = (value) => {
 };
 
 var progress = $('.progress-bar');
+var targetCap = $('#target-cap');
 
 let getBalance = (web)=>{
 	web.eth.getBalance(crowdSaleAddress, (e, re) => {
 		let eth = web.fromWei(re, 'ether');
-		let percent = Math.floor(eth.c[0] * 100 / 525);
-		progress.html(percent+'%').css('width', percent+'%').attr('aria-valuenow', percent);
+        let ethCount = eth.c[0];
+        let ethTarget = 525;
+        let targetText = '<strong>Soft cap:</strong> <span >525 ETH</span>';
+        function percentHtml(){
+            let percent = Math.floor(ethCount * 100 / ethTarget);
+            progress.html(percent+'%').css('width', percent+'%').attr('aria-valuenow', percent);
+            targetCap.html(targetText);
+        }
+        if(ethCount < ethTarget){
+            percentHtml();
+        } else{
+            ethTarget = 2100;
+            targetText = '<strong>Hard cap:</strong> <span >2100 ETH</span>';
+            percentHtml();
+        }
 		setEthText(web.fromWei(re, 'ether').toString(10));
 		//setMTCText(sold.toString(10));
 		//console.log(web.fromWei(re, 'ether').toString(10) + " eth");
@@ -525,7 +539,7 @@ initBuy = (web3, amount) => {
 };
 
 validateEmail = (email) => {
-    let re = /^(([^<>()s[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
     return re.test(email.toLowerCase());
 };
 

diff --git a/assets/js/moment-s.min.js b/assets/js/moment-s.min.js
diff --git a/assets/js/moment-timezone-with-data.js b/assets/js/moment-timezone-with-data.js
diff --git a/assets/js/mtc.js b/assets/js/mtc.js
diff --git a/assets/js/shape.js b/assets/js/shape.js
diff --git a/bounty.html b/bounty.html
diff --git a/browserconfig.xml b/browserconfig.xml
diff --git a/buy.html b/buy.html
@@ -400,9 +400,8 @@ <h5 class="mb-0">
                 </div>
             </div>
             <div class="col-md-3 hidden-md-down d-flex align-items-center">
-                <p class="text-right mr-2">
+                <p class="text-right mr-2" id="target-cap">
                     <!--<strong>MTC sold:</strong> <span id="mtc-text">-</span>-->
-                    <strong>Soft cap:</strong> <span >525 ETH</span>
                 </p>
             </div>
         </div>

diff --git a/config.json b/config.json
diff --git a/config.json.example b/config.json.example
diff --git a/confirm/index.html b/confirm/index.html
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/index.html b/index.html
@@ -1154,26 +1154,26 @@ <h2 class="mt-3">
 <section id="advisors" class="bluegray py-md-5 py-3">
 	<div class="container">
 		<h3 class="text-center">Advisors</h3>
-		<div class="row">
+		<div class="row justify-content-center">
 			<div class="col-md-4">
 				<div class="card xl advisor text-center">
 					<div class="card-container">
-						<a href="//linkedin.com/in/yves-savoir-66509998/" target="_blank">
+						<a href="https://twitter.com/officialmcafee" target="_blank">
 						<div class="img-container mx-auto">
-							<img src="assets/img/advisors/yves.png" alt="Yves">
+							<img src="assets/img/advisors/john.png" alt="John">
 						</div>
 						<h3 class="t-blue mt-2">
-							Yves Savoir
+							John McAfee
 						</h3>
-						<p>
-							Pharmaceutical Executive<br/>
-							Industry Expert
-						</p>
 						<p class="description">
-							Yves has broad experience as the leader of one of LatAm's most successful Pharmaceutical companies. Leading the expansion of Carnot Labs to several countries. Yves has been an incredibly important part of Docademic from its beginnings and his guidance and support is reflected today in the success of Docademic's Service that has helped thousands of people spanning multiple countries.
+							A legendary man, John McAfee is a pioneer of the computer industry. He created McAfee antivirus known throughout the world. As his life progressed Mr McAfee explored several paths in life. A polymath, he was a yoga guru, investor in biotech, and now a cryptocurrency expert. The impact of Docademic's Free healthcare model will transform generations to come and will be an icon of his enduring legacy. We are proud to have Mr McAfee with us.
 						</p>
-						<p class="linkedin">
-							Linkedin
+						<p>
+							World Renowned Crypto expert<br/>
+							Legendary Entrepreneur
+						</p>
+						<p class="mt-2 t-lblue">
+							Twitter
 						</p>
 						</a>
 					</div>
@@ -1203,22 +1203,24 @@ <h3 class="t-blue mt-2">
 					</div>
 				</div>
 			</div>
+		</div>
+		<div class="row">
 			<div class="col-md-4">
 				<div class="card xl advisor text-center">
 					<div class="card-container">
-						<a href="//linkedin.com/in/sergio-del-valle-aa8a8613/" target="_blank">
+						<a href="//linkedin.com/in/yves-savoir-66509998/" target="_blank">
 						<div class="img-container mx-auto">
-							<img src="assets/img/advisors/sergio.png" alt="Sergio">
+							<img src="assets/img/advisors/yves.png" alt="Yves">
 						</div>
 						<h3 class="t-blue mt-2">
-							Sergio del Valle
+							Yves Savoir
 						</h3>
 						<p>
-							Private Equity Investment Expert<br/>
-							WAMEX Private Equity - Partner
+							Pharmaceutical Executive<br/>
+							Industry Expert
 						</p>
 						<p class="description">
-							Sergio has an excellent track record of succesful investments in companies with billions of dollars in revenue. As Managing Partner of Wamex Private Equity he has helped shape and grow several companies like hotel chain City Express to pharmaceutical companies like Medix. Sergio's insight and advise to Docademic helped shape Docademic's corporate structure and expansion strategy.
+							Yves has broad experience as the leader of one of LatAm's most successful Pharmaceutical companies. Leading the expansion of Carnot Labs to several countries. Yves has been an incredibly important part of Docademic from its beginnings and his guidance and support is reflected today in the success of Docademic's Service that has helped thousands of people spanning multiple countries.
 						</p>
 						<p class="linkedin">
 							Linkedin
@@ -1227,24 +1229,23 @@ <h3 class="t-blue mt-2">
 					</div>
 				</div>
 			</div>
-		</div>
-		<div class="row justify-content-center">
 			<div class="col-md-4">
 				<div class="card xl advisor text-center">
 					<div class="card-container">
-						<a href="//www.linkedin.com/in/oswaldotrava/" target="_blank">
+						<a href="//www.linkedin.com/in/james-sowers-925a1b17/" target="_blank">
 						<div class="img-container mx-auto">
-							<img src="assets/img/advisors/oswaldo.png" alt="Oswaldo">
+							<img src="assets/img/advisors/james.png" alt="James">
 						</div>
 						<h3 class="t-blue mt-2">
-							Oswaldo Trava
+							James Sowers
 						</h3>
-						<p>
-							Serial entrepreneur<br/>
-							Instafit - CEO
-						</p>
 						<p class="description">
-							Oswaldo is a Thought Leader in the Start-Up community in LatAm. He successfully founded and sold his first company and now co-founded and leads InstaFit, the most successful exercise app in LatAm. As an advisor, Oswaldo's experience in the Start-up world and his knowledge of the LatAm Market helped Docademic develop  its product strategy to reach product-market fit faster.
+							James is a world renowned crypto-capitalist and seasoned ICO advisor. He’s advised several successful ICOs and is the director of the GreaterGoodSociety. He’s invested in projects like Gnosis, Ripple and Qtum. James truly believes in the positive impact Docademic can have on the world through our services with the use of blockchain technology. “Free Telemedicine for anyone is in line with the spirit of blockchain, democratization for everyone”.
+						</p>
+						<p>
+							World Renowned<br/>
+							ICO and Blockchain expert
+
 						</p>
 						<p class="linkedin">
 							Linkedin
@@ -1278,23 +1279,48 @@ <h3 class="t-blue mt-2">
 					</div>
 				</div>
 			</div>
+		</div>
+		<div class="row justify-content-center">
 			<div class="col-md-4">
 				<div class="card xl advisor text-center">
 					<div class="card-container">
-						<a href="//www.linkedin.com/in/james-sowers-925a1b17/" target="_blank">
+						<a href="//linkedin.com/in/sergio-del-valle-aa8a8613/" target="_blank">
 						<div class="img-container mx-auto">
-							<img src="assets/img/advisors/james.png" alt="James">
+							<img src="assets/img/advisors/sergio.png" alt="Sergio">
 						</div>
 						<h3 class="t-blue mt-2">
-							James Sowers
+							Sergio del Valle
 						</h3>
+						<p>
+							Private Equity Investment Expert<br/>
+							WAMEX Private Equity - Partner
+						</p>
 						<p class="description">
-							James is a world renowned crypto-capitalist and seasoned ICO advisor. He’s advised several successful ICOs and is the director of the GreaterGoodSociety. He’s invested in projects like Gnosis, Ripple and Qtum. James truly believes in the positive impact Docademic can have on the world through our services with the use of blockchain technology. “Free Telemedicine for anyone is in line with the spirit of blockchain, democratization for everyone”.
+							Sergio has an excellent track record of succesful investments in companies with billions of dollars in revenue. As Managing Partner of Wamex Private Equity he has helped shape and grow several companies like hotel chain City Express to pharmaceutical companies like Medix. Sergio's insight and advise to Docademic helped shape Docademic's corporate structure and expansion strategy.
 						</p>
+						<p class="linkedin">
+							Linkedin
+						</p>
+						</a>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4">
+				<div class="card xl advisor text-center">
+					<div class="card-container">
+						<a href="//www.linkedin.com/in/oswaldotrava/" target="_blank">
+						<div class="img-container mx-auto">
+							<img src="assets/img/advisors/oswaldo.png" alt="Oswaldo">
+						</div>
+						<h3 class="t-blue mt-2">
+							Oswaldo Trava
+						</h3>
 						<p>
-							World Renowned<br/>
-							ICO and Blockchain expert
-
+							Serial entrepreneur<br/>
+							Instafit - CEO
+						</p>
+						<p class="description">
+							Oswaldo is a Thought Leader in the Start-Up community in LatAm. He successfully founded and sold his first company and now co-founded and leads InstaFit, the most successful exercise app in LatAm. As an advisor, Oswaldo's experience in the Start-up world and his knowledge of the LatAm Market helped Docademic develop  its product strategy to reach product-market fit faster.
 						</p>
 						<p class="linkedin">
 							Linkedin
@@ -1303,8 +1329,6 @@ <h3 class="t-blue mt-2">
 					</div>
 				</div>
 			</div>
-		</div>
-		<div class="row justify-content-center">
 			<div class="col-md-4">
 				<div class="card xl advisor text-center">
 					<div class="card-container">

diff --git a/manifest.json b/manifest.json
diff --git a/package.json b/package.json
@@ -14,26 +14,27 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/sidrese/ico_site#readme",
   "devDependencies": {
-    "browser-sync": "^2.18.13",
+    "browser-sync": "^2.23.6",
     "browserify": "^14.5.0",
     "del": "^3.0.0",
     "gulp": "^3.9.1",
     "gulp-browserify": "^0.5.1",
-    "gulp-clean-css": "^3.9.0",
+    "gulp-clean-css": "^3.9.2",
     "gulp-concat": "^2.6.1",
     "gulp-html-replace": "^1.6.2",
     "gulp-htmlmin": "^3.0.0",
     "gulp-rename": "^1.2.2",
-    "gulp-sourcemaps": "^2.6.1",
-    "gulp-uglifyes": "^0.1.2",
-    "pump": "^2.0.0",
-    "run-sequence": "^2.2.0"
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-uglifyes": "^0.1.3",
+    "pump": "^2.0.1",
+    "run-sequence": "^2.2.1",
+    "webpack-dev-server": "^1.9.0"
   },
   "dependencies": {
     "cross-fetch": "^1.1.1",
     "gulp-install": "^1.1.0",
     "gulp-minifier": "^0.2.2",
-    "query-string": "^5.0.1",
+    "query-string": "^5.1.0",
     "request": "^2.83.0",
     "web3": "0.14.0"
   }

diff --git a/register.html b/register.html
diff --git a/shapeshift.html b/shapeshift.html
diff --git a/shifty/bootstrap/css/bootstrap-theme.css b/shifty/bootstrap/css/bootstrap-theme.css
diff --git a/shifty/bootstrap/css/bootstrap-theme.css.map b/shifty/bootstrap/css/bootstrap-theme.css.map
diff --git a/shifty/bootstrap/css/bootstrap-theme.min.css b/shifty/bootstrap/css/bootstrap-theme.min.css
diff --git a/shifty/bootstrap/css/bootstrap.css b/shifty/bootstrap/css/bootstrap.css
diff --git a/shifty/bootstrap/css/bootstrap.css.map b/shifty/bootstrap/css/bootstrap.css.map
diff --git a/shifty/bootstrap/css/bootstrap.min.css b/shifty/bootstrap/css/bootstrap.min.css
diff --git a/shifty/bootstrap/fonts/glyphicons-halflings-regular.eot b/shifty/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/shifty/bootstrap/fonts/glyphicons-halflings-regular.svg b/shifty/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/shifty/bootstrap/fonts/glyphicons-halflings-regular.ttf b/shifty/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/shifty/bootstrap/fonts/glyphicons-halflings-regular.woff b/shifty/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/shifty/bootstrap/js/bootstrap.js b/shifty/bootstrap/js/bootstrap.js
diff --git a/shifty/bootstrap/js/bootstrap.min.js b/shifty/bootstrap/js/bootstrap.min.js
diff --git a/shifty/css/dd.css b/shifty/css/dd.css
diff --git a/shifty/css/payment.css b/shifty/css/payment.css
diff --git a/shifty/images/coins/bitcoin.png b/shifty/images/coins/bitcoin.png
diff --git a/shifty/images/coins/blackcoin.png b/shifty/images/coins/blackcoin.png
diff --git a/shifty/images/coins/darkcoin.png b/shifty/images/coins/darkcoin.png
diff --git a/shifty/images/coins/dogecoin.png b/shifty/images/coins/dogecoin.png
diff --git a/shifty/images/coins/feathercoin.png b/shifty/images/coins/feathercoin.png
diff --git a/shifty/images/coins/litecoin.png b/shifty/images/coins/litecoin.png
diff --git a/shifty/images/coins/namecoin.png b/shifty/images/coins/namecoin.png
diff --git a/shifty/images/coins/peercoin.png b/shifty/images/coins/peercoin.png
diff --git a/shifty/images/lens_icon.png b/shifty/images/lens_icon.png
diff --git a/shifty/images/pay_bg.png b/shifty/images/pay_bg.png
diff --git a/shifty/images/ss-btn.png b/shifty/images/ss-btn.png
diff --git a/shifty/index.html b/shifty/index.html
diff --git a/shifty/js/environ.js b/shifty/js/environ.js
diff --git a/shifty/js/jquery-1.7.2.min.js b/shifty/js/jquery-1.7.2.min.js
diff --git a/shifty/js/jquery.dd.min.js b/shifty/js/jquery.dd.min.js
diff --git a/shifty/js/jquery.easing.js b/shifty/js/jquery.easing.js
diff --git a/shifty/js/payment.js b/shifty/js/payment.js
diff --git a/shifty/js/qrcode.js b/shifty/js/qrcode.js
diff --git a/sitemap.xml b/sitemap.xml