@dssp/dcsp 1.0.0-alpha.0 → 1.0.0-alpha.1

package/.dockerignore

@@ -1,13 +1,31 @@
-node_modules
-installer
-Dockerfile
-logs
+node_modules/
+client/
+server/
+dist-client/
+installer/
+attachments/
+cache/
+logs/
+Dockerfile*
 docker-compose.yml
 db.sqlite
 db*.sqlite
 license.json
-attachments
 config.development.js
 config.production.js
 !config/config.development.js
-!config/config.production.js
+!config/config.production.js
+\_index.html
+
+npm-debug.log
+yarn-error.log
+
+.env
+.env.local
+.env.production
+.git/
+.gitignore
+.dockerignore
+.vscode/
+.idea/
+.DS_Store

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/dcsp",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -39,9 +39,9 @@
     "docker:push": "docker image push hatiolab/dcsp:latest && docker image push hatiolab/dcsp:$npm_package_version"
   },
   "dependencies": {
-    "@dssp/building-complex": "^1.0.0-alpha.0",
-    "@dssp/project": "^1.0.0-alpha.0",
-    "@dssp/supervision": "^1.0.0-alpha.0",
+    "@dssp/building-complex": "^1.0.0-alpha.1",
+    "@dssp/project": "^1.0.0-alpha.1",
+    "@dssp/supervision": "^1.0.0-alpha.1",
     "@material/web": "^2.1.0",
     "@operato/chart": "^8.0.0-beta",
     "@operato/gantt": "^8.0.0-beta",
@@ -93,5 +93,5 @@
   "devDependencies": {
     "@things-factory/builder": "^8.0.0-beta"
   },
-  "gitHead": "7b8b1a1ab63177487b30c0acb7f2cbc82afe6a0e"
+  "gitHead": "8c26a413785d48f6b51df56968b77d711305a84c"
 }

package/installer/config.production.js

@@ -1,40 +0,0 @@
-module.exports = {
-  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dAC95', // should be changed
-  email: {
-    host: 'smtp.office365.com', // your sender-email smtp host
-    port: 587, // smtp server port
-    secure: false, // true for 465, false for other ports
-    auth: {
-      user: 'your sender-email',
-      pass: 'your sender-email password' // generated ethereal password
-    },
-    secureConnection: false,
-    tls: {
-      ciphers: 'SSLv3'
-    }
-  },
-  logger: {
-    file: {
-      filename: 'logs/application-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      zippedArchive: false,
-      maxSize: '20m',
-      maxFiles: '2d',
-      level: 'info'
-    },
-    console: {
-      level: 'silly'
-    }
-  },
-  ormconfig: {
-    name: 'default',
-    type: 'postgres',
-    host: 'postgres',
-    port: 5432,
-    database: 'postgres',
-    username: 'postgres',
-    password: 'abcd1234',
-    synchronize: true,
-    logging: true
-  }
-}

package/installer/docker-compose.yml

@@ -1,42 +0,0 @@
-version: '3'
-services:
-  nginx:
-    image: hatiolab/operato-nginx:latest
-    ports:
-      - ${HostPort}:80
-    depends_on:
-      - app
-  app:
-    build: .
-    container_name: dcsp
-    image: hatiolab/dcsp:latest
-    privileged: true
-    volumes:
-      - ./logs:/app/logs
-      - ./config.production.js:/app/config.production.js
-    ports:
-      - 4000:3000
-    depends_on:
-      - postgres
-      - mosquitto
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '100m'
-        max-file: '3'
-  postgres:
-    image: postgres:13.2
-    container_name: db-dcsp
-    environment:
-      POSTGRES_PASSWORD: abcd1234
-      POSTGRES_USER: postgres
-      PGDATA: /var/lib/postgresql/data/pgdata
-    volumes:
-      - ./postgres_data:/var/lib/postgresql/data/pgdata
-    ports:
-      - '55432:5432'
-  mosquitto:
-    image: eclipse-mosquitto:latest
-    ports:
-      - 1883:1883
-      - 9001:9001

package/installer/install.sh

@@ -1,54 +0,0 @@
-if [ -f "config.production.js" ] ; then
-  echo "config.production.js exist"
-else
-  echo "config.production.js create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/config.production.js
-fi
-
-if [ -f "start.sh" ] ; then
-  echo "start.sh exist"
-else
-  echo "start.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/start.sh
-fi
-
-if [ -f "stop.sh" ] ; then
-  echo "stop.sh exist"
-else
-  echo "stop.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/stop.sh
-fi
-
-if [ -f "upgrade.sh" ] ; then
-  echo "upgrade.sh exist"
-else
-  echo "upgrade.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/upgrade.sh
-fi
-
-if [ -f "migrate.sh" ] ; then
-  echo "migrate.sh exist"
-else
-  echo "migrate.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/migrate.sh
-fi
-
-if [ -f "docker-compose.yml" ] ; then
-  echo "docker-compose.yml exist"
-else
-  echo "docker-compose.yml create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/docker-compose.yml
-fi
-
-chmod u+x start.sh
-chmod u+x stop.sh
-chmod u+x upgrade.sh
-chmod u+x migrate.sh
-
-echo "HostPort=3000" > .env
-
-docker pull hatiolab/dcsp:latest
-
-docker pull hatiolab/operato-nginx:latest
-
-docker-compose create

package/installer/migrate.sh

@@ -1 +0,0 @@
-docker exec -it dcsp npm run migration -- --mode=production

package/installer/start.sh

@@ -1,18 +0,0 @@
-HOST_PORT=3000
-
-if [ $# -eq 0 ] ; then
-  echo "Warning: default port 3000"
-else
-  HOST_PORT=$1
-fi
-
-
-echo "HOST_PORT : ${HOST_PORT}"
-
-echo "HostPort="$HOST_PORT > .env
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    xhost +"local:docker@"
-fi
-
-docker-compose up -d

package/installer/stop.sh

@@ -1 +0,0 @@
-docker-compose stop

package/installer/upgrade.sh

@@ -1 +0,0 @@
-curl -fsSL https://raw.githubusercontent.com/things-factory/things-factory/master/packages/dcsp/installer/install.sh | bash -s