Merge pull request #188 from careerfairsystems/antd-upgrade

Flow and antd upgrade

.devcontainer/Dockerfile

@@ -0,0 +1,43 @@
+# Update the VARIANT arg in docker-compose.yml to pick an Elixir version: 1.9, 1.10, 1.10.4
+FROM debian:latest
+
+# This Dockerfile adds a non-root user with sudo access. Update the “remoteUser” property in
+# devcontainer.json to use it. More info: https://aka.ms/vscode-remote/containers/non-root-user.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Options for common package install script
+ARG INSTALL_ZSH="true"
+ARG UPGRADE_PACKAGES="true"
+ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/v0.177.0/script-library/common-debian.sh"
+ARG COMMON_SCRIPT_SHA="b9a71d258921a0ac47dfcf551f8fde87e18d7d5844a10dd018d81587b2569f0b"
+
+# Settings for installing Node.js.
+ARG NODE_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/node-debian.sh"
+ARG NODE_SCRIPT_SHA="dev-mode"
+ARG VARIANT="lts/*"
+ENV NVM_DIR=/usr/local/share/nvm
+ENV NVM_SYMLINK_CURRENT=true
+ENV PATH=${NVM_DIR}/current/bin:${PATH}
+
+# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
+RUN apt-get update \
+  && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends curl ca-certificates 2>&1 \
+  && curl -sSL ${COMMON_SCRIPT_SOURCE} -o /tmp/common-setup.sh \
+  && ([ "${COMMON_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/common-setup.sh" | sha256sum -c -)) \
+  && /bin/bash /tmp/common-setup.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
+  #
+  # Install Node.js for use with web applications
+  && curl -sSL ${NODE_SCRIPT_SOURCE} -o /tmp/node-setup.sh \
+  && ([ "${NODE_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/node-setup.sh" | sha256sum -c -)) \
+  && /bin/bash /tmp/node-setup.sh "${NVM_DIR}" "${VARIANT}" "${USERNAME}" \
+  #
+  # Install dependencies
+  && apt-get install -y build-essential \
+  #
+  # Clean up
+  && apt-get autoremove -y \
+  && apt-get clean -y \
+  && rm -rf /var/lib/apt/lists/* /tmp/common-setup.sh /tmp/node-setup.sh

.devcontainer/devcontainer.json

@@ -0,0 +1,24 @@
+{
+	"name": "nexpo-web",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspace",
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"dbaeumer.vscode-eslint",
+		"esbenp.prettier-vscode",
+		"flowtype.flow-for-vscode"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	//"forwardPorts": [3000],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "yarn install",
+
+	"postStartCommand": "yarn start",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        VARIANT: "12"
+
+    volumes:
+      - ..:/workspace:cached
+
+    network_mode: host
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity

.env.development

@@ -1 +1,2 @@
 # Put environment variables for development as REACT_APP_<env> here.
+REACT_APP_STUDENT_SESSION_ENABLED='true'

.env.test

@@ -0,0 +1,2 @@
+# Put environment variables for development as REACT_APP_<env> here.
+REACT_APP_STUDENT_SESSION_ENABLED='true'

.eslintrc.json

@@ -11,10 +11,7 @@
     "plugin:react/recommended",
     "plugin:flowtype/recommended",
     "airbnb",
-    "prettier",
-    "prettier/flowtype",
-    "prettier/react",
-    "prettier/standard"
+    "prettier"
   ],
   "plugins": ["react", "flowtype", "prettier"],
   "rules": {
@@ -31,7 +28,20 @@
         "components": ["Link"],
         "specialLink": ["to"]
       }
-    ]
+    ],
+    "react/jsx-props-no-spreading": 0,
+    "react/prop-types": 0,
+    "react/require-default-props": 0,
+    "no-unused-vars": 0,
+    "react/default-props-match-prop-types": 0,
+    "react/destructuring-assignment": 0,
+    "arrow-body-style": 0,
+    "no-shadow": 0,
+    "spaced-comment": 0,
+    "import/no-cycle": 0,
+    "import/prefer-default-export": 0,
+    "global-require": 0,
+    "prefer-destructuring": 0
   },
   "settings": {
     "import/resolver": {

.flowconfig

@@ -1,6 +1,21 @@
 [ignore]
 .*/node_modules/.*
 .*/build/.*
+!.*/node_modules/redux-form/.*
+!.*/node_modules/antd/.*
+!.*/node_modules/@ant-design/.*
+.*/node_modules/antd/lib/index.js
+.*/node_modules/@ant-design/icons/lib/index.js
+.*/node_modules/@ant-design/compatible/lib/index.js
+.*/node_modules/redux-form/lib/FormName.js
+.*/node_modules/redux-form/lib/FormSection.js
+.*/node_modules/redux-form/lib/createReduxForm.js
+.*/node_modules/redux-form/lib/defaultShouldAsyncValidate.js
+.*/node_modules/redux-form/lib/defaultShouldError.js
+.*/node_modules/redux-form/lib/defaultShouldValidate.js
+.*/node_modules/redux-form/lib/defaultShouldWarn.js
+.*/node_modules/redux-form/lib/immutable.js
+.*/node_modules/redux-form/lib/index.js
 .*/coverage/.*
 [include]
 
@@ -25,4 +40,4 @@ suppress_type=$FlowFixMe
 [strict]
 
 [version]
-^0.93.0
+^0.148.0

.gitignore

@@ -1,7 +1,8 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
-# dependencies
+# Package management
 /node_modules
+yarn-error.log
 
 # testing
 /coverage
@@ -18,6 +19,7 @@ src/**/*.css
 .env.development.local
 .env.test.local
 .env.production.local
+
 # flow-types
 /flow-typed
 npm-debug.log*

.travis.yml

@@ -8,4 +8,4 @@ before_install:
 install:
   - yarn
 script:
-  - yarn test
+  - yarn test

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}