Creating Landing Page for DRI

.gitignore

@@ -43,6 +43,7 @@ __pycache__
 /api/db
 *.coverage
 .env
+
 # Diretórios do Postgresql
 /pg_data
 /pg_backup

api/common/views.py

@@ -17,7 +17,6 @@
 import django_filters
 from rest_framework import filters
 from rest_framework.authtoken.models import Token
-from django.conf import settings
 import requests
 from urllib.parse import urljoin
 from django_filters.rest_framework import DjangoFilterBackend

api/interfaces/views.py

@@ -17,7 +17,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
 
     filter_fields = ('id', 'app_name')
 
-    ordering_fields = ('id', 'app_name')
+    ordering_fields = ('id', 'app_name', 'app_order')
 
 
 class TutorialFilter(django_filters.FilterSet):

docker-compose-development.yml

@@ -94,13 +94,22 @@ services:
     depends_on:
       - sky
 
-  # eyeballing:
-  #   build: ./frontend/eyeballing
-  #   volumes:
-  #     - ./frontend/eyeballing/:/app
-  #   working_dir: /app
-  #   command: yarn start
+  eyeballing:
+    image: node:10-alpine
+    working_dir: /app
+    volumes:
+      - ./frontend/eyeballing:/app
+    stdin_open: true
+    command: yarn start 
 
+  landingpage:
+    image: node:10-alpine
+    working_dir: /app
+    volumes:
+      - ./frontend/landing_page:/app
+    stdin_open: true
+    command: yarn start
+
   nginx:
     build: ./frontend
     ports:

frontend/Dockerfile

@@ -31,10 +31,15 @@ WORKDIR /code/userquery
 RUN /opt/Sencha/sencha app build production
 
 # Build ReactJS Apps
-FROM node:10-alpine as react_apps
+FROM node:10-alpine as eyeballing
 WORKDIR /app
 COPY ./eyeballing .
-# RUN yarn -v && yarn --ignore-optional
+RUN yarn -v && yarn 
+RUN yarn run build
+
+FROM node:10-alpine as landingpage
+WORKDIR /app
+COPY ./landing_page .
 RUN yarn -v && yarn 
 RUN yarn run build
 
@@ -59,6 +64,9 @@ RUN sed --regexp-extended --in-place=.bak 's%^pid\s+/var/run/nginx.pid;%pid /var
 COPY --from=sencha_apps /code/build/production /var/www/
 
 # Add eyeballing React App to image
-COPY --from=react_apps /app/build /var/www/eyeballing
+COPY --from=eyeballing /app/build /var/www/eyeballing
+
+# Add Landing Page React App to image
+COPY --from=landingpage /app/build /var/www/landing_page
 
 USER nginx

frontend/landing_page/.env.development

@@ -0,0 +1,2 @@
+REACT_APP_API=//localhost
+REACT_APP_INSTANCE=Developer

frontend/landing_page/.env.production

@@ -0,0 +1,2 @@
+REACT_APP_API=
+REACT_APP_INSTANCE=Production

frontend/landing_page/.eslintignore

@@ -0,0 +1,2 @@
+src/serviceWorker.js
+src/services/api.js

frontend/landing_page/.eslintrc.js

@@ -0,0 +1,28 @@
+module.exports = {
+  parser: 'babel-eslint',
+  env: {
+    browser: true,
+    es6: true,
+  },
+  extends: 'airbnb',
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  plugins: [
+    'react',
+  ],
+  rules: {
+    'react/jsx-filename-extension': [1, {
+      extensions: ['.js', '.jsx']
+    }],
+    'react/jsx-props-no-spreading': 0,
+  }
+};

frontend/landing_page/.gitignore

@@ -0,0 +1,25 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.env
+docker-compose.yml

frontend/landing_page/Dockerfile

@@ -0,0 +1,4 @@
+FROM node:10-alpine
+WORKDIR /app
+COPY . /app
+RUN yarn -v && yarn