Merge branch 'dev'

Author: Ben Huang

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["next/babel"],
+  "plugins": []
+}

.env

@@ -0,0 +1,4 @@
+POSTGRES_PORT=5432
+POSTGRES_NAME=docketeer-db
+POSTGRES_USER=postgres
+POSTGRES_PASS=postgres

.eslintrc.js

@@ -1,62 +1,64 @@
-// module.exports = {
-//   env: {
-//     browser: true,
-//     commonjs: true,
-//     es2021: true,
-//     node: true,
-//   },
-//   plugins: ['react', '@typescript-eslint'],
-//   extends: [
-//     'eslint:recommended',
-//     'plugin:react/recommended',
-//     'plugin:@typescript-eslint/recommended',
-//   ],
-//   ignorePatterns: ['.eslintrc.js', '*.config.js', 'dist/*', '__tests__/*'],
-//   overrides: [],
-//   parserOptions: {
-//     ecmaVersion: 12,
-//     sourceType: 'module',
-//   },
-//   settings: {
-//     react: {
-//       version: 'detect',
-//     },
-//   },
-//   rules: {
-//     indent: ['warn', 2],
-//     'no-unused-vars': ['off', { vars: 'local' }],
-//     'prefer-const': 'warn',
-//     quotes: ['warn', 'single'],
-//     semi: ['warn', 'always'],
-//     'space-infix-ops': 'warn',
-//     'no-console': 'off',
-//     'no-restricted-syntax': [
-//       'error',
-//       {
-//         selector:
-//           "CallExpression[callee.object.name='console'][callee.property.name!=/^(log|warn|error|info|trace)$/]",
-//         message: 'Unexpected property on console object was called',
-//       },
-//     ],
-//     'spaced-comment': [
-//       'error',
-//       'always',
-//       {
-//         line: {
-//           markers: ['/'],
-//           exceptions: ['-', '+'],
-//         },
-//         block: {
-//           markers: ['!'],
-//           exceptions: ['*'],
-//           balanced: true,
-//         },
-//       },
-//     ],
-//
-//     // ---- TYPESCRIPT ---- //
-//     '@typescript-eslint/explicit-function-return-type': 'off',
-//     '@typescript-eslint/no-unused-vars': 'error',
-//     '@typescript-eslint/semi': ['warn', 'always'],
-//   },
-// };
+module.exports = {
+  env: {
+    browser: true,
+    commonjs: true,
+    es2021: true,
+    node: true,
+  },
+  plugins: ['react', '@typescript-eslint'],
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['.eslintrc.js', '*.config.js', 'dist/*', '__tests__/*'],
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: 12,
+    sourceType: 'module',
+  },
+  settings: {
+    react: {
+      version: 'detect',
+    },
+  },
+  rules: {
+    indent: ['warn', 2],
+    'no-unused-vars': ['off', { vars: 'local' }],
+    'prefer-const': 'warn',
+    quotes: ['warn', 'single'],
+    semi: ['warn', 'always'],
+    'space-infix-ops': 'warn',
+    'no-console': 'off',
+    'no-restricted-syntax': [
+      'error',
+      {
+        selector:
+          "CallExpression[callee.object.name='console'][callee.property.name!=/^(log|warn|error|info|trace)$/]",
+        message: 'Unexpected property on console object was called',
+      },
+    ],
+    'spaced-comment': [
+      'error',
+      'always',
+      {
+        line: {
+          markers: ['/'],
+          exceptions: ['-', '+'],
+        },
+        block: {
+          markers: ['!'],
+          exceptions: ['*'],
+          balanced: true,
+        },
+      },
+    ],
+
+    // ---- TYPESCRIPT ---- //
+    // '@typescript-eslint/no-explicit-any': ['error'],
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/no-unused-vars': 'error',
+    '@typescript-eslint/semi': ['warn', 'always'],
+  },
+};

.gitignore

@@ -9,10 +9,10 @@ yarn.lock
 src/database/docketeerdb
 server/database/docketeerdb
 dist/
-security/
-.env
 
 coverage/
 
 out/
-docketeerdb
+docketeerdb
+imageConfigs/grafana/data/
+imageConfigs/grafana/data/grafana.db

.vscode/settings.json

@@ -4,7 +4,8 @@
   "editor.formatOnSave": true,
   "editor.formatOnPaste": true,
   "editor.formatOnType": true,
-   "editor.codeActionsOnSave": {
+  "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
-  }
-}
+  },
+  "editor.acceptSuggestionOnEnter": "off"
+}

assets/dlogo-no-bg.png

