Casa Latina is nonprofit organization that empowers Latino immigrants through educational and economic opportunities. Our employment program connects immigrants with individuals and businesses looking for temporary labor. Our workers are skilled and dependable. From landscaping to dry walling to catering and housecleaning, if you can dream the project our workers can do it! Learn more about Casa Latina.
anythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Will be visible in the welcome page for all users", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.103", + "dateupdated": "2022-05-29T00:53:27.143", + "id": 15, + "updatedby": "jciispam@gmail.com" +} diff --git a/cypress/fixtures/settings/settings.json b/cypress/fixtures/settings/settings.json new file mode 100644 index 00000000..622fab8b --- /dev/null +++ b/cypress/fixtures/settings/settings.json @@ -0,0 +1,232 @@ +{ + "data": [ + { + "key": "OrganizationName", + "value": "from stub", + "description": "Will be displayed in the employer's portal and throughout the app", + "category": "General", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:32.937", + "dateupdated": "2022-05-29T00:53:24.283", + "id": 1, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrganizationAddress", + "value": "123 main st, seattle, wa 98101anythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Will be displayed in work order summaries, etc", + "category": "General", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.047", + "dateupdated": "2022-05-29T00:53:25.613", + "id": 10, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "WorkCenterDescription_EN", + "value": "Casa Latina is nonprofit organization that empowers Latino immigrants through educational and economic opportunities. Our employment program connects immigrants with individuals and businesses looking for temporary labor. Our workers are skilled and dependable. From landscaping to dry walling to catering and housecleaning, if you can dream the project our workers can do it! Learn more about Casa Latina.
anythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Will be visible in the welcome page for all users", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.103", + "dateupdated": "2022-05-29T00:53:27.143", + "id": 15, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OnlineOrdersIntroMessage", + "value": "OnlineOrdersIntroMessageanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displays in the 1st step of the online hiring. Include your center's basic information and how you program works, contact number, etc. Links to your website will also work.", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.113", + "dateupdated": "2022-05-29T00:53:28.473", + "id": 16, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OnlineOrdersEnglishReqNote", + "value": "OnlineOrdersEnglishReqNoteanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the site details step. When employers requests an English-speaking worker, this note provides any center-specific details", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.137", + "dateupdated": "2022-05-29T00:53:29.85", + "id": 18, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OnlineOrdersTransportDetailsLink", + "value": "OnlineOrdersTransportDetailsLinkanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Will display if your transport provider cost rules have any fees. Include the link to your website with transport cost info ", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.15", + "dateupdated": "2022-05-29T00:53:31.323", + "id": 19, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderConfirmTransportFeesNotice", + "value": "OrderConfirmTransportFeesNoticeanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Will display in the last step if employer chooses a transport method with fees. Inlcude text on why the fee applies", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.16", + "dateupdated": "2022-05-29T00:53:32.737", + "id": 20, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewWorkerCountLabel", + "value": "OrderReviewWorkerCountLabelanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The label for the count of work assignments", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.173", + "dateupdated": "2022-05-29T00:52:29.627", + "id": 21, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewSkillsSummaryLabel", + "value": "OrderReviewSkillsSummaryLabelanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The label for the work assignments summary table", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.183", + "dateupdated": "2022-05-29T00:52:30.817", + "id": 22, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewTransportFeeMethodHelper", + "value": "OrderReviewTransportFeeMethodHelperanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The helper text for transport fees explaining payment options", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.2", + "dateupdated": "2022-05-29T00:52:32.02", + "id": 23, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewLaborCostMethodHelper", + "value": "OrderReviewLaborCostMethodHelperanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The helper text for labor cost explaining payment options", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.213", + "dateupdated": "2022-05-29T00:52:33.313", + "id": 24, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewTransportFeeEmplanationUrl", + "value": "OrderReviewTransportFeeAboutUrlanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The url to your website explaining the transport fees", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.227", + "dateupdated": "2022-05-29T00:52:34.5", + "id": 25, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewLaborCostPayMethodHelper", + "value": "OrderReviewLaborCostAboutUrlanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. The url to your website explaining the labor cost", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.24", + "dateupdated": "2022-05-29T00:52:35.697", + "id": 26, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "OrderReviewNextStepsHelper", + "value": "OrderReviewNextStepsHelperanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "Displayed in the pre-sumbit review step. Describe the next steps in the process, will employer need to wait for confirmation via a call, text or wait for email, etc.", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.25", + "dateupdated": "2022-05-29T00:52:36.943", + "id": 27, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "DisableOnlineOrders", + "value": "FALSE", + "description": "Enter either TRUE or FALSE. Enter TRUE to turn off access to the online hiring portal", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.263", + "dateupdated": "2022-05-24T13:10:33.07", + "id": 28, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "DisableOnlineOrdersBanner", + "value": "Online orders are currently disabled. Please call the center.anythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "The message for employers when the online hring portal is turned off", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.277", + "dateupdated": "2022-05-29T00:52:38.217", + "id": 29, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "DisableOnlineOrdersBannerInfoUrl", + "value": "DisableOnlineOrdersBannerInfoUrlanythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganythinganything", + "description": "The URL to your center's website explaining why online hiring is turned off", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T13:08:33.29", + "dateupdated": "2022-05-29T00:52:39.46", + "id": 30, + "updatedby": "jciispam@gmail.com" + }, + { + "key": "DisableWorkersVaccineRequirement", + "value": "FALSE", + "description": null, + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-05-24T15:13:12.66", + "dateupdated": "2022-05-24T15:13:12.66", + "id": 32, + "updatedby": "Init T. Script" + }, + { + "key": "OnlineOrdersTerms", + "value": "[{\"name\":\"term1\",\"text\":\"This is the term one\"},{\"name\":\"term2\",\"text\":\"This is the term two\"}]", + "description": "The terms that an employer has to accept before proceding with creating a work order", + "category": "OnlineOrders", + "publicConfig": true, + "createdby": "Init T. Script", + "datecreated": "2022-06-21T15:29:44.333", + "dateupdated": "2022-06-21T15:29:44.333", + "id": 1002, + "updatedby": "Init T. Script" + } + ] +} diff --git a/cypress/integration/settings/edit-settings.spec.ts b/cypress/integration/settings/edit-settings.spec.ts new file mode 100644 index 00000000..20d93700 --- /dev/null +++ b/cypress/integration/settings/edit-settings.spec.ts @@ -0,0 +1,134 @@ +import { macheteSettingsRoutes, MACHETE_ADMIN } from "cypress/constants"; +import { MS_NON_EDITABLE_CONFIGS_LOWER_CASE } from "src/app/configs/machete-settings/shared/machete-settings-constants"; +import { Config } from "src/app/shared/models/config"; + +describe("machete settings edit", () => { + const STUBBED_CONFGIS_KEY = "stubbed.configs"; + let userEditableConfigs: Config[]; + + let privateConfigs: Config[]; + + beforeEach(() => { + cy.apiLogin(MACHETE_ADMIN.user, MACHETE_ADMIN.password); + + // Stubbing the response from server here + cy.fixture("settings/settings.json"); + cy.intercept( + { + method: "GET", + url: "/api/configs", + }, + { fixture: "settings/settings" } + ).as("configs"); + cy.visit(macheteSettingsRoutes.list); + + cy.wait("@configs").then((i) => { + Cypress.env(STUBBED_CONFGIS_KEY, i.response.body.data); + const configs = Cypress.env(STUBBED_CONFGIS_KEY) as Config[]; + + userEditableConfigs = configs.filter( + (c: Config) => + c.publicConfig && + !MS_NON_EDITABLE_CONFIGS_LOWER_CASE.includes(c.key.toLowerCase()) + ); + + privateConfigs = configs.filter( + (c: Config) => + !c.publicConfig && + MS_NON_EDITABLE_CONFIGS_LOWER_CASE.includes(c.key.toLowerCase()) + ); + }); + }); + + it("text field when valid saves", () => { + const nonTextFields = [ + "OnlineOrdersTerms", + "DisableOnlineOrders", + "DisableWorkersVaccineRequirement", + ]; + userEditableConfigs.forEach((c: Config) => { + if (!nonTextFields.includes(c.key)) { + // mock response + cy.intercept( + { + method: "PUT", + url: "/api/configs/*", + }, + (req) => { + req.body = {}; // don't acctually change anything + req.reply({ + statusCode: 200, + body: { fixture: `settings/${c.key}.json` }, + }); + } + ).as("edit"); + cy.visit(`${macheteSettingsRoutes.list}/${c.key}`); + cy.get("#value").type(" anything"); + cy.get(`button[label="Save"]`).click(); + cy.get(`.p-confirm-popup-accept`).click(); + cy.wait("@edit").then((i) => { + expect(i.request.body.value).to.contain("anything"); + }); + } + }); + }); + + it("text field when Invalid shows error", () => { + const nonTextFields = [ + "OnlineOrdersTerms", + "DisableOnlineOrders", + "DisableWorkersVaccineRequirement", + ]; + userEditableConfigs.forEach((c: Config) => { + if (!nonTextFields.includes(c.key)) { + cy.visit(`${macheteSettingsRoutes.list}/${c.key}`); + cy.get("#value").clear(); + cy.get(`button[label="Save"]`).should("have.attr", "disabled"); + cy.get("small").contains("Value is required"); + } + }); + }); + + it("TERMS field adds & removes children", () => { + const termField = ["OnlineOrdersTerms"]; + // Expect 3 divs. 2 divs for the stubbed 2 terms and one for the buttons + const elementPerChild = 3; + + cy.visit(`${macheteSettingsRoutes.list}/${termField}`); + cy.get("app-machete-settings-term-form") + .find("div") + .first() + .children() + .should("have.length", elementPerChild); + cy.get(".p-button-info > .p-button-icon").click(); + + cy.get("app-machete-settings-term-form") + .find("div") + .first() + .children() + .should("have.length", elementPerChild + 1); + + cy.get(".p-button-danger > .p-button-icon").click(); + cy.get("app-machete-settings-term-form") + .find("div") + .first() + .children() + .should("have.length", elementPerChild); + }); + + it("TERMS field when valid saves", () => { + const termField = ["OnlineOrdersTerms"]; + const elementPerChild = 3; + }); + + it("errors when saving", () => { + privateConfigs.forEach((c: Config) => { + cy.visit(`${macheteSettingsRoutes.list}/${c.key}`); + cy.get("#value").should("exist").type("test"); + cy.get(`button[label="Save"]`).click(); + cy.get("span.p-button-label"); + cy.get(`button[ng-reflect-label="Yes"]`).click(); + cy.contains("Action not allowed"); + }); + }); +}); diff --git a/cypress/integration/settings/list-settings.spec.ts b/cypress/integration/settings/list-settings.spec.ts new file mode 100644 index 00000000..06229b7d --- /dev/null +++ b/cypress/integration/settings/list-settings.spec.ts @@ -0,0 +1,76 @@ +import { + ENV_KEY_MACHETE_CONFIGS, + macheteSettingsRoutes, + MACHETE_ADMIN, +} from "cypress/constants"; +import { Config } from "src/app/shared/models/config"; +import { MS_NON_EDITABLE_CONFIGS_LOWER_CASE } from "src/app/configs/machete-settings/shared/machete-settings-constants"; + +describe("machete settings list", () => { + let userEditableConfigs: Config[]; + + let privateConfigs: Config[]; + + let configs: Config[]; + + beforeEach(() => { + cy.apiLogin(MACHETE_ADMIN.user, MACHETE_ADMIN.password); + + // wait for data to load + cy.intercept({ + method: "GET", + url: "/api/configs", + }).as("configs"); + + cy.getMacheteConfigs(); + cy.visit(macheteSettingsRoutes.list); + + cy.wait("@configs").then(() => { + configs = Cypress.env(ENV_KEY_MACHETE_CONFIGS) as Config[]; + userEditableConfigs = configs.filter( + (c: Config) => + c.publicConfig && + !MS_NON_EDITABLE_CONFIGS_LOWER_CASE.includes(c.key.toLowerCase()) + ); + + privateConfigs = configs.filter( + (c: Config) => + !c.publicConfig && + MS_NON_EDITABLE_CONFIGS_LOWER_CASE.includes(c.key.toLowerCase()) + ); + }); + + }); + + it("when list loads, should display table", () => { + cy.visit(macheteSettingsRoutes.list); + cy.get("table") + .should("be.visible") + .should("have.class", "p-datatable-table"); + }); + it("when list loads, results should contain user-editable configs", () => { + cy.visit(macheteSettingsRoutes.list); + + userEditableConfigs.forEach((c: Config) => { + cy.get("input").type(c.key); + cy.get("table").should("contain.text", c.key); + cy.get("input").clear(); + }); + + privateConfigs.forEach((c: Config) => { + cy.get("input").type(c.key); + cy.get("table").should("not.contain.text", c.key); + cy.get("input").clear(); + }); + }); +}); + +describe("when record selected", () => { + it("should navigate to detail page", () => { + cy.contains("OrganizationName").click(); + cy.url().should( + "include", + `${macheteSettingsRoutes.list}/OrganizationName` + ); + }); +}); diff --git a/package-lock.json b/package-lock.json index 6e100cd8..e6e6084b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,6 +37,15 @@ "rxjs": "6.6.7", "source-map": "0.7.3" } + }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, @@ -199,6 +208,23 @@ "yocto-queue": "^0.1.0" } }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "schema-utils": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", @@ -350,6 +376,15 @@ "rxjs": "6.6.7", "source-map": "0.7.3" } + }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, @@ -365,6 +400,17 @@ "magic-string": "0.25.7", "rxjs": "6.6.7", "source-map": "0.7.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/schematics": { @@ -376,6 +422,17 @@ "@angular-devkit/core": "12.2.7", "ora": "5.4.1", "rxjs": "6.6.7" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-eslint/builder": { @@ -511,6 +568,17 @@ "magic-string": "0.25.7", "rxjs": "6.6.7", "source-map": "0.7.3" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/schematics": { @@ -522,6 +590,17 @@ "@angular-devkit/core": "12.2.16", "ora": "5.4.1", "rxjs": "6.6.7" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@schematics/angular": { @@ -3681,6 +3760,15 @@ "requires": { "ajv": "^8.0.0" } + }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, @@ -3920,6 +4008,23 @@ "tslib": "^2.0.0" }, "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -3995,6 +4100,23 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -5269,6 +5391,16 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -8292,6 +8424,13 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz", "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "filelist": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", @@ -10828,6 +10967,13 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "dev": true, + "optional": true + }, "nanocolors": { "version": "0.2.12", "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", @@ -19388,7 +19534,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 221aa6f9..5b917328 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,7 +10,6 @@ import { OnDestroy, } from "@angular/core"; import { environment } from "../environments/environment"; -import { ConfigsService } from "./configs/configs.service"; import { LookupsService } from "./lookups/lookups.service"; import { Router, NavigationEnd } from "@angular/router"; import { MenuItem, Message, MessageService, PrimeNGConfig } from "primeng/api"; @@ -28,7 +27,7 @@ declare let jQuery: any; selector: "app-root", templateUrl: "./app.component.html", styleUrls: ["./app.component.scss"], - providers: [LookupsService, ConfigsService, MessageService], + providers: [LookupsService, MessageService], }) export class AppComponent implements AfterViewInit, OnInit, OnDestroy { @ViewChild("layoutContainer", { static: false }) diff --git a/src/app/configs/configs-routing.module.ts b/src/app/configs/configs-routing.module.ts index 2fcdf80e..7e59c4b3 100644 --- a/src/app/configs/configs-routing.module.ts +++ b/src/app/configs/configs-routing.module.ts @@ -19,6 +19,13 @@ const routes: Routes = [ }, ], }, + { + path: "settings", + loadChildren: () => + import("./machete-settings/machete-settings.module").then( + (m) => m.MacheteSettingsModule + ), + }, ]; @NgModule({ diff --git a/src/app/configs/configs.service.spec.ts b/src/app/configs/configs.service.spec.ts deleted file mode 100644 index fcef4cb5..00000000 --- a/src/app/configs/configs.service.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { TestBed, inject } from "@angular/core/testing"; - -import { ConfigsService } from "./configs.service"; -import { HttpClientTestingModule } from "@angular/common/http/testing"; - -describe("ConfigsService", () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ConfigsService], - imports: [HttpClientTestingModule], - }); - }); - - it("should be created", inject( - [ConfigsService], - (service: ConfigsService) => { - expect(service).toBeTruthy(); - } - )); -}); diff --git a/src/app/configs/configs.service.ts b/src/app/configs/configs.service.ts deleted file mode 100644 index 57d490df..00000000 --- a/src/app/configs/configs.service.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { Observable, of } from "rxjs"; - -import { first, mergeMap, map } from "rxjs/operators"; -import { Injectable } from "@angular/core"; -import { environment } from "../../environments/environment"; -import { HttpClient } from "@angular/common/http"; -import { Config, CCategory } from "../shared/models/config"; - -@Injectable() -export class ConfigsService { - uriBase = environment.dataUrl + "/api/configs"; - configs = new Array- Casa Latina connects Latino immigrant workers with individuals and - businesses looking for temporary labor. Our workers are skilled and - dependable. -
-- From landscaping to dry walling to catering and housecleaning, if you can - dream the project our workers can do it! For more information about our - program please read these Frequently Asked Questions If you are ready to - hire a worker, please fill out the following form. -
- -- Casa Latina is taking all necessary precautions to keep employers and - workers safe, therefore some jobs might not be available at this time. -
-- If you still have questions about hiring a worker, please call us at - 206.956.0779 x3. -
+