Merge pull request #47 from googleinterns/asb_revision

fixes bugs in web app
googleinterns · Aug 8, 2020 · ed74dab · ed74dab
2 parents 1b5951a + a251515
commit ed74dab
Show file tree

Hide file tree

Showing 4 changed files with 182 additions and 132 deletions.
diff --git a/functions/src/SPL/index.ts b/functions/src/SPL/index.ts
@@ -4,8 +4,8 @@ import * as checks from '../errorChecks';
 
 export const getSPL = functions.https.onRequest((request, response) => {
 
-  const bulletinID = request.query.bulletinid;
-  const androidVersion = request.query.androidVersion;
+  const bulletinID = request.query.bulletinidSPL;
+  const androidVersion = request.query.androidVersionSPL;
 
   if (bulletinID) {
     if (!checks.checkBulletinIDValidity(bulletinID)) {

diff --git a/functions/src/bulletin/index.ts b/functions/src/bulletin/index.ts
@@ -4,8 +4,8 @@ import * as checks from '../errorChecks';
 
 export const getBulletin = functions.https.onRequest((request, response) => {
 
-  const bulletinID = request.query.bulletinid;
-  const androidVersion = request.query.androidVersion;
+  const bulletinID = request.query.bulletinidBULLETIN;
+  const androidVersion = request.query.androidVersionBULLETIN;
 
   if (bulletinID) {
     if (!checks.checkBulletinIDValidity(bulletinID)) {

diff --git a/public/style.css b/public/style.css
@@ -75,11 +75,11 @@ h4, .h4 {
     margin-bottom: 4%;
     text-align: center;
     width: max-content;
+    padding: 1%;
 }
 
 .fileUpload {
     border-radius: 2%;
-    padding: 4%;
     width: max-content;
 }
 
@@ -92,8 +92,9 @@ h4, .h4 {
 }
 
 #fileName {
+    margin-left: 1%;
+    margin-right: 1%;
     width: max-content;
-    display: inline-block;
 }
 
 .demoContainer{