getting started on institution styling and added env-cmd to package.json

vgeordy · Aug 8, 2022 · cab1f71 · cab1f71
1 parent 7609101
commit cab1f71
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 4 deletions.
diff --git a/Institution/public/css/style.css b/Institution/public/css/style.css
diff --git a/Institution/server.js b/Institution/server.js
@@ -1,6 +1,10 @@
 const express = require('express')
 const app = express()
 const Institutionurl = 'localhost:3004/'
+
+app.use(express.static('public'));
+app.use('/css',express.static(__dirname + 'public/css'));
+
 app.use(express.urlencoded({extended: true}))
 app.set('view engine', 'ejs')
 

diff --git a/Institution/views/index.ejs b/Institution/views/index.ejs
@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" href="">
   <title>Document</title>
+  <link rel="stylesheet" type="text/css" href="css/style.css" />
 </head>
 <body>
   <form action="/institutions/mercycollege" method="POST">

diff --git a/client/blockquery/query.js b/client/blockquery/query.js
@@ -15,7 +15,6 @@ web3.eth.getTransactionCount(contractAddress, currentBlock).then((e) => {
   console.log("trx count n: ", e);
 });
 
-
 for (let i = currentBlock; i>=0; i--) { //&& (n > 0)
   try {
     if (block && block.transactions) {

diff --git a/client/package.json b/client/package.json
@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "@mui/material": "^5.9.2",
-    "react-select": "^5.4.0"
+    "react-select": "^5.4.0",
+    "env-cmd": "^10.1.0"
   }
 }
diff --git a/client/src/components/Demo/NoticeNoArtifact.jsx b/client/src/components/Demo/NoticeNoArtifact.jsx
@@ -1,8 +1,7 @@
 function NoticeNoArtifact() {
   return (
     <p>
-      ⚠️ Cannot find <span className="code">HPA</span> contract artifact.
-      Please complete the above preparation first, then restart the react dev server.
+      Please connect to the Ganache Ethereum network!
     </p>
   );
 }

diff --git a/client/src/components/PACreation/index.jsx b/client/src/components/PACreation/index.jsx
@@ -20,6 +20,7 @@ const PACreation = () => {
     <>
     <PAContext.Provider value={{id, setID, firstName, setFirstName, subject, setSubject, digitalSignature, setDigitalSignature}}>
         <Container>
+          <Requester/>
           <UploadHPA/>
         <SubmitHPA />
         </Container>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "react-router-dom": "^6.3.0"
+  },
+  "devDependencies": {
+    "env-cmd": "^10.1.0"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
       console.log("trx count n: ", e);
     });
     for (let i = currentBlock; i>=0; i--) { //&& (n > 0)
       try {
         if (block && block.transactions) {
@@ Expand Down @@