@@ -0,0 +1,95 @@
+version: '3.8'
+services:
+  db:
+    container_name: docketeerdb
+    image: docketeerxi/postgres
+    restart: always
+    ports:
+      - '${POSTGRES_PORT}:5432'
+    volumes:
+      - ./imageConfigs/postgres/docketeerdb:/var/lib/postgresql/data/
+
+    environment:
+      POSTGRES_DB: ${POSTGRES_NAME}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASS}
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:v0.47.1
+    container_name: cadvisor
+    ports:
+      - '8080:8080'
+
+    volumes:
+      - /:/rootfs:ro
+      - /var/run/docker.sock:/var/run/docker.sock:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /etc/machine-id:/etc/machine-id:ro
+
+    labels:
+      org_prometheus_starter: 'true'
+      org_prometheus_starter_path: '/metrics'
+
+  node-exporter:
+    image: docketeerxi/nodeex
+    container_name: node-exporter
+    ports:
+      - '9100:9100'
+    volumes:
+      #system info for linux machines
+      - /proc:/host/proc:ro
+      # also for linux
+      - /sys:/host/sys:ro
+      #root
+      - /:/rootfs:ro
+    depends_on:
+      - db
+
+  prometheus:
+    image: docketeerxi/prometheus
+    container_name: prometheus
+    ports:
+      - '9090:9090'
+
+    #can add volume here to persist the prometheus data.
+    depends_on:
+      - node-exporter
+    labels:
+      org_prometheus_starter: 'true'
+      org_prometheus_starter_port: '9090'
+      org_prometheus_starter_path: '/metrics'
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    ports:
+      - 2999:3000
+    environment:
+      GF_PATHS_CONFIG: /etc/grafana/grafana.ini
+      GF_AUTH_ANONYMOUS_ENABLED: 'true'
+
+    volumes:
+      - ./imageConfigs/grafana/data:/var/lib/grafana
+      - ./imageConfigs/grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards
+      - ./imageConfigs/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./imageConfigs/grafana/grafana.ini:/etc/grafana/grafana.ini
+      - ./imageConfigs/grafana/plugins:/var/lib/grafana/plugins
+
+    depends_on:
+      - prometheus
+  dev:
+    image: docketeerxi/docketeer-dev
+    container_name: docketeer-dev
+    build:
+      dockerfile: dockerfile-dev
+    ports:
+      - 4000:4000
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./:/app
+      - node_modules:/app/node_modules
+    command: npm run dev
+
+volumes:
+  node_modules:

docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
   db:
     container_name: docketeerdb
-    image: docketeerx/postgres
+    image: docketeerxi/postgres
     restart: always
     ports:
       - '${POSTGRES_PORT}:5432'
@@ -14,6 +14,9 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASS}
 
+    # networks:
+    #   - my-network
+
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.47.1
     container_name: cadvisor
@@ -31,8 +34,11 @@ services:
       org_prometheus_starter: 'true'
       org_prometheus_starter_path: '/metrics'
 
+    # networks:
+    #   - my-network
+
   node-exporter:
-    image: docketeerx/nodeex
+    image: docketeerxi/nodeex
     container_name: node-exporter
     ports:
       - '9100:9100'
@@ -45,9 +51,11 @@ services:
       - /:/rootfs:ro
     depends_on:
       - db
+    # networks:
+    #   - my-network
 
   prometheus:
-    image: docketeerx/prometheus
+    image: docketeerxi/prometheus
     container_name: prometheus
     ports:
       - '9090:9090'
@@ -59,6 +67,8 @@ services:
       org_prometheus_starter: 'true'
       org_prometheus_starter_port: '9090'
       org_prometheus_starter_path: '/metrics'
+    # networks:
+    #   - my-network
 
   grafana:
     image: grafana/grafana:latest
@@ -76,15 +86,31 @@ services:
       - ./imageConfigs/grafana/grafana.ini:/etc/grafana/grafana.ini
       - ./imageConfigs/grafana/plugins:/var/lib/grafana/plugins
 
+    # networks:
+    #   - my-network
+
     depends_on:
       - prometheus
 
   docketeer:
-    image: docketeerx/docketeer
+    image: docketeerxi/docketeer
     container_name: docketeer
     ports:
       - 4000:4000
+      - 3000:3000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    command: npm run dev
+    # networks:
+    #   - my-network
     # depends_on:
     #   - grafana
+
+# networks:
+#   my-network:
+#     driver: bridge
+#     driver_opts:
+#       com.docker.network.bridge.name: my-bridge
+#       com.docker.network.bridge.enable_icc: "true"
+#       subnet: "172.16.238.0/24"
+#       gateway: "172.16.238.1"

docker-compose.yml

@@ -21,8 +21,7 @@ COPY . .
 
 # Make port 4000 available to the world outside this container
 EXPOSE 4000
+# EXPOSE 3000
 
 # Start the app
 CMD ["npm", "start"]
-
-

dockerfile

@@ -0,0 +1,30 @@
+# Use an official Node.js runtime as a parent image
+FROM node
+# Set the working directory to /app
+WORKDIR /app
+
+COPY package*.json ./
+
+# Run npm install to install app dependencies
+RUN npm install
+
+# Set the PATH env variable
+# ENV PATH="/usr/local/bin:${PATH}"
+# COPY /usr/local/bin/docker /usr/local/bin/docker
+ENV DOCKERVERSION=19.03.12
+
+RUN curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz \
+  && tar xzvf docker-${DOCKERVERSION}.tgz --strip 1 -C /usr/local/bin docker/docker \
+  && rm docker-${DOCKERVERSION}.tgz
+
+# Copy the current directory contents into the container at /app
+COPY . .
+
+# Make port 4000 available to the world outside this container
+EXPOSE 4000
+# EXPOSE 3000
+
+# Start the app
+# CMD ["npm", "run", "dev"]
+# attempt to hot load (though not hot module reloading)
+# CMD ["nodemon", "--watch", "/usr/src/app", "--exec", "ts-node", "/usr/src/renderer/index.tsx"]