added Makefile, 0.0.16 release

11 years ago · 0ed119c9af
7 changed files with 44 additions and 17 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,6 @@
 # Node.js package manager
 /node_modules
 /npm-debug.log
+dist
+package_dist
+webogram*.zip
--- a/23
+++ b/23
@ -0,0 +1,23 @@
+bump:
+	sed -i.bak 's/"version": ".*",/"version": "$(version)",/g' app/manifest.json
+	sed -i.bak 's/"version": ".*",/"version": "$(version)",/g' app/manifest.webapp
+	sed -i.bak 's/<span class="settings_version">alpha .*<\/span>/<span class="settings_version">alpha $(version)<\/span>/g' app/partials/settings_modal.html
+	rm app/manifest.json.bak app/manifest.webapp.bak app/partials/settings_modal.html.bak
+
+package:
+	rm -rf package_dist
+	cp -r app package_dist
+	sed -i.bak 's/<html lang="en" ng-app="myApp">\(<\!--  ng-csp=""  -->\)/<html lang="en" ng-app="myApp" ng-csp="">/g' package_dist/index.html
+	sed -n -i.bak '1h;1!H;$${;g;s/<script>.*<\/script>/ /p;}' package_dist/index.html
+	rm package_dist/index.html.bak
+	rm package_dist/img/screenshot*
+	find package_dist | grep DS_Store | xargs rm -rf
+	cd package_dist && zip -r ../webogram_v$(version).zip .
+
+publish:
+	rm -rf dist/*
+	cp -r app/* dist/
+	cd dist
+	git add .
+	git commit -am "merged with master"
+	git push origin gh-pages
--- a/app/index.html
+++ b/app/index.html
@ -21,16 +21,6 @@

  <div ng-view></div>

-   <script>
-     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-     ga('create', 'UA-45099287-2');
-     ga('send', 'pageview');
-  </script>
-
  <script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script>
  <script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
  <script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
@ -57,5 +47,16 @@
  <script type="text/javascript" src="js/filters.js?4"></script>
  <script type="text/javascript" src="js/directives.js?20"></script>

+
+   <script>
+     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+     ga('create', 'UA-45099287-2');
+     ga('send', 'pageview');
+  </script>
+
 </body>
 </html>
--- a/app/manifest.json
+++ b/app/manifest.json
@ -1,6 +1,6 @@
 {
  "name": "Telegram UNOFFICIAL",
-  "version": "0.0.15",
+  "version": "0.0.16",
  "short_name": "Webogram",
  "manifest_version": 2,
  "app": {
@ -22,4 +22,4 @@
    "90": "img/icons/icon90.png",
    "128": "img/icons/icon128.png"
  }
-}
+}
--- a/app/manifest.webapp
+++ b/app/manifest.webapp
@ -1,7 +1,7 @@
 {
  "name": "Webogram",
  "description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.0.15",
+  "version": "0.0.16",
  "launch_path": "/index.html",
  "developer": {
    "name": "Igor Zhukov",
@ -24,4 +24,4 @@
    "120": "/img/icons/icon120.png",
    "128": "/img/icons/icon128.png"
  }
-}
+}
--- a/app/partials/head.html
+++ b/app/partials/head.html
@ -8,7 +8,7 @@
          <span class="icon-bar"></span>
          <span class="icon-bar"></span>
        </button>
-        <a class="navbar-brand" href="http://zhukov.github.io/webogram"><img src="img/Logo_2x.png" class="tg_head_logo" alt="Telegram logo" width="110" height="31" /></a>
+        <a class="navbar-brand" href="#/im"><img src="img/Logo_2x.png" class="tg_head_logo" alt="Telegram logo" width="110" height="31" /></a>
        <ul class="nav navbar-nav navbar-quick-nav" ng-show="curDialog.peer">
          <li>
            <a href="#/im">
--- a/app/partials/settings_modal.html
+++ b/app/partials/settings_modal.html
@ -61,7 +61,7 @@

    <p>
      <strong>Version: </strong>
-      <span class="settings_version">alpha 0.0.15</span>
+      <span class="settings_version">alpha 0.0.16</span>
    </p>

    <hr/>
@ -70,4 +70,4 @@
      <a href="" ng-click="logOut()">Log out</a>
    </div>
  </div>
-</div>
+</div>