initial commit of pibakery v2

davidferguson · Jun 29, 2018 · 9f151e2 · 9f151e2
1 parent ce81d93
commit 9f151e2
Show file tree

Hide file tree

Showing 69 changed files with 4,917 additions and 4,517 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/7z b/7z
diff --git a/7z.exe b/7z.exe
diff --git a/7zip-license.txt b/7zip-license.txt
diff --git a/COPYING b/COPYING
diff --git a/CommandLineDiskImager/CommandLineDiskImager.exe b/CommandLineDiskImager/CommandLineDiskImager.exe
diff --git a/CommandLineDiskImager/GPL-2 b/CommandLineDiskImager/GPL-2
diff --git a/CommandLineDiskImager/icudt51.dll b/CommandLineDiskImager/icudt51.dll
diff --git a/CommandLineDiskImager/icuin51.dll b/CommandLineDiskImager/icuin51.dll
diff --git a/CommandLineDiskImager/icuuc51.dll b/CommandLineDiskImager/icuuc51.dll
diff --git a/CommandLineDiskImager/libgcc_s_dw2-1.dll b/CommandLineDiskImager/libgcc_s_dw2-1.dll
diff --git a/CommandLineDiskImager/libstdc++-6.dll b/CommandLineDiskImager/libstdc++-6.dll
diff --git a/CommandLineDiskImager/libwinpthread-1.dll b/CommandLineDiskImager/libwinpthread-1.dll
diff --git a/app/blockly/blockly.js b/app/blockly/blockly.js
diff --git a/app/blocks.js b/app/blocks.js
@@ -1,40 +1,20 @@
 /*
-    PiBakery - The easiest way to setup a Raspberry Pi
-    Copyright (C) 2016  David Ferguson
-
-    This file is part of PiBakery.
-
-    PiBakery is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    PiBakery is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with PiBakery.  If not, see <http://www.gnu.org/licenses/>.
-
-    PiBakery uses Google Blockly which is licensed under the Apache
-    License Version 2.0, a copy of which can be found in the file
-    ./app/blockly/LICENSE
-
-    PiBakery uses Win32DiskImager (Image Writer for Windows) which is
-    licensed under the GNU General Public License as published by the
-    Free Software Foundation, version 2 or later, a copy of which can
-    be found in the file ./CommandLineDiskImager/GPL-2
-
-    PiBakery uses p7zip which is licensed under the GNU General Public
-    License as published by the Free Software Foundation, version 2.1 or
-    later, a copy of which can be found in the file p7zip-license.txt
-
-    PiBakery uses 7zip (7za) which is licensed under the GNU Lesser
-    General Public License as published by the Free Software Foundation,
-    version 2.1 or later, a copy of which can be found in the file
-    7zip-license.txt
-*/
+ * PiBakery 2.0.0 - The easy to use setup tool for Raspberry Pi
+ * Copyright (C) 2019  David Ferguson <david@pibakery.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 Blockly.Blocks['onboot'] = {
   init: function() {
@@ -83,4 +63,4 @@ Blockly.PiBakery['onfirstboot'] = function(block) {
 Blockly.PiBakery['onnextboot'] = function(block) {
   var code = '_pibakery-onnextboot';
   return code;
-};
+};
diff --git a/app/img/load-sd.png b/app/img/load-sd.png
diff --git a/app/img/settings.png b/app/img/settings.png
diff --git a/app/index.html b/app/index.html
@@ -1,59 +1,38 @@
-<!--
-    PiBakery - The easiest way to setup a Raspberry Pi
-    Copyright (C) 2016  David Ferguson
-
-    This file is part of PiBakery.
-
-    PiBakery is free software: you can redistribute it and/or modify it under
-		the terms of the GNU General Public License as published by the Free
-		Software Foundation, either version 3 of the License, or (at your option)
-		any later version.
-
-    PiBakery is distributed in the hope that it will be useful, but WITHOUT ANY
-		WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-		FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-		details.
-
-    You should have received a copy of the GNU General Public License along with
-		PiBakery. If not, see <http://www.gnu.org/licenses/>.
-
-    PiBakery uses Google Blockly which is licensed under the Apache License
-		Version 2.0, a copy of which can be found in the file ./app/blockly/LICENSE
-
-    PiBakery uses Win32DiskImager (Image Writer for Windows) which is licensed
-		under the GNU General Public License as published by the Free Software
-		Foundation, version 2 or later, a copy of which can be found in the file
-		./CommandLineDiskImager/GPL-2
-
-    PiBakery uses p7zip which is licensed under the GNU General Public License
-		as published by the Free Software Foundation, version 2.1 or later, a copy
-		of which can be found in the file p7zip-license.txt
-
-    PiBakery uses 7zip (7za) which is licensed under the GNU Lesser General
-		Public License as published by the Free Software Foundation, version 2.1 or
-		later, a copy of which can be found in the file 7zip-license.txt
--->
-
 <html>
 	<head>
 		<title>PiBakery</title>
+		<link href="open-sans/open-sans.css" rel="stylesheet" type="text/css">
 		<link rel="stylesheet" type="text/css" href="styles.css" />
 	</head>
 	<body>
 		<div id="header">
 			<div id="logo">PiBakery</div>
 			<div class="headerBtn" id="flashSD">
-				<img src="img/write-to-sd.png" id="sdImage" />
+				<img src="img/write-to-sd.png" class="sdImage" />
 				<p>Write</p>
 			</div>
-			<div class="headerBtn" id="exportRecipe">
-				<img src="img/export.png" id="sdImage" />
+			<div class="headerBtn" id="updateSD">
+				<img src="img/update-sd.png" class="sdImage" />
+				<p>Update</p>
+			</div>
+			<div class="headerBtn" id="loadSD">
+				<img src="img/load-sd.png" class="sdImage" />
+				<p>Load</p>
+			</div>
+
+			<div class="headerBtn" id="export">
+				<img src="img/export.png" class="sdImage" />
 				<p>Export</p>
 			</div>
-			<div class="headerBtn" id="importRecipe">
-				<img src="img/import.png" id="sdImage" />
+			<div class="headerBtn" id="import">
+				<img src="img/import.png" class="sdImage" />
 				<p>Import</p>
 			</div>
+
+			<!--<div class="headerBtn" id="settings">
+				<img src="img/settings.png" class="sdImage" />
+				<p>Settings</p>
+			</div>-->
 		</div>
 
 		<div class="spinner">
@@ -75,17 +54,13 @@
 				<block type="onfirstboot" id="onfirstboot"></block>
 				<block type="onboot"></block>
 			</category>
-			<category name="Programs" colour="120" id="software"></category>
-			<category name="Network" colour="260" id="network"></category>
-			<category name="Settings" colour="210" id="setting"></category>
-			<category name="Other" colour="290" id="other"></category>
 		</xml>
 
 		<script src="blockly/blockly.js"></script>
 		<script src="blockly/pibakery.js"></script>
 		<script src="blockly/en.js"></script>
 		<script src="blocks.js"></script>
 
-		<script src="pibakery.js"></script>
+		<script src="index.js"></script>
 	</body>
 </html>