diff --git a/New folder/.vscode/settings.json b/New folder/.vscode/settings.json new file mode 100644 index 000000000..8be439493 --- /dev/null +++ b/New folder/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "javascript.implicitProjectConfig.experimentalDecorators": true, + "git.ignoreLimitWarning": true +} \ No newline at end of file diff --git a/New folder/README.md b/New folder/README.md new file mode 100644 index 000000000..7f5633669 --- /dev/null +++ b/New folder/README.md @@ -0,0 +1,2 @@ +# sparqsineedge + diff --git a/New folder/bitbucket-pipelines.yml b/New folder/bitbucket-pipelines.yml new file mode 100644 index 000000000..72393e026 --- /dev/null +++ b/New folder/bitbucket-pipelines.yml @@ -0,0 +1,30 @@ +# This is a sample build configuration for JavaScript. +# Check our guides at https://confluence.atlassian.com/x/14UWN for more examples. +# Only use spaces to indent your .yml configuration. +# ----- +# You can specify a custom docker image from Docker Hub as your build environment. +image: node:10.15.3 + +pipelines: + branches: + master: + - step: + caches: + - node + size: 2x # Double resources available for this step. + script: # Modify the commands below to build your repository. + - cd ng6-seed + - npm install + - npm install -g @angular/cli + - node --max_old_space_size=2046 node_modules/@angular/cli/bin/ng build --configuration=staging + - ls -ltr + - cd dist + - pipe: atlassian/aws-s3-deploy:0.3.8 + variables: + AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY + AWS_DEFAULT_REGION: 'ap-south-1' + S3_BUCKET: 'autodeploy001' + LOCAL_PATH: $(pwd) + DELETE_FLAG: 'true' + \ No newline at end of file diff --git a/New folder/package-lock.json b/New folder/package-lock.json new file mode 100644 index 000000000..48e341a09 --- /dev/null +++ b/New folder/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/ng6-seed/Sparqsineedge(WEB 11-03-2022)Test.zip b/ng6-seed/Sparqsineedge(WEB 11-03-2022)Test.zip new file mode 100644 index 000000000..aedd030c3 Binary files /dev/null and b/ng6-seed/Sparqsineedge(WEB 11-03-2022)Test.zip differ diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 64b971613..b9c83dd5d 100755 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -395,18 +395,19 @@ } }, "@angular/animations": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.10.tgz", - "integrity": "sha512-dd/lq7kw3uwfHPICan8psu2nthuUpp7PvMLuNIm0XxObZ4oNs0ls6uxKEDPnEkRKoGdiJpvmsyzZZN9ACMPEAA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.0.0.tgz", + "integrity": "sha512-IYdryQXdYfPvhJpExLSAr0o9rlUeyVS++a6h/sjqN1dkUt/yJBHLRreuHx8Udvlj2nH70raHJgevk8FwhAkTdA==", "requires": { "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.7.tgz", - "integrity": "sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.0.0.tgz", + "integrity": "sha512-HX+gIJzST/Nu07ASg1XR583KSEmHI6kUbiSBdq0LqF3mIQgId5z3auBqQcXAgvB0Cg29+/38aj31hnoK/LswEQ==", "requires": { + "parse5": "^5.0.0", "tslib": "^1.7.1" } }, @@ -721,18 +722,17 @@ } }, "@angular/material": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.4.7.tgz", - "integrity": "sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.0.0.tgz", + "integrity": "sha512-HgHzHWsUvNiSpRmoOJqnH/TVb4Ki7sXxbWuw5OVKOKiBW6Gwvd29+cP4XauzH47wHMyvS9/HH8kj3gC72pLhJQ==", "requires": { - "parse5": "^5.0.0", "tslib": "^1.7.1" } }, "@angular/material-moment-adapter": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.7.tgz", - "integrity": "sha512-OGdDtpu/yRioOQXhJFCNuiOF2OgiL9VUj8ewFPi1lDtFGUFfVwU2h3hWkKLn+yuPW+DBVYla11tCNsn5dLElmA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.0.0.tgz", + "integrity": "sha512-ODTjQrgJhxU90qT0C42UdgR+NVjMwMhJHKxmRMC83Z7r+OZgjLcrj5fXx+363AisnI8a/+5hBSgzXZgwUu2hGQ==", "requires": { "tslib": "^1.7.1" } @@ -1224,6 +1224,30 @@ } } }, + "@swimlane/dragula": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@swimlane/dragula/-/dragula-3.8.0.tgz", + "integrity": "sha512-1F3sWPs9GRbQysuOa92llH21YYgc0YezTAtt72AmMxgv8erX8h/S6hYWzqEj5SIB/+u/YRx298dKU0tGoYGgNg==", + "requires": { + "contra": "1.9.4", + "crossvent": "1.5.4" + } + }, + "@swimlane/ng2-file-upload": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@swimlane/ng2-file-upload/-/ng2-file-upload-1.1.0.tgz", + "integrity": "sha512-YjqMQJUZt82Eji07n/0peXIaUb+ameWCsvEUlJUAijG504HThqNPkVQF03qnA5GtPatWO0/D5APJIhIPIj/ESg==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "@swimlane/ngx-charts": { "version": "7.4.0", "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.4.0.tgz", @@ -1246,6 +1270,44 @@ "version": "11.1.5", "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.1.5.tgz", "integrity": "sha512-BRRHMrgw9tG0BezTnfszzFTlpW9B9Zh5kyZF/pxqfJxpUsZ0aA/uXlL4cloe4+msQ6yIdu1/jhUCDInwSzmpFw==" +<<<<<<< HEAD +======= + }, + "@swimlane/ngx-dnd": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-dnd/-/ngx-dnd-9.0.0.tgz", + "integrity": "sha512-bENC5QsEWEeTjolAmoeyDUXX8uUaqcDhVHbS/OXa1tVqf2OpYH6cbGr/sWa7BrjCn5aQB65T+YjvCxBucqBluw==", + "requires": { + "@swimlane/dragula": "^3.8.0", + "@types/dragula": "^2.1.34", + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, + "@swimlane/ngx-ui": { + "version": "37.1.1", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-ui/-/ngx-ui-37.1.1.tgz", + "integrity": "sha512-My3Fnb35sLKorD7lsYBOSLm4+T0eg1sk8pCwfFGfdhXdLxZSDBiSfEWvbu/NuBUKZz8RwyEIZ/h5rJkOsldXvQ==", + "requires": { + "@swimlane/ng2-file-upload": "1.1.0", + "mousetrap": "^1.6.2", + "normalize.css": "^5.0.0", + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } +>>>>>>> 6f3613fe88d9f917ac496803b264c51a0ccc6410 }, "@types/aws-sdk": { "version": "2.7.0", @@ -1272,6 +1334,11 @@ } } }, + "@types/dragula": { + "version": "2.1.36", + "resolved": "https://registry.npmjs.org/@types/dragula/-/dragula-2.1.36.tgz", + "integrity": "sha512-K1GIMqdiviBIvUsLJPO1xkjpDFS308nU2l57zmV7LEO+znF3gtZGnWQ+c/ef78r6Ngb0cniQk8pnNkObeNlXQQ==" + }, "@types/file-saver": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.1.tgz", @@ -8486,6 +8553,11 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, + "mousetrap": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz", + "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -8647,6 +8719,15 @@ } } }, + "ngx-smooth-dnd": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/ngx-smooth-dnd/-/ngx-smooth-dnd-0.4.1.tgz", + "integrity": "sha512-7MqBBWWpP0kuI+90CvO0uGJxqa4o1krVvDtSZYnn2jnUvV4SrRFUoNM/8lNYJjHIzLXYpFm/6BG//h6WWKAkkw==", + "requires": { + "smooth-dnd": "0.12.0", + "tslib": "^1.9.0" + } + }, "ngx-socket-io": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.0.1.tgz", @@ -9087,6 +9168,11 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, + "normalize.css": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-5.0.0.tgz", + "integrity": "sha1-fOyHXOgXilMzxN6Ato6pwYudfDc=" + }, "npm-bundled": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", @@ -11250,6 +11336,11 @@ "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", "dev": true }, + "smooth-dnd": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/smooth-dnd/-/smooth-dnd-0.12.0.tgz", + "integrity": "sha512-w+/YW1TFram8FW/bYiirRcAGSIdVVjxFRtCBqJ2fkEJpm28zwbdMyXVQCralBUTITMjZp6VHGQJ73UTSIER1lA==" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", diff --git a/ng6-seed/package.json b/ng6-seed/package.json index b68d62b2c..03cc12dc3 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -15,8 +15,8 @@ "private": true, "dependencies": { "@agm/core": "^1.0.0-beta.2", - "@angular/animations": "^6.1.10", - "@angular/cdk": "^6.4.7", + "@angular/animations": "^7.0.0", + "@angular/cdk": "^7.0.0", "@angular/common": "^6.1.10", "@angular/compiler": "^6.1.10", "@angular/core": "^6.1.10", @@ -24,8 +24,8 @@ "@angular/flex-layout": "^6.0.0-beta.18", "@angular/forms": "^6.1.10", "@angular/http": "^6.0.0-rc.6", - "@angular/material": "^6.4.7", - "@angular/material-moment-adapter": "^6.4.7", + "@angular/material": "^7.0.0", + "@angular/material-moment-adapter": "^7.0.0", "@angular/platform-browser": "^6.1.10", "@angular/platform-browser-dynamic": "^6.1.10", "@angular/router": "^6.1.10", @@ -33,6 +33,8 @@ "@ngx-translate/http-loader": "^3.0.1", "@swimlane/ngx-charts": "^7.0.1", "@swimlane/ngx-datatable": "11.1.5", + "@swimlane/ngx-dnd": "^9.0.0", + "@swimlane/ngx-ui": "^37.1.1", "@types/file-saver": "^2.0.1", "amazon-cognito-identity-js": "^2.0.30", "angular-calendar": "0.23.3", @@ -68,6 +70,7 @@ "ngx-mat-daterange-picker": "^1.1.4", "ngx-mat-select-search": "^1.8.0", "ngx-perfect-scrollbar": "5.0.0-7", + "ngx-smooth-dnd": "^0.4.1", "ngx-socket-io": "^3.0.1", "ngx-spinner": "^7.2.0", "ngx-viewer": "^1.0.5", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-form/dynamic-form.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-form/dynamic-form.component.html index 8bb2c1ed1..3a53109a9 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-form/dynamic-form.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-form/dynamic-form.component.html @@ -1,5 +1,6 @@