Merge branch 'user_interaction' into develop

# Conflicts:
#	web/src/components/js/const.js

cms/.editorconfig

+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

cms/.env.example

+HOST=0.0.0.0
+PORT=1337

cms/.eslintignore

+.cache
+build
+**/node_modules/**

cms/.eslintrc

+{
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "env": {
+    "commonjs": true,
+    "es6": true,
+    "node": true,
+    "browser": false
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": false
+    },
+    "sourceType": "module"
+  },
+  "globals": {
+    "strapi": true
+  },
+  "rules": {
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "linebreak-style": ["error", "unix"],
+    "no-console": 0,
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"]
+  }
+}

cms/.gitignore

+############################
+# OS X
+############################
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+.Spotlight-V100
+.Trashes
+._*
+
+
+############################
+# Linux
+############################
+
+*~
+
+
+############################
+# Windows
+############################
+
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msm
+*.msp
+
+
+############################
+# Packages
+############################
+
+*.7z
+*.csv
+*.dat
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.seed
+*.so
+*.swo
+*.swp
+*.swn
+*.swm
+*.out
+*.pid
+
+
+############################
+# Logs and databases
+############################
+
+.tmp
+*.log
+*.sql
+*.sqlite
+*.sqlite3
+
+
+############################
+# Misc.
+############################
+
+*#
+ssl
+.idea
+nbproject
+public/uploads/*
+!public/uploads/.gitkeep
+
+############################
+# Node.js
+############################
+
+lib-cov
+lcov.info
+pids
+logs
+results
+node_modules
+.node_history
+
+############################
+# Tests
+############################
+
+testApp
+coverage
+
+############################
+# Strapi
+############################
+
+.env
+license.txt
+exports
+*.cache
+build
+.strapi-updater.json

cms/README.md

+# Strapi application
+
+A quick description of your strapi application

cms/config/admin.js

+module.exports = ({ env }) => ({
+  auth: {
+    secret: env('ADMIN_JWT_SECRET', 'e53e86f3060cbd9745147b6cdb3c6a1e'),
+  },
+});

cms/config/api.js

+module.exports = {
+  rest: {
+    defaultLimit: 25,
+    maxLimit: 100,
+    withCount: true,
+  },
+};

cms/config/database.js

+const path = require('path');
+
+module.exports = ({ env }) => ({
+  connection: {
+    client: 'postgres',
+    connection: {
+      host: env('DATABASE_HOST', '127.0.0.1'),
+      port: env.int('DATABASE_PORT', 5432),
+      database: env('DATABASE_NAME', 'ddcode'),
+      user: env('DATABASE_USERNAME', 'strapi'),
+      password: env('DATABASE_PASSWORD', 'strapi'),
+      schema: env('DATABASE_SCHEMA', 'public'), // Not required
+    },
+    debug: false,
+  },
+});
+
+// Uncomment for using SQLite instead of postgres
+// module.exports = ({ env }) => ({
+//   connection: {
+//     client: 'sqlite',
+//     connection: {
+//       filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+//     },
+//     useNullAsDefault: true,
+//   },
+// });

cms/config/middlewares.js

+module.exports = [
+  'strapi::errors',
+  'strapi::security',
+  'strapi::cors',
+  'strapi::poweredBy',
+  'strapi::logger',
+  'strapi::query',
+  'strapi::body',
+  'strapi::favicon',
+  'strapi::public',
+];

cms/config/plugins.js

+module.exports = ({ env }) => ({
+      email: {
+        provider: 'sendmail',
+        settings: {
+          defaultFrom: 'no-reply@ddcode.org',
+          defaultReplyTo: 'no-reply@ddcode.org',
+        },
+      },
+    });

cms/config/server.js

+module.exports = ({ env }) => ({
+  host: env('HOST', '0.0.0.0'),
+  port: env.int('PORT', 1337),
+  url: env('PUBLIC_URL', '/'),
+});

cms/package.json

+{
+  "name": "cms",
+  "private": true,
+  "version": "0.1.0",
+  "description": "A Strapi application",
+  "scripts": {
+    "develop": "strapi develop",
+    "start": "strapi start",
+    "build": "strapi build",
+    "strapi": "strapi"
+  },
+  "devDependencies": {},
+  "dependencies": {
+    "@strapi/plugin-i18n": "4.0.4",
+    "@strapi/plugin-users-permissions": "4.0.4",
+    "@strapi/strapi": "4.0.4",
+    "pg": "^8.7.1",
+    "sqlite3": "5.0.2",
+    "strapi-provider-email-sendmail": "^3.6.8"
+  },
+  "author": {
+    "name": "A Strapi developer"
+  },
+  "strapi": {
+    "uuid": "a1325ec6-3273-4891-9ea8-ac6108f5c0fe"
+  },
+  "engines": {
+    "node": ">=12.x.x <=16.x.x",
+    "npm": ">=6.0.0"
+  },
+  "license": "MIT"
+}

cms/public/robots.txt

+# To prevent search engines from seeing the site altogether, uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

cms/src/admin/app.js

+export default {
+  config: {
+    locales: [
+      // 'ar',
+      'fr',
+      // 'cs',
+      // 'de',
+      // 'dk',
+      // 'es',
+      // 'he',
+      // 'id',
+      // 'it',
+      // 'ja',
+      // 'ko',
+      // 'ms',
+      // 'nl',
+      // 'no',
+      // 'pl',
+      // 'pt-BR',
+      // 'pt',
+      // 'ru',
+      // 'sk',
+      // 'sv',
+      // 'th',
+      // 'tr',
+      // 'uk',
+      // 'vi',
+      // 'zh-Hans',
+      // 'zh',
+    ],
+  },
+  bootstrap() {},
+};

cms/src/admin/webpack.config.js

+'use strict';
+
+/* eslint-disable no-unused-vars */
+module.exports = (config, webpack) => {
+  // Note: we provide webpack above so you should not `require` it
+  // Perform customizations to webpack config
+  // Important: return the modified config
+  return config;
+};

