Don't track compiled files

lepture · Nov 13, 2014 · c08825a · c08825a
1 parent 71b6627
commit c08825a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+widget.js
+_site
+cards
diff --git a/Makefile b/Makefile
@@ -1,14 +1,9 @@
-theme = default
+theme = medium
 
-card:
-	@echo '<!doctype html><html><body>' > card.html
-	@echo '<style type="text/css">' >> card.html
-	@cleancss theme/${theme}.css >> card.html
-	@echo '</style>' >> card.html
-	@cat theme/${theme}.html >> card.html
-	@echo '<script>' >> card.html
-	@uglifyjs src/card.js -m >> card.html
-	@echo '</script></body></html>' >> card.html
+cards:
+	@mkdir -p cards
+	@./generate.py default > cards/default.html
+	@./generate.py medium > cards/medium.html
 
 widget:
 	@uglifyjs src/widget.js -m -o widget.js
@@ -20,7 +15,16 @@ develop:
 	@echo '<script src="src/card.js"></script>' >> card.html
 	@echo '</body></html>' >> card.html
 
+site: cards widget
+	@rm -fr _site
+	@mkdir -p _site
+	@mv widget.js _site/
+	@cp index.html site.js site.css _site/
+	@mv cards _site/
+
+publish: _site
+	@ghp-import _site -p -n
 
-build: card widget
+build: cards widget
 
-.PHONY: card widget build
+.PHONY: cards widget build
diff --git a/card.html b/card.html
diff --git a/index.html b/index.html
@@ -3,7 +3,6 @@
   <head>
     <title>GitHub Cards</title>
     <link rel="stylesheet" href="site.css">
-    <meta name="gc:url" content="card.html">
     <meta name="gc:client-id" content="a11a1bda412d928fb39a">
     <meta name="gc:client-secret" content="92b7cf30bc42c49d589a10372c3f9ff3bb310037">
     <script type="text/javascript">
@@ -56,6 +55,6 @@ <h2>How to Use</h2>
       </div>
     </div>
     <script src="site.js"></script>
-    <script src="src/widget.js"></script>
+    <script src="widget.js"></script>
   </body>
 </html>
diff --git a/src/widget.js b/src/widget.js
@@ -1,13 +1,16 @@
 (function(d) {
 
+  var scripts = document.getElementsByTagName("script");
+  var src = scripts[scripts.length-1].src;
+  var base = src.replace(/\/[^\/]+\.js$/, '/');
+
   var i, count = 0;
 
   var metas = d.getElementsByTagName('meta');
-  var BASEURL = 'http://lab.lepture.com/github-cards/card.html';
-  var client_id, client_secret;
+  var client_url, client_id, client_secret;
   for (i = 0; i < metas.length; i++) {
     if (metas[i].getAttribute('name') === 'gc:url') {
-      BASEURL = metas[i].getAttribute('content');
+      client_url = metas[i].getAttribute('content');
     } else if (metas[i].getAttribute('name') === 'gc:client-id') {
       client_id = metas[i].getAttribute('content');
     } else if (metas[i].getAttribute('name') === 'gc:client-secret') {
@@ -44,7 +47,11 @@
   }
 
   function render(card, baseurl) {
-    baseurl = baseurl || BASEURL;
+    baseurl = baseurl || client_url;
+    if (!baseurl) {
+      var theme = querydata(card, 'theme') || 'default';
+      baseurl = base + 'cards/' + theme + '.html';
+    }
     var user = querydata(card, 'user');
     var repo = querydata(card, 'repo');
     var github = querydata(card, 'github');

diff --git a/widget.js b/widget.js