Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
dhain 2023-01-31 08:52:37 +01:00
commit e06ffa51a3
5 changed files with 26 additions and 1 deletions

View file

@ -1,5 +1,6 @@
POSTGRES_PORT=5432 POSTGRES_PORT=5432
EXPRESS_PORT=3000 EXPRESS_PORT=3000
FRONTEND_PORT=8080
POSTGRES_USER=postgres POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres POSTGRES_PASSWORD=postgres

View file

@ -21,3 +21,13 @@ services:
ports: ports:
- "${EXPRESS_PORT}:3000" - "${EXPRESS_PORT}:3000"
vue:
build: frontend
container_name: frontend
ports:
- "${FRONTEND_PORT}:8080"
volumes:
- ./frontend:/app

3
frontend/.dockerignore Normal file
View file

@ -0,0 +1,3 @@
node_modules
.gitignore
README.md

11
frontend/Dockerfile Normal file
View file

@ -0,0 +1,11 @@
FROM node:18
COPY . /app
WORKDIR /app
RUN npm install
EXPOSE 8080
ENTRYPOINT ["npm", "run", "serve"]

View file

@ -1,7 +1,7 @@
<template> <template>
<h2>Enter a username</h2> <h2>Enter a username</h2>
<div class="form-floating mb-3"> <div class="form-floating mb-3">
<input type="email" class="form-control" id="floatingInput" placeholder="example name" v-model="username"> <input class="form-control" id="floatingInput" placeholder="example name" v-model="username">
<label for="floatingInput">Username</label> <label for="floatingInput">Username</label>
<RRButton @click="setUser()" text="Confirm"></RRButton> <RRButton @click="setUser()" text="Confirm"></RRButton>
</div> </div>