Merge pull request #104 from symptomatic/development

Android Build Pipeline Validation
clinical-meteor · Jun 10, 2021 · 45c674b · 45c674b
2 parents 5f7225e + 7d64cf1
commit 45c674b
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 56 deletions.
diff --git a/.meteor/platforms b/.meteor/platforms
@@ -1,2 +1,4 @@
+android
 browser
+ios
 server
diff --git a/.meteor/versions b/.meteor/versions
@@ -2,17 +2,12 @@ [email protected]
 alanning:[email protected]
 aldeed:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -21,7 +16,6 @@ clinical:[email protected]
 clinical:[email protected]
 clinical:[email protected]
 clinical:[email protected]
-datarobot:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -38,7 +32,6 @@ [email protected]
 [email protected]
 fourseven:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -50,8 +43,6 @@ [email protected]
 [email protected]
 matb33:[email protected]
 [email protected]
-[email protected]
-meteorhacks:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -89,10 +80,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-symptomatic:[email protected]
-symptomatic:[email protected]
-symptomatic:[email protected]
-symptomatic:[email protected]
 [email protected]
 tmeasday:[email protected]
 [email protected]

diff --git a/app/core/AppLoadingPage.jsx b/app/core/AppLoadingPage.jsx
@@ -64,8 +64,9 @@ function AppLoadingPage(props) {
   // Social Media Registration
 
   let helmet;
-  let initialScale = (get(Meteor, 'settings.public.defaults.initialScale', "0.7")).toString();
-  let viewportString = "initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale +  ", maximum-scale=" + initialScale + ", width=device-width, height=device-height, user-scalable=no";
+  let initialScale = (get(Meteor, 'settings.public.defaults.initialScale', 1.0)).toString();
+  // let viewportString = "initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale +  ", maximum-scale=" + initialScale + ", width=device-width, height=device-height, user-scalable=no";
+  let viewportString = "initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale +  ", maximum-scale=" + initialScale + ", width=device-width, height=device-height";
 
   if(get(Meteor, 'settings.public.socialmedia')){
     let socialmedia = get(Meteor, 'settings.public.socialmedia');

diff --git a/app/layout/App.jsx b/app/layout/App.jsx
@@ -480,11 +480,12 @@ export function App(props) {
     themeColor = rawColor;
   }
 
-  let initialScale = 0.8;
+  let initialScale = 1.0;
 
   headerTags.push(<meta key='theme' name="theme-color" content={themeColor} />)
   headerTags.push(<meta key='utf-8' charSet="utf-8" />);    
-  headerTags.push(<meta name="viewport" key='viewport' property="viewport" content={"initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale + ", maximum-scale=" + initialScale + ", width=device-width, height=device-height, user-scalable=no"} />);
+  // headerTags.push(<meta name="viewport" key='viewport' property="viewport" content={"initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale + ", maximum-scale=" + initialScale + ", width=device-width, height=device-height, user-scalable=no"} />);
+  headerTags.push(<meta name="viewport" key='viewport' property="viewport" content={"initial-scale=" + initialScale + ", minimal-ui, minimum-scale=" + initialScale + ", maximum-scale=" + initialScale + ", width=device-width, height=device-height"} />);
   headerTags.push(<meta name="description" key='description' property="description" content={get(Meteor, 'settings.public.title', "Node on FHIR")} />);
   headerTags.push(<title key='title'>{get(Meteor, 'settings.public.title', "Node on FHIR")}</title>);
 

diff --git a/app/layout/MainPage.jsx b/app/layout/MainPage.jsx
@@ -109,20 +109,7 @@ function MainPage(props){
   let code = " # download meteorjs \n curl https://install.meteor.com/ | sh \n\n # clone the repository \n git clone https://github.com/symptomatic/node-on-fhir \n\n # change into the directory \n cd node-on-fhir \n\n # install the dependencies \n meteor npm install \n\n # run the app (with settings) \n meteor run --settings configs/settings.nodeonfhir.localhost.json --extra-packages symptomatic:example-plugin ";
 
 
-  //----------------------------------------------------------------------
-  // Page Styling 
-
-  let headerHeight = 64;
-  if(get(Meteor, 'settings.public.defaults.prominantHeader')){
-    headerHeight = 128;
-  }
 
-  let pageStyle = {
-    paddingLeft: '100px', 
-    paddingRight: '100px',
-    position: 'absolute',
-    top: '0px'
-  }
 
 
   //----------------------------------------------------------------------
@@ -152,10 +139,26 @@ function MainPage(props){
     window.open(url);
     // props.history.replace(url)
   }
+
+  //----------------------------------------------------------------------
+  // Page Styling 
+
+  let headerHeight = 64;
+  if(get(Meteor, 'settings.public.defaults.prominantHeader')){
+    headerHeight = 128;
+  }
+
+  let pageStyle = {
+    paddingLeft: '100px', 
+    paddingRight: '100px',
+    position: 'absolute',
+    top: '0px'
+  }
+
   //----------------------------------------------------------------------
   // Main Render Method  
 
-  let carouselImages = get(Meteor, 'settings.public.projectPage.carouselImages', [])
+  let carouselImages = get(Meteor, 'settings.public.projectPage.carouselImages', []);
 
   let imageItems = [];
   carouselImages.forEach(function(url, index){
@@ -178,11 +181,21 @@ function MainPage(props){
     height: '52px'
   }
 
+  if(Meteor.isCordova){
+    pageStyle.width = window.innerWidth + "px";
+    pageStyle.padding = 20;
+    pageStyle.marginLeft = '0px';
+    pageStyle.marginRight = '0px';
+  }
+
 
 
   return (
-    <PageCanvas id='MainPage' style={pageStyle} headerHeight={headerHeight}>
-        <Container maxWidth="lg" style={{paddingBottom: '80px'}}>
+    <PageCanvas id='MainPage' style={pageStyle} headerHeight={headerHeight} paddingLeft={pageStyle.padding} paddingRight={pageStyle.padding}>
+        <Grid container justify="center" style={{paddingBottom: '80px'}}>
+          <Grid item xs={4}>
+
+          </Grid>
 
             <Button variant="contained" color="secondary" className={classes.fallout_button} href="https://github.com/symptomatic/covid19-on-fhir" >
               <Icon icon={warning} size={24} /><CardHeader title="Announcement" subheader="Due to pandemic, we have discontinued the old example plugin, and will now be offering Covid19-on-FHIR as the example." />
@@ -262,26 +275,6 @@ function MainPage(props){
               </Carousel>
             </Card>
 
-
-
-
-              {/* <StyledCard margin={20} >
-                <CardHeader title="Getting Started" />
-                <CardContent>
-                  <pre>
-                    - install meteor
-                    - download github repo
-                    - install dependencies
-                    - run app
-                  </pre>
-                </CardContent>  
-              </StyledCard> */}
-
-
-
-
-
-
               <StyledCard margin={20} >
                 <CardHeader title="Features - Everything You Need; Kitchen Sink Included" />
                 <CardContent>
@@ -558,7 +551,7 @@ function MainPage(props){
               </CardActionArea>
             </StyledCard>
 
-      </Container>
+      </Grid>
     </PageCanvas>
   );
 }

diff --git a/client/main.html b/client/main.html
@@ -3,7 +3,7 @@
 
   <link rel="apple-touch-icon" sizes="120x120" href="/images/node-on-fhir-logo-square-120.png">
 
-  <meta name="viewport" content="viewport-fit=cover, initial-scale=0.6, minimal-ui, minimum-scale=0.6, maximum-scale=0.6, width=device-width, height=device-height, user-scalable=no" />
+  <meta name="viewport" content="viewport-fit=cover, initial-scale=1.0, minimal-ui, minimum-scale=1.0, maximum-scale=1.0, width=device-width, height=device-height" />
 </head>
 
 <body>

diff --git a/configs/settings.nodeonfhir.json b/configs/settings.nodeonfhir.json
@@ -61,6 +61,8 @@
       "displayNavbars": true,
       "disableHeader": false,
       "disableFooter": false,
+      "initialScale": 1.0,
+
       "paginationLimit": 100,
       "subscriptionLimit": 1000,
       "sidebar": {

diff --git a/configs/settings.nodeonfhir.localhost.json b/configs/settings.nodeonfhir.localhost.json
@@ -63,6 +63,7 @@
       "displayNavbars": true,
       "disableHeader": false,
       "disableFooter": false,
+      "initialScale": 1.0,
       "paginationLimit": 100,
       "subscriptionLimit": 1000,
       "sidebar": {

diff --git a/packages/covid19-on-fhir b/packages/covid19-on-fhir
-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
+    android
     browser
+    ios
     server