Verified Commit 9c0753b1 authored by David Haynes's avatar David Haynes 🙆
Browse files

Demo site points to correct locations

- comments in docker
parent 1e77cd1a
Pipeline #1499 passed with stage
in 30 seconds
# Grab the node image from the store
FROM node:latest FROM node:latest
# Define a working directory to place things in
WORKDIR /usr/masonstrap WORKDIR /usr/masonstrap
COPY yarn.lock . # Copy over everything
COPY package.json .
RUN yarn
COPY . . COPY . .
# Install all dependecies
RUN yarn
version: '2' version: '2'
services: services:
web: masonstrap:
# Build the base image
build: . build: .
# Run the dev server
command: npm run dev command: npm run dev
# Mount the masonstrap working directory
volumes: volumes:
- .:/usr/masonstrap/ - .:/usr/masonstrap/
- /usr/masonstrap/node_modules # Associate the dev server port with localhost:8000
ports: ports:
- "8000:8000" - "8000:8000"
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
"copy-js": "cp ./node_modules/jquery/dist/jquery.min.js ./public/assets/js/jquery.min.js && cp ./node_modules/jquery/dist/jquery.min.map ./public/assets/js/jquery.min.map && cp ./node_modules/bootstrap/dist/js/bootstrap.min.js ./public/assets/js/bootstrap.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js ./public/assets/js/popper.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js.map ./public/assets/js/popper.min.js.map", "copy-js": "cp ./node_modules/jquery/dist/jquery.min.js ./public/assets/js/jquery.min.js && cp ./node_modules/jquery/dist/jquery.min.map ./public/assets/js/jquery.min.map && cp ./node_modules/bootstrap/dist/js/bootstrap.min.js ./public/assets/js/bootstrap.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js ./public/assets/js/popper.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js.map ./public/assets/js/popper.min.js.map",
"build-masonstrap": "npm-run-all copy-js copy-fonts sass-lint sass-compile sass-prefix sass-minify", "build-masonstrap": "npm-run-all copy-js copy-fonts sass-lint sass-compile sass-prefix sass-minify",
"sass-watch": "onchange './masonstrap/*.scss' -- npm run build-masonstrap", "sass-watch": "onchange './masonstrap/*.scss' -- npm run build-masonstrap",
"http": "http-server -p 8000", "http": "http-server -r -p 8000",
"start": "npm-run-all copy-js copy-fonts sass-watch", "start": "npm-run-all copy-js copy-fonts sass-watch",
"dev": "npm-run-all --parallel start http" "dev": "npm-run-all --parallel start http"
} }
......
...@@ -33,9 +33,7 @@ ...@@ -33,9 +33,7 @@
<!-- Load in static content --> <!-- Load in static content -->
<link rel="icon" href="assets/img/favicon.ico" sizes="16x16"> <link rel="icon" href="assets/img/favicon.ico" sizes="16x16">
<link rel="stylesheet" href="masonstrap/masonstrap.css" media="screen"> <link rel="stylesheet" href="assets/css/masonstrap.min.css" media="screen">
<link rel="stylesheet" href="assets/css/styles.css">
<link rel="stylesheet" href="assets/css/demo.css">
</head> </head>
<!-- Body content --> <!-- Body content -->
...@@ -1621,7 +1619,6 @@ ...@@ -1621,7 +1619,6 @@
<p>A project of <a href="https://srct.gmu.edu/">GMU<strong> SRCT</strong></a></p> <p>A project of <a href="https://srct.gmu.edu/">GMU<strong> SRCT</strong></a></p>
<p>Code released under <a href="https://git.gmu.edu/srct/masonstrap/blob/master/LICENSE"><strong>MIT license</strong></a></p> <p>Code released under <a href="https://git.gmu.edu/srct/masonstrap/blob/master/LICENSE"><strong>MIT license</strong></a></p>
<p>Contribute to the open source repo at <a href="https://git.gmu.edu/srct/masonstrap"><strong>git.gmu.edu/srct/masonstrap</strong></a></p> <p>Contribute to the open source repo at <a href="https://git.gmu.edu/srct/masonstrap"><strong>git.gmu.edu/srct/masonstrap</strong></a></p>
<p>Based on the <a href="https://bootswatch.com/yeti/"><strong>Bootswatch</strong> Yeti</a> theme which is based on <a href="https://getbootstrap.com/"><strong>Bootstrap</strong></a></p>
</div> </div>
</div> </div>
</footer> </footer>
...@@ -1652,11 +1649,9 @@ ...@@ -1652,11 +1649,9 @@
</div> </div>
<!-- load in external js --> <!-- load in external js -->
<script src="bower_components/jquery/dist/jquery.slim.min.js"></script> <script src="/assets/js/jquery.min.js"></script>
<script src="bower_components/tether/dist/js/tether.min.js"></script> <script src="/assets/js/popper.min.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script src="/assets/js/bootstrap.min.js"></script>
<script src="assets/js/custom.js"></script>
<script src="assets/js/version.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment