Set up public directory

moved files into public and set up builder function so files can be added to server very easily
GideonBrasil · Apr 4, 2019 · 403e241 · 403e241
1 parent f0ec6d1
commit 403e241
Show file tree

Hide file tree

Showing 15 changed files with 689 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+
+.jshintrc
diff --git a/public/build/bundle.js b/public/build/bundle.js
diff --git a/public/images/ctower.jpg b/public/images/ctower.jpg
diff --git a/public/images/soccer.jpg b/public/images/soccer.jpg
diff --git a/index.html → public/index.html b/index.html → public/index.html
@@ -13,6 +13,6 @@
 
   <body>
     <div id="react-root"></div>
-    <script src="/build/bundle.js"></script>
+    <script src="./build/bundle.js"></script>
   </body>
 </html>
diff --git a/public/javascripts/bundle.js b/public/javascripts/bundle.js
diff --git a/src/NavBar.jsx b/src/NavBar.jsx
@@ -18,7 +18,7 @@ class NavBar extends Component {
       return (
         <nav className="navbar fixed sticky-top navbar-light">
           <a onClick={this.props.showJumbotron} className="navbar-brand">
-            <img id="logo" src="/public/images/logo1.png" alt="logo" />{" "}
+            <img id="logo" src="./images/logo1.png" alt="logo" />{" "}
           </a>
           <section>
             <div id="calgary-now">
@@ -51,7 +51,7 @@ class NavBar extends Component {
       return (
         <nav className="navbar fixed sticky-top navbar-light">
           <a className="navbar-brand">
-            <img id="logo" src="/public/images/logo1.png" alt="logo" />{" "}
+            <img id="logo" src="./images/logo1.png" alt="logo" />{" "}
           </a>
           <a
             className="btn btn-danger btn-lg btn2"

diff --git a/src/images/calgary-print.jpg b/src/images/calgary-print.jpg
diff --git a/src/images/calgary_photo.jpg b/src/images/calgary_photo.jpg
diff --git a/src/images/calgary_sketch.jpg b/src/images/calgary_sketch.jpg
diff --git a/src/images/city-of-calgary.jpg b/src/images/city-of-calgary.jpg
diff --git a/src/images/logo1.png b/src/images/logo1.png
diff --git a/src/images/logo2.png b/src/images/logo2.png
diff --git a/styles/navbar.scss b/styles/navbar.scss
@@ -12,7 +12,6 @@ $color5: #D90429;
   display: flex;
   justify-content: space-between;
   background-color: rgba(255, 255, 255, 0.9);
-  color: white;
   #logo {
     max-height: 48px;
     border-radius: 7px;
@@ -28,6 +27,7 @@ $color5: #D90429;
     outline: none !important;
     box-shadow: none;
     margin-right: 10px;
+    color:white;
   }
   .btn2:hover {
     opacity: 0.7;

diff --git a/webpack.config.js b/webpack.config.js
@@ -8,7 +8,7 @@ module.exports = {
     index: "./src/index.jsx"
   },
   output: {
-    path: path.join(__dirname, "dist"),
+    path: path.join(__dirname, "./public/build"),
     filename: "bundle.js",
     publicPath: "/build/"
   },