maintenance

15a248a5 · michelek · b52d4404 · 15a248a5 · 15a248a5 · 15a248a5
Commit 15a248a5 authored Sep 15, 2020 by michelek
Showing with 11 additions and 22 deletions

.gitignore .gitignore +2 -1

.vscode/settings.json .vscode/settings.json +4 -0

code/app.js code/app.js +1 -2

code/panuView.html code/panuView.html +0 -17

package.json package.json +4 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
 bin
 node_modules
 old
-Panustaja-*/*
\ No newline at end of file
+Panustaja-*/*
+.DS_Store
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
+{
+    "editor.fontSize": 14,
+    "editor.formatOnType": true
+}
\ No newline at end of file
--- a/code/app.js
+++ b/code/app.js
@@ -11,8 +11,7 @@ var userUrl = 'https://entu.keeleressursid.ee/api2/user'
 var authUrl = userUrl + '/auth'


-ISDEV = true
-// ISDEV = process.env.DEV ? true : false
+ISDEV = process.env.DEV ? true : false

 var pjsonPath = path.join(__dirname, '..', 'package.json')
 var pjson = require(pjsonPath)

--- a/code/panuView.html
+++ b/code/panuView.html
@@ -5,23 +5,6 @@
    <link rel="stylesheet" type="text/css" href="./style.css">
    <link rel="icon" type="image/png" href="/images/murakas.ico" sizes="96x96">
    <link rel="shortcut icon" href="/images/murakas.ico">
-    <!-- Piwik -->
-    <script type="text/javascript">
-      console.log('piwik start')
-      var _paq = _paq || [];
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="https://piwik.keeleressursid.ee/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', 6]);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-      console.log('piwik end')
-    </script>
-    <noscript><p><img src="https://piwik.keeleressursid.ee/piwik.php?idsite=6" style="border:0;" alt="" /></p></noscript>
-    <!-- End Piwik Code -->
  </head>
  <body>
    <div id="murakas">

--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "panustaja",
  "description": "Ressursikataloogi upitamiseks keeleressurside Entu repositooriumisse.",
  "version": "2.0.0",
-  "build": 149,
+  "build": 155,
  "main": "./code/app.js",
  "license": "CC-SA",
  "private": true,
@@ -11,7 +11,9 @@
    "url": "git@gitlab.keeleressursid.ee:michelek/panustaja.git"
  },
  "scripts": {
-    "start": "electron ."
+    "start": "electron .",
+    "dev": "DEV=1 electron .",
+    "distro": "electron-packager . Panustaja --platform=all --arch=x64 --ignore Panustaja"
  },
  "dependencies": {
    "async": "^1.5.0",