Corrected jQuery includes in src files.

USHIN-Inc · Nov 9, 2018 · fdb6744 · fdb6744 · hiimalexjgarcia · Nov 9, 2018
1 parent 376a245
commit fdb6744
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "f2f-app",
   "productName": "f2f-app",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "f2f: Face-2-Face reference application for USHIN",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>ushin – univeral shared information – is a language of compassion</title>
-	<link rel="stylesheet" type="text/css" href="styles/normalize.css">
+	<link rel="stylesheet" type="text/css" href="styles/vendor/normalize.css">
 	<link rel="stylesheet" type="text/css" href="styles/main.css">
 </head>
 <body>
@@ -39,7 +39,8 @@ <h4>Hover over shapes to see what they mean.</h4>
 
 </main>
 
-<script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="scripts/vendor/jquery-3.3.1.min.js"></script>
+<script>window.$ = window.jQuery = require('./scripts/vendor/jquery-3.3.1.min.js');</script>
 <script src="scripts/main.js"></script>
 
 </body>

diff --git a/src/index.js b/src/index.js
@@ -13,14 +13,14 @@ const createWindow = () => {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     minWidth: 800,
-    minHeight: 600
+    minHeight: 640
   });
 
   // and load the index.html of the app.
   mainWindow.loadURL(`file://${__dirname}/index.html`);
 
   // Open the DevTools.
-  //mainWindow.webContents.openDevTools();
+  // mainWindow.webContents.openDevTools();
 
   // Emitted when the window is closed.
   mainWindow.on('closed', () => {

diff --git a/src/scripts/vendor/jquery-3.3.1.min.js b/src/scripts/vendor/jquery-3.3.1.min.js
diff --git a/src/styles/normalize.css → src/styles/vendor/normalize.css b/src/styles/normalize.css → src/styles/vendor/normalize.css