cms/src/api/update-item/content-types/update-item/schema.json

+{
+  "kind": "collectionType",
+  "collectionName": "update_items",
+  "info": {
+    "singularName": "update-item",
+    "pluralName": "update-items",
+    "displayName": "UpdateItem",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "Entity": {
+      "type": "enumeration",
+      "enum": [
+        "Protein",
+        "Condensate",
+        "Condensate_Protein"
+      ]
+    },
+    "EntityId": {
+      "type": "string",
+      "required": true,
+      "unique": false
+    },
+    "Attribute": {
+      "type": "string",
+      "required": true
+    },
+    "ChangeOperation": {
+      "type": "enumeration",
+      "enum": [
+        "Add",
+        "Remove",
+        "Update"
+      ],
+      "required": true
+    },
+    "UpdateSubmissionTimestamp": {
+      "type": "datetime",
+      "required": false
+    },
+    "submittedBy": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "plugin::users-permissions.user",
+      "inversedBy": "SubmittedUpdateItems"
+    },
+    "UpdateReviewTimestamp": {
+      "type": "datetime"
+    },
+    "Status": {
+      "type": "enumeration",
+      "enum": [
+        "Requested",
+        "Accepted",
+        "Rejected",
+        "Synced"
+      ],
+      "default": "Requested",
+      "required": true
+    },
+    "reviewedBy": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "plugin::users-permissions.user",
+      "inversedBy": "ReviewedUpdateItems"
+    },
+    "SubmissionComments": {
+      "type": "richtext"
+    },
+    "ReviewComments": {
+      "type": "richtext"
+    },
+    "SyncedAt": {
+      "type": "datetime"
+    },
+    "SyncResponse": {
+      "type": "string"
+    },
+    "ReviewedAt": {
+      "type": "datetime"
+    },
+    "SubmittedAt": {
+      "type": "datetime"
+    },
+    "Value": {
+      "type": "text"
+    }
+  }
+}