Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add bash to api #3

Merged
merged 1 commit into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ COPY . /app
RUN npm install -g [email protected] &&\
npm install

RUN apk add bash

EXPOSE 8082

CMD ["npm", "start"]
3 changes: 1 addition & 2 deletions api/knexfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ module.exports = {
},
seeds: {
directory: './db/seeds'
TESTING!!!!!
}
}
}

};
2 changes: 1 addition & 1 deletion api/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
Empty file added ui/src/App.css
Empty file.
Empty file added ui/src/components/Approver.js
Empty file.
Empty file added ui/src/components/Footer.js
Empty file.
Empty file added ui/src/components/Header.js
Empty file.
Empty file added ui/src/components/LoginPage.js
Empty file.
Empty file added ui/src/components/Requests.js
Empty file.
Empty file.
7 changes: 7 additions & 0 deletions ui/src/views/AssetView.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

export default function AssetView() {
return (
<div>AssetView</div>
)
}