diff --git a/.gitignore b/.gitignore
index 683333d..6bc9946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.DS_Store
node_modules
-/dist
+dist
coverage
/tests/e2e/videos/
diff --git a/client/Dockerfile b/client/Dockerfile
index 939a4a3..97380b9 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -8,6 +8,6 @@ RUN npm run build
# production stage
FROM nginx:stable-alpine as production-stage
-COPY --from=build-stage /app/public /usr/share/nginx/html
+COPY --from=build-stage /app/dist /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
deleted file mode 100644
index df36fcf..0000000
Binary files a/client/public/favicon.ico and /dev/null differ
diff --git a/client/public/index.html b/client/public/index.html
deleted file mode 100644
index 517ed81..0000000
--- a/client/public/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
- HETIC vs EEMI
-
-
-
-
-
-
-
diff --git a/client/public/manifest.json b/client/public/manifest.json
deleted file mode 100644
index c094e9c..0000000
--- a/client/public/manifest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "api-directory",
- "short_name": "api-directory",
- "icons": [
- {
- "src": "./img/icons/android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "./img/icons/android-chrome-512x512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ],
- "start_url": "./index.html",
- "display": "standalone",
- "background_color": "#000000",
- "theme_color": "#4DBA87"
-}
diff --git a/client/public/robots.txt b/client/public/robots.txt
deleted file mode 100644
index eb05362..0000000
--- a/client/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:
diff --git a/client/src/router.ts b/client/src/router.ts
index 50085c3..37eeef5 100644
--- a/client/src/router.ts
+++ b/client/src/router.ts
@@ -9,7 +9,7 @@ export default new Router({
base: process.env.BASE_URL,
routes: [
{
- path: '*',
+ path: '/',
name: 'home',
component: Home,
},
diff --git a/docker-compose.yml b/docker-compose.yml
index 7db8365..f0d0576 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
container_name: hve_client
restart: on-failure
build:
- context: .
+ context: ./client
dockerfile: ./Dockerfile
volumes:
- ./client/nginx.conf:/etc/nginx/conf.d/default.conf:ro
@@ -13,7 +13,9 @@ services:
- NODE_ENV=production
networks:
- default
- - web
+ #- web
+ ports:
+ - 8080:80
command: ['nginx', '-g', 'daemon off;']
# labels:
# - 'traefik.docker.network=web'
@@ -36,19 +38,17 @@ services:
restart: on-failure
image: node:8
build:
- context: .
- dockerfile: ./server/Dockerfile
- env_file:
- - .env
+ context: ./server
+ dockerfile: ./Dockerfile
environment:
- NODE_ENV=production
ports:
- '3000:3000'
networks:
- default
- - postgres
- command: ['node', '/api/server/index.js']
+ #- web
+ command: ['node', 'index.js']
-networks:
- web:
- external: true
+#networks:
+# web:
+# external: true
diff --git a/server/Dockerfile b/server/Dockerfile
index 76dd737..2014d4a 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /api
COPY ./package-lock.json .
COPY ./package.json .
-COPY ./server ./server
+COPY . .
# Build
RUN npm install --prefix /api