new file: .dockerignore

aesclever · aesclever · commit 0caba028b3f6 · 2022-10-07T12:51:43.000-07:00
modified:   Dockerfile
	modified:   README.md
	modified:   index.js
	modified:   views/index.ejs
	modified:   views/pages/about.ejs
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,11 @@
+**/node_modules/
+**/.git
+**/README.md
+**/LICENSE
+**/.vscode
+**/npm-debug.log
+**/coverage
+**/.env
+**/.editorconfig
+**/.aws
+**/dist
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,19 @@
-FROM node:16.17.0
+FROM node:16.17.0 AS build
 
-WORKDIR /app
-
-COPY package.json ./
-
-RUN npm install
+WORKDIR /usr/src/app
 
+#COPY package.json package-lock.json ./
 COPY . .
 
+# install package.json and clean cache.
+RUN npm ci --production && npm cache clean --force
+
 ENV NODE_ENV=production
 ENV PORT=8080
-ENV WEATHER_VISUALCROSSING_API_BASE_URI_4LNG_LAT=https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/weatherdata/forecast?aggregateHours=24&contentType=json&unitGroup=us
-ENV WEATHER_VISUALCROSSING_API_BASE_URI=https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/
 ENV WEATHERBIT_URI=https://api.weatherbit.io/v2.0/
-# ENV WEATHER_VISUALCROSSING_API_KEY=XXXXX
-# ENV WEATHERBIT_KEY=XXXXXXX
+
+# ENV WEATHERBIT_KEY=XXXXXXX  <-- expect as container parameter! 
 
 EXPOSE 8080
 
-CMD [ "npm", "start" ]
+CMD [ "node", "index.js" ]
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ It is a typical NodeJS project layout.
 
 `npm start`
 
->Initially, the browser might pop up asking if you would allow it to detect your location.  An 'Allow' will enable GPS pinpoint weather report.  A 'Block' will disable GPS for current and subsequent session.
+>Initially, the browser might pop up asking if you would allow it to detect your location.  An 'Allow' will enable GPS pinpoint weather report.  A 'Block' will disable GPS for current and subsequent sessions.
 
 ![Browser popup](./public/PermitGeolocation.PNG)
 
diff --git a/index.js b/index.js
@@ -21,7 +21,7 @@ app.get('/', (req, res) => {
   // console.dir(req.params);
   // console.dir(req.body);
   let apikey = encrypt(process.env.WEATHERBIT_KEY);
-  res.render('index1', {xkey: apikey});
+  res.render('index', {xkey: apikey});
 })
 
 
@@ -242,7 +242,7 @@ app.post('/', (req, res) => {
       });
   
     } catch (err) {
-      res.render('index1', { locale: city, data: null, forecast: null, error: err.message });
+      res.render('index', { locale: city, data: null, forecast: null, error: err.message });
     }
 });
 
diff --git a/views/index.ejs b/views/index.ejs
@@ -11,33 +11,23 @@
     <title>TechRolEmi Weather42</title>
   </header>
   <body>
-    <h1>Geolocation Pinpoint Weather</h1>
+    <h1>Welcome weary net surffers!</h1>
     <div class="xcode" style="display: none;"></div>
     <input type="hidden" id="xcree" name="xcree" value="ZTg4ZTFhODA5NmNkNDg5N2I3OWIyMzBhOWM0OWIyNDM=">
     <div id="geoLatLng" action="showPosition()">
         <!-- pinpoint positon verbish will be loaded into here -->
         <!-- <p><%= xkey %></p> -->
     </div>
     <hr>
-    <p>Weather information is powerful knowledge used in forecasting the production of certain operations to help determine the economic bottom line. There are countless human endeavors affected by weather factors. Rain is good for growers, and forewarning is valuable in extreme weather, while the sunny sky and windy days could be good for energy production. For example, solar power production needs to know the number of hours of sunlight specific to geographical location. Wind farm needs to know wind speed, direction, etc. The travel and hospitality industry is most affected by dynamic weather patterns. From agriculture to space-faring, weather plays a key role in the decision-making process.</p>
-<hr />
-    <p>There are weather detection stations situated in and around you. The inner working of making data available is not of interest to the populous but it is vital to a functioning society. Although, the National Weather Service is a government agency that disseminates data free of charge. Weather data has been monetized by repackaging in ways the population can consume. e.g. Local TV news reserve a segment devoted to weather ubiquitously. Weather data is available at your fingertips. It is all factored into a transferable cost by some service providers you're currently paying. For weather application developers, the effective cost per thousand impressions (eCPM) metric is higher compared to educational apps. You can effectively monetize your project if you do it right.</p>
+    <p>Whether you are at the beginning, somewhere in the middle, or nearign the end of your journey.  Take the load off, sit down, look up.  The weather is telling us something about our past actions. </p>
     <div>
-    <hr>
-    <br />
-    <a href="https://github.com/hurricanemark/Weather_Report_NodeJS_EJS_Express_VisualCrossing_API" target="_blank">GitHub source</a>
-
-    <br />
-    <a href="https://hub.docker.com/u/marknre" target = "_blank">Docker image</a>
-    
         <fieldset>
             <form action="/weatherbit" method="post">
                 <input name="xcode" type="hidden" class="xcode" value="ZTg4ZTFhODA5NmNkNDg5N2I3OWIyMzBhOWM0OWIyNDM=" required>
           </form>
         </fieldset>
     </div>
 
-
     <main>
         <div class="currentConds"></div>
   
diff --git a/views/pages/about.ejs b/views/pages/about.ejs
@@ -15,10 +15,19 @@
         <div class="row">
             <div class="col-sm-10">
                 <div class="jumbotron jumbotron-fluid">
-                    <h1>Free Public Weather Report</h1>
-                    <p>Welcome to TechRolEmi LLC.</p>
+                    <h1>Public Weather Report</h1>
+                    <strong>Welcome to TechRolEmi LLC.</strong>
                     <hr>
-                    <p>You could be surfing anywhere else, but you are here.  We appreciate that.</p>
+                    <p>Weather information is powerful knowledge used in forecasting the production of certain operations to help determine the economic bottom line. There are countless human endeavors affected by weather factors. Rain is good for growers, and forewarning is valuable in extreme weather, while the sunny sky and windy days could be good for energy production. For example, solar power production needs to know the number of hours of sunlight specific to geographical location. Wind farm needs to know wind speed, direction, etc. The travel and hospitality industry is most affected by dynamic weather patterns. From agriculture to space-faring, weather plays a key role in the decision-making process.</p>
+                <hr />
+                    <p>There are weather detection stations situated in and around you. The inner working of making data available is not of interest to the populous but it is vital to a functioning society. Although, the National Weather Service is a government agency that disseminates data free of charge. Weather data has been monetized by repackaging in ways the population can consume. e.g. Local TV news reserve a segment devoted to weather ubiquitously. Weather data is available at your fingertips. It is all factored into a transferable cost by some service providers you're currently paying. </p>
+                    <hr>
+                    <p>Support Ukraine.</p>
+                    <br />
+                    <a href="https://github.com/hurricanemark/Weather_Report_NodeJS_EJS_Express_VisualCrossing_API" target="_blank">GitHub source</a>
+                
+                    <br />
+                    <a href="https://hub.docker.com/u/marknre" target = "_blank">Docker image</a>
                 </div>
             </div>
 
