Merge pull request #35 from stevenlabrie/StevensBranch

jdiorio2393 · web-flow · commit 74e44ad2cc99 · 2021-02-25T00:42:40.000-05:00
Completely packaged notarized and distributed QLens 1.0
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 node_modules/
 dist/
-electron-builder.json
+electron-builder.json
+.env
+notarize.js
+entitlements.plist
+build-res/
diff --git a/app/src/Components/MongoDBURI.js b/app/src/Components/MongoDBURI.js
@@ -1,13 +1,13 @@
-import React, { useState, useEffect } from "react"; // userEffect to fetch instead of component mount
+import React, {useState,useEffect} from "react"; // userEffect to fetch instead of component mount
 import '../public/index.css';
 
 // input field for the mongoDB uri
-const MongoDBURI = ({schemaData, uriData, submitbtn, geturi}) =>  {
+const MongoDBURI = ({submitbtn, geturi, toggleInput}) =>  {
     return (
         <div className="formContainer">
             <div className="formClass">
               <form className="form__group field">
-                  <input className="form__field" type="input" onChange={geturi} id='name' placeholder=" Input Your MongoDB URI"/>
+                  <input className="form__field" type="input" onChange= {geturi} id='name' placeholder=" Input Your MongoDB URI" disabled={toggleInput}/>
                   <label className="form__label"> MongoDB URI </label>
                   <input className="URISubmitButton" type="submit" value="Submit" onClick={submitbtn} style={{display: "none"}}/>
               </form>
diff --git a/app/src/Components/MongoSchemaIDE.js b/app/src/Components/MongoSchemaIDE.js
@@ -12,8 +12,6 @@ const _ = require('lodash');
 const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
   const [data, setData] = useState([]);
   const [graphData, setGraphData] = useState({});
-  // console.log('SELECTED SCHEMAS WOAAAAA', graphQLSchema);
-  // console.log("UPDATED ROOTQUERY OBJ+++", graphQLSchema)
   // iterates over the graphQLSchema and removes the double quotes
   const eliminateQuotes = (obj) => {
     let str = '';
@@ -22,9 +20,9 @@ const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
     }
     return str;
   }
+  // function creates a new line to format the schemas
   const newLinePillar = (str) => {
     if (str === undefined) return;
-    // console.log(str);
     let newStr = '';
     let array = str.split('');
     for (let i = 0; i < array.length; i+=1) {
@@ -39,6 +37,7 @@ const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
     }
     return newStr;
   }
+  // adds a new line where there is a comma
   const newLineComma = (str) => {
     let newStr = '';
     let array = str.split('');
@@ -63,18 +62,13 @@ const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
   const newTypes = eliminateQuotes(graphQLSchema.types);
   const newQueries = eliminateQuotes(graphQLSchema.queries);
   const commaLessMutation = eliminateQuotes(graphQLSchema.mutation);
-  // const typeQ = newLinePillar(newTypes);
   const rootQ = newLinePillar(newQueries);
   const formattedTypes = newLinePillar(newTypes);
   const rootM = newLinePillar(commaLessMutation);
-  // const typeOutput = newLineComma(newTypes);
-  // const mutationNL = newLineComma(commaLessMutation);
   const combineQueries = (query1, query2, query3) => {
     return query1 + query2 + query3;
   }
   const combined = combineQueries(formattedTypes, rootQ, rootM);
-  // console.log('ROOTQ =========>', rootQ)
-  // const newS =
   return(
     <div className="codeboxContainer">
       <Tabs>
@@ -96,8 +90,6 @@ const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
               lineWrapping: true,
               theme: 'dracula',
               lineNumbers: true,
-              // lineSeparator: ",",
-              // autoCloseBrackets: true,
               cursorScrollMargin: 48,
               indentUnit: 2,
               tabSize: 2,
@@ -118,13 +110,12 @@ const MongoSchemaIDE = ({schemaData, selectedSchemaData, graphQLSchema}) => {
             lineWrapping: true,
             theme: 'dracula',
             lineNumbers: true,
-            // autoCloseBrackets: true,
             cursorScrollMargin: 48,
             indentUnit: 2,
             tabSize: 2,
             styleActiveLine: true,
             smartIndent: true,
-            // lineSeparator: ",",
+
           }}
           />
         </div>
diff --git a/app/src/public/codemirror.css b/app/src/public/codemirror.css
@@ -1,14 +1,4 @@
 
-/* .codeboxContainer {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  grid-template-rows: 1fr;
-  gap: 0px 0px;
-  grid-template-areas:
-    ". .";
-  height: 75vh;
-} */
-
 .codebox {
   border: 1px solid black;
 }
diff --git a/app/src/public/custom-tree.css b/app/src/public/custom-tree.css
@@ -10,6 +10,4 @@
 
 .node__leaf > circle {
   fill: green;
-
-  /* Let's also make the radius of leaf nodes larger */
 }
diff --git a/electron-builder.json b/electron-builder.json
@@ -1,10 +1,14 @@
 {
   "appId": "com.QLens.app",
-  "publish":
+  "afterSign": "notarize.js",
+  "publish": [
     {
-      "provider": "github",
-      "token": "0b26911bfe3e37f5cb71f9f06525494dabc5548e"
-    },
+    "provider": "github",
+    "owner": "oslabs-beta",
+    "repo": "QLens",
+    "token": "680c09ac62533c95f7cf3c593e0474363be3eff8"
+    }
+  ],
       "asar": true,
       "productName": "QLens",
       "directories": {
@@ -29,6 +33,7 @@
       ],
       "extraResources": ["./extraResources/**"],
       "dmg": {
+        "sign": false,
         "background": null,
         "backgroundColor": "#ffffff",
         "window": {
@@ -50,7 +55,11 @@
       },
       "mac": {
         "target": "dmg",
-        "category": "public.app-category.utilities"
+        "category": "public.app-category.utilities",
+        "hardenedRuntime": true,
+        "gatekeeperAssess": false,
+        "entitlements": "entitlements.plist",
+        "entitlementsInherit": "entitlements.plist"
       },
       "win": {
         "target": "nsis"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "QLens",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Open source tool to extract metadata from your MongoDB database to generate GraphQL schemas, resolvers and server setup, enhancing developer's productivity.",
   "main": "app/electron.js",
   "homepage": "./",
@@ -21,15 +21,12 @@
     "publish-lin": "npm run build && electron-builder -l --publish always",
     "deploy": "npm run build && electron-builder -mwl --publish always"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/stevenlabrie/QLens.git"
-  },
+  "repository": "github:oslabs-beta/QLens",
   "keywords": [],
   "author": {
     "name": "Judy Tan, Jake Diorio, Steven LaBrie, Cho Yee Win Aung",
     "email": "team@qlensapp.com",
-    "url": "http://qlensapp.com/"
+    "url": "https://qlensapp.com/"
   },
   "contributors": [
     {
@@ -91,9 +88,11 @@
     "codemirror": "^5.59.2",
     "cors": "^2.8.5",
     "d3": "^6.5.0",
+    "dotenv": "^8.2.0",
     "electron-devtools-installer": "^3.1.1",
     "electron-fetch": "^1.7.3",
     "electron-is-dev": "^1.2.0",
+    "electron-notarize": "^1.0.0",
     "electron-updater": "^4.3.5",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,4 @@`
`10`	`10`
`11`	`11`	`.node__leaf > circle {`
`12`	`12`	`fill: green;`
`13`		`-`
`14`		`- /* Let's also make the radius of leaf nodes larger */`
`15`	`13`	`}`