diff --git a/api/Dockerfile b/api/Dockerfile index fdf22ab30..29b5a9291 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -6,6 +6,8 @@ COPY . /app RUN npm install -g nodemon@2.0.15 &&\ npm install +RUN apk add bash + EXPOSE 8082 CMD ["npm", "start"] \ No newline at end of file diff --git a/api/knexfile.js b/api/knexfile.js index 74d10ef80..ce1da9829 100644 --- a/api/knexfile.js +++ b/api/knexfile.js @@ -56,8 +56,7 @@ module.exports = { }, seeds: { directory: './db/seeds' - TESTING!!!!! + } } -} }; diff --git a/api/src/app.js b/api/src/app.js index 0b0d1135d..e74f56396 100644 --- a/api/src/app.js +++ b/api/src/app.js @@ -17,7 +17,7 @@ app.get('/authors', (request, response) => { knex('app_authors') .select('*') .then(authorRecords => { - let responseData = authorRecords.map(author => ({ firstName: author.first_name, lastName: author.last_name})); + let responseData = authorRecords.map(author => ({ firstName: author.first_name, lastName: author.last_name })); response.status(200).send(responseData) }) diff --git a/docker-compose.yml b/docker-compose.yml index de0dd7c4d..e05b87eb0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=docker - POSTGRES_PORT=5432 - - POSTGRES_DB=capstone + - POSTGRES_DB=fortis_bellator ports: - '5432:5432' healthcheck: @@ -29,7 +29,7 @@ services: image: dpage/pgadmin4 restart: always environment: - PGADMIN_DEFAULT_EMAIL: phillip.witkin@galvanize.com + PGADMIN_DEFAULT_EMAIL: mfouquier1@gmail.com PGADMIN_DEFAULT_PASSWORD: docker PGADMIN_LISTEN_PORT: 80 ports: @@ -53,7 +53,7 @@ services: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=docker - POSTGRES_PORT=5432 - - POSTGRES_DB=capstone + - POSTGRES_DB=fortis_bellator volumes: - type: bind source: ./api diff --git a/ui/src/App.css b/ui/src/App.css new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/Approver.js b/ui/src/components/Approver.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/Footer.js b/ui/src/components/Footer.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/Header.js b/ui/src/components/Header.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/LoginPage.js b/ui/src/components/LoginPage.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/Requests.js b/ui/src/components/Requests.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/components/ShoppingCart.js b/ui/src/components/ShoppingCart.js new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/views/AssetView.js b/ui/src/views/AssetView.js new file mode 100644 index 000000000..e7bf56e3f --- /dev/null +++ b/ui/src/views/AssetView.js @@ -0,0 +1,7 @@ +import React from 'react' + +export default function AssetView() { + return ( +