Issue 1366 - Slack integrations [ Siblings Check ]

.eslintignore

@@ -1,7 +1,3 @@
-# Ignore Gatsby Top Layout Plugin
-src/frontend/gatsby/plugins/gatsby-plugin-top-layout
-# Ignore generated folders in Gatsby
-src/frontend/gatsby/public
-src/frontend/gatsby/.cache
-# We run eslint directly in the next frontend with its own config
-src/frontend/next/.next
+# Ignore the build directories for next
+src/web/out
+src/web/.next

.eslintrc.js

@@ -18,16 +18,20 @@ module.exports = {
   plugins: ['prettier', 'promise', 'react', 'react-hooks'],
   settings: {
     react: {
-      version: '16.13',
+      version: 'detect',
     },
   },
   overrides: [
     // TypeScript for Next.js
     {
-      files: ['src/frontend/next/**/*.ts', 'src/frontend/next/**/*.tsx'],
+      files: ['src/web/**/*.ts', 'src/web/**/*.tsx'],
       plugins: ['@typescript-eslint'],
+      env: {
+        browser: true,
+      },
       rules: {
         'react/prop-types': 'off',
+        'react/require-default-props': 'off',
         'react/react-in-jsx-scope': 'off',
         '@typescript-eslint/no-unused-vars': 'error',
         'react/jsx-filename-extension': ['error', { extensions: ['.ts', '.tsx'] }],
@@ -45,24 +49,9 @@ module.exports = {
       },
     },
 
-    // JavaScript for Gatsby
-    {
-      files: ['src/frontend/gatsby/**/*.js', 'src/frontend/gatsby/**/*.jsx'],
-      env: { node: true, browser: true, jest: true },
-      rules: {
-        'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
-        'react/jsx-uses-react': 'error',
-        'react/forbid-prop-types': 'off',
-        'react/require-default-props': 'off',
-        'import/extensions': 'off',
-        'no-use-before-define': 'off',
-        '@typescript-eslint/no-use-before-define': 'off',
-      },
-    },
-
     // JavaScript for Node.js
     {
-      files: ['src/backend/**/*.js', 'src/tools/**/*.js'],
+      files: ['src/backend/**/*.js', 'tools/**/*.js', 'src/api/**/*.js'],
       env: {
         node: true,
       },
@@ -131,20 +120,10 @@ module.exports = {
      * https://eslint.org/docs/rules/func-names
      */
     'linebreak-style': 'off',
-    /**
-     * The following are eslint rules from the promise-plugin
-     * https://github.com/xjamundx/eslint-plugin-promise
-     */
-    /**
-     * Prefer wait to then() for reading Promise values
-     */
-    'promise/prefer-await-to-then': 'warn',
 
     /**
-     * Prefer async/await to the callback pattern
+     * Prevent variables used in JSX to be incorrectly marked as unused
      */
-    'promise/prefer-await-to-callbacks': 'warn',
-
     'react/jsx-uses-vars': 'error',
 
     /**

.github/dependabot.yml

@@ -0,0 +1,55 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Root package.json
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      # Use Eastern Standard Time (UTC -05:00)
+      timezone: 'America/Toronto'
+    open-pull-requests-limit: 1
+    commit-message:
+      prefix: 'chore: '
+    reviewers:
+      - 'Seneca-CDOT/telescope-maintainers'
+    labels:
+      - 'dependencies'
+    # Disable automatic rebasing
+    rebase-strategy: 'disabled'
+
+  # Next Front-End
+  - package-ecosystem: 'npm'
+    directory: '/src/web'
+    schedule:
+      interval: 'weekly'
+      timezone: 'America/Toronto'
+    open-pull-requests-limit: 1
+    commit-message:
+      prefix: 'chore: '
+    reviewers:
+      - 'Seneca-CDOT/telescope-maintainers'
+    labels:
+      - 'dependencies'
+      - 'area: nextjs'
+    rebase-strategy: 'disabled'
+
+  # Auto-deployment Server
+  - package-ecosystem: 'npm'
+    directory: '/tools/autodeployment'
+    schedule:
+      interval: 'weekly'
+      timezone: 'America/Toronto'
+    open-pull-requests-limit: 1
+    commit-message:
+      prefix: 'chore: '
+    reviewers:
+      - 'Seneca-CDOT/telescope-maintainers'
+    labels:
+      - 'dependencies'
+      - 'area: autodeployment'
+    rebase-strategy: 'disabled'

.github/workflows/node-js-ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node-version: [12.x]
+        node-version: [12.x, 14.x]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Create Release
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+' # Push events to any matching semantic tag. For example, 1.10.1 or 2.0.0.
+        # For more details, see https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+        # and https://docs.npmjs.com/about-semantic-versioning
+
+jobs:
+  build:
+    runs-on: ${{matrix.os}}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        node-version: [12.x, 14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Test
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - run: npm install
+      - run: cp env.example .env
+      - run: npm run test
+  Prettier-Check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+      - run: npm install && npm run prettier-check
+  Lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+      - run: npm install && npm run eslint
+  release:
+    needs: [build, Prettier-Check, Lint]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Changelog
+        uses: scottbrenner/generate-changelog-action@master
+        id: Changelog
+        env:
+          REPO: ${{ github.repository }}
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            ${{ steps.Changelog.outputs.changelog }}
+          draft: false
+          prerelease: false

.npmrc

@@ -5,3 +5,9 @@ save-exact=true
 
 # Allow running postinstall script in Docker
 unsafe-perm=true
+
+# Set empty tag version prefix
+tag-version-prefix=""
+
+#Set legacy peer dependencies to 'true', (needed for npm7.x compatibility for now)
+legacy-peer-deps=true

.prettierignore

@@ -3,6 +3,6 @@ package-lock.json
 node_modules/
 coverage/
 certs
-public
 .cache
 .next
+out

Dockerfile

@@ -14,9 +14,7 @@
 FROM node:lts-alpine as build
 
 # Tini Entrypoint for Alpine
-# These modules are needed to build mozjpeg
-RUN apk add autoconf automake nasm libtool gcc make g++ tiff jpeg zlib zlib-dev pkgconf file musl-dev
-# util-linux required by gatsby to optimize builds using multiple cores
+# util-linux required to optimize builds using multiple cores
 RUN apk add --no-cache tini util-linux
 ENTRYPOINT [ "/sbin/tini", "--"]
 
@@ -26,7 +24,7 @@ WORKDIR "/telescope"
 # Copy package.jsons for each service
 COPY package.json .
 COPY .env .
-COPY ./src/frontend/gatsby/package.json ./src/frontend/gatsby/package.json
+COPY ./src/web/package.json ./src/web/package.json
 
 # -------------------------------------
 # Context: Dependencies
@@ -39,13 +37,13 @@ FROM build AS backend_dependencies
 RUN npm install --only=production --no-package-lock --ignore-scripts
 
 FROM backend_dependencies as frontend_dependencies
-RUN cd ./src/frontend/gatsby && npm install --no-package-lock
+RUN cd ./src/web && npm install --no-package-lock
 
 # -------------------------------------
 # Context: Front-end Builder
 FROM frontend_dependencies as builder
 
-COPY ./src/frontend/gatsby ./src/frontend/gatsby
+COPY ./src/web ./src/web
 COPY ./.git ./.git
 
 RUN npm run build
@@ -56,7 +54,7 @@ FROM build AS release
 
 # GET production code from previous containers
 COPY --from=backend_dependencies /telescope/node_modules /telescope/node_modules
-COPY --from=builder /telescope/src/frontend/gatsby/public /telescope/src/frontend/gatsby/public
+COPY --from=builder /telescope/src/web/out /telescope/src/web/out
 COPY --from=builder /telescope/.git /telescope/.git
 COPY ./src/backend ./src/backend
 

README.md

@@ -1,4 +1,4 @@
-# Telescope <img align="left" width="150" height="150" src=https://github.com/Seneca-CDOT/telescope/blob/master/src/frontend/gatsby/src/images/logo.svg>
+# Telescope <img align="left" width="150" height="150" src=https://github.com/Seneca-CDOT/telescope/blob/master/src/web/public/logo.svg>
 
 [![CircleCI](https://circleci.com/gh/Seneca-CDOT/telescope.svg?style=svg)](https://circleci.com/gh/Seneca-CDOT/telescope)
 [![js-airbnb/prettier-style](https://img.shields.io/badge/code%20style-airbnb%2Fprettier-blue)](https://github.com/airbnb/javascript)

bin/services-clean.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+const { clean } = require('../tools/services');
+
+clean();

bin/services-logs.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+const { logs } = require('../tools/services');
+
+// Pass the names of services to show logs. At least one is required
+const argv = process.argv.slice(3);
+logs(argv);

bin/services-start.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+const { start } = require('../tools/services');
+
+// Pass the names of services to start, or none to start all
+const argv = process.argv.slice(3);
+start(argv);

bin/services-stop.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+const { stop } = require('../tools/services');
+
+stop();

docker-compose-production.yml

@@ -31,7 +31,7 @@ services:
       - elasticsearch
     volumes:
       # Volume to be shared with nginx for serving static content
-      - static:/telescope/src/frontend/gatsby/public
+      - static:/telescope/src/web/out
       # Volume to be shared for log rotation
       - rotate:/telescope/log
     restart: always