From 1a7ff5853af20d96eeee4240a7cb13c46ef2eae0 Mon Sep 17 00:00:00 2001 From: Alex Swindler Date: Tue, 31 Mar 2026 12:25:50 -0600 Subject: [PATCH] Update branding --- .github/workflows/ci.yml | 2 -- .spelling.dic | 2 +- package.json | 8 ++++---- public/i18n/en_US.json | 16 +++++++++++++++- public/i18n/es.json | 16 +++++++++++++++- public/i18n/fr_CA.json | 16 +++++++++++++++- src/@seed/services/terms/terms.service.ts | 4 ++-- src/app/mock-api/common/auth/api.ts | 2 +- src/app/mock-api/common/user/data.ts | 6 +++--- .../modules/auth/sign-in/sign-in.component.html | 4 ++-- .../modules/auth/sign-up/sign-up.component.html | 4 ++-- src/app/modules/main/about/about.component.html | 6 +++--- .../documentation/documentation.component.ts | 6 +++--- src/index.html | 2 +- 14 files changed, 67 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b75f2f39..95b4a4af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,6 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 - with: - version: 10 - name: Install Node.js uses: actions/setup-node@v4 diff --git a/.spelling.dic b/.spelling.dic index d9295c0c..7eef4885 100644 --- a/.spelling.dic +++ b/.spelling.dic @@ -44,10 +44,10 @@ macumber mapquest moveend msgpackr +nlr nmec noopener noreferrer -nrel officedocument opblock openxmlformats diff --git a/package.json b/package.json index 9e40e2cf..1d5c9bc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "seed", - "version": "3.2.5", + "version": "3.4.0", "description": "Standard Energy Efficiency Data (SEED) Platform™", "license": "SEE LICENSE IN LICENSE.md", "repository": { @@ -11,12 +11,12 @@ "url": "https://github.com/SEED-platform/seed/issues" }, "engines": { - "node": ">=22", + "node": ">=24", "pnpm": ">=10" }, + "packageManager": "pnpm@10.33.0", "private": true, "scripts": { - "preinstall": "npx -y only-allow pnpm", "ng": "ng", "start": "ng serve", "start:prod": "ng serve -c production", @@ -32,7 +32,7 @@ "prettier:fix": "npm run prettier -- -w", "stylelint": "stylelint \"src/**/*.scss\"", "stylelint:fix": "npm run stylelint -- --fix", - "update-translations": "node --env-file=.env --import=tsx --no-warnings update-translations.mts" + "update-translations": "node --env-file=.env --no-warnings update-translations.mts" }, "dependencies": { "@angular/animations": "^20.0.5", diff --git a/public/i18n/en_US.json b/public/i18n/en_US.json index a9720a7b..9f86c06a 100644 --- a/public/i18n/en_US.json +++ b/public/i18n/en_US.json @@ -169,6 +169,7 @@ "Back to Mapping": "Back to Mapping", "Baseline Cycle": "Baseline Cycle", "Begin Update": "Begin Update", + "Benchmark Configuration": "Benchmark Configuration", "Benchmarking": "Benchmarking", "Block Number": "Block Number", "Body": "Body", @@ -183,7 +184,7 @@ "Building has BAS field": "Building has BAS field", "BuildingSync Recommended Measures": "BuildingSync Recommended Measures", "Buildings": "Buildings", - "By clicking the Log In button you accept the NREL Data Terms.": "By clicking the Log In button you accept the NREL Data Terms.", + "By clicking the Log In button you accept the NLR Data Terms.": "By clicking the Log In button you accept the NLR Data Terms.", "CLICK_LEGEND": "Click a label below to show\/hide it on the chart", "COLUMN_NAME_DUPLICATE_ERROR": "Error: New column name cannot match previous name.", "COLUMN_NAME_EXISTS_WARNING": "Warning: Column name already exists.", @@ -243,6 +244,8 @@ "Classification Type": "Classification Type", "Clear Filters": "Clear Filters", "Clear Labels": "Clear Labels", + "Client ID": "Client ID", + "Client Secret": "Client Secret", "Close": "Close", "Close Preview": "Close Preview", "Collapse Tabs": "Collapse Tabs", @@ -287,7 +290,10 @@ "Confirm Save Mappings?": "Confirm Save Mappings?", "Confirm delete": "Confirm delete", "Confirm new password": "Confirm new password", + "Connected to Salesforce": "Connected to Salesforce", "Connection": "Connection", + "Connection Status": "Connection Status", + "Connection error": "Connection error", "Contact": "Contact", "Contact Account Name Column": "Contact Account Name Column", "Contact Benchmark Field": "Contact Benchmark Field", @@ -498,6 +504,8 @@ "Enable Public Endpoints": "Enable Public Endpoints", "Enable Public GeoJSON": "Enable Public GeoJSON", "Enable Salesforce Integration": "Enable Salesforce Integration", + "Enable Salesforce Integration (Individual Properties)": "Enable Salesforce Integration (Individual Properties)", + "Enable Salesforce Integration (Portfolio of Properties)": "Enable Salesforce Integration (Portfolio of Properties)", "Energy": "Energy", "Energy Alerts": "Energy Alerts", "Energy Capacity (kWh)": "Energy Capacity (kWh)", @@ -755,6 +763,7 @@ "Log in": "Log in", "Log in to SEED Platform": "Log in to SEED Platform", "Logging Email": "Logging Email", + "Login": "Login", "Logout": "Logout", "Longitude": "Longitude", "MAPPING YOUR DATA TO SEED": "MAPPING YOUR DATA TO SEED", @@ -902,6 +911,7 @@ "Not Compliant": "Not Compliant", "Not Null": "Not Null", "Not all inventory items were successfully deleted": "Not all inventory items were successfully deleted", + "Not connected to Salesforce": "Not connected to Salesforce", "Not seeing your column?": "Not seeing your column?", "Note:": "Note:", "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"": "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"", @@ -1152,6 +1162,7 @@ "SF_ACCOUNT_RECORD_TYPE_TEXT": "If your Salesforce instance has multiple account types, provide the Record Type ID of the type of account to use when accounts are automatically created from SEED", "SF_BENCHMARK_CONTACT_FIELDNAME_TEXT": "If your Salesforce Benchmark Record stores a Salesforce Contact relation, provide the Salesforce field name here, ex: Contact_Name__c", "SF_BENCHMARK_ID_FIELDNAME_TEXT": "Fieldname of the Salesforce field that is used to uniquely identify Benchmark records. Example: 'Salesforce_Benchmark_ID__c'", + "SF_BUILDING_DESC": "This integration allows you to connect your organization with a Salesforce instance for enhanced data management and workflow automation. This integration assumes Salesforce is configured with Property and Benchmark objects, which will be updated with individual property data from SEED.", "SF_COMPLIANCE_LABEL_TEXT": "Label used to designate that a SEED property is in compliance. Example: 'Complied'", "SF_CONFIGURATION_TEXT": "Configure a few parameters needed for data transfer to Salesforce", "SF_CONNECTION_TEXT": "Enter your Salesforce instance details and ensure your connection is successful", @@ -1175,6 +1186,7 @@ "SF_LABELS_FIELDNAME_TEXT": "If your Salesforce Benchmark Record stores a string of all SEED labels applied, please enter the name of the Salesforce field here, ex: SEED_Labels__c", "SF_LOGGING_EMAIL_TEXT": "Enter the e-mail address to use when reporting errors during the Salesforce updating process", "SF_MAPPINGS_TEXT": "Map your Salesforce Benchmark Object's fields to columns in SEED. Use the Object Manager in Salesforce to retrieve the field names (not the field labels), ex: Cycle__c (not Cycle). These fields will only be sent to Salesforce when a property has the compliant label applied.", + "SF_PORTFOLIO_DESC": "This integration also allows you to connect your organization with a Salesforce instance, but assumes Salesforce is configured with Goal and Annual Report objects which will be updated with portfolio-level data (aggregated from multiple properties in SEED). ", "SF_SCHEDULED_UPDATE_TEXT": "If you would like to automatically update Salesforce on a daily basis, configure the fields below", "SF_SECURITY_TOKEN_TEXT": "Security token set in Salesforce", "SF_SEED_BENCHMARK_ID_FIELDNAME_TEXT": "Fieldname of the SEED field that is used to uniquely identify Benchmark records. Example: 'Salesforce Benchmark ID'", @@ -1206,6 +1218,7 @@ "SUGGEST_UPDATE_GEOCODE_COLS": "Update the geocoding column settings in your organization's column settings page.", "Salesforce": "Salesforce", "Salesforce Account Object Record Type": "Salesforce Account Object Record Type", + "Salesforce Connection": "Salesforce Connection", "Salesforce Connection Parameters": "Salesforce Connection Parameters", "Salesforce Contact Object Record Type": "Salesforce Contact Object Record Type", "Salesforce Field Mappings": "Salesforce Field Mappings", @@ -1213,6 +1226,7 @@ "Salesforce Instance URL": "Salesforce URL", "Salesforce Integration": "Salesforce Integration", "Salesforce Unique Benchmark ID Fieldname": "Salesforce Unique Benchmark ID Fieldname", + "Salesforce connection successful": "Salesforce connection successful", "Save": "Save", "Save Changes": "Save Changes", "Save Concatenation": "Save Concatenation", diff --git a/public/i18n/es.json b/public/i18n/es.json index acb04242..8fe14b13 100644 --- a/public/i18n/es.json +++ b/public/i18n/es.json @@ -169,6 +169,7 @@ "Back to Mapping": "Volver a Cartografía", "Baseline Cycle": "Ciclo de referencia", "Begin Update": "Iniciar actualización", + "Benchmark Configuration": "Configuración de referencia", "Benchmarking": "Evaluación comparativa", "Block Number": "Número de bloque", "Body": "Cuerpo", @@ -183,7 +184,7 @@ "Building has BAS field": "El edificio tiene campo BAS", "BuildingSync Recommended Measures": "BuildingSync Medidas recomendadas", "Buildings": "Edificios", - "By clicking the Log In button you accept the NREL Data Terms.": "Al hacer clic en el botón Iniciar sesión, acepta las Condiciones de datos del NREL.", + "By clicking the Log In button you accept the NLR Data Terms.": "Al hacer clic en el botón Iniciar sesión, acepta las Condiciones de datos del NLR.", "CLICK_LEGEND": "Haga clic en una etiqueta para mostrarla u ocultarla en el gráfico", "COLUMN_NAME_DUPLICATE_ERROR": "Error: El nuevo nombre de columna no coincide con el anterior.", "COLUMN_NAME_EXISTS_WARNING": "Advertencia: El nombre de la columna ya existe.", @@ -243,6 +244,8 @@ "Classification Type": "Tipo de clasificación", "Clear Filters": "Limpiar filtros", "Clear Labels": "Etiquetas transparentes", + "Client ID": "ID de cliente", + "Client Secret": "Secreto del cliente", "Close": "Cerrar", "Close Preview": "Cerrar Vista previa", "Collapse Tabs": "Contraer pestañas", @@ -287,7 +290,10 @@ "Confirm Save Mappings?": "¿Confirmar guardar asignaciones?", "Confirm delete": "Confirmar eliminación", "Confirm new password": "Confirmar nueva contraseña", + "Connected to Salesforce": "Conectado a Salesforce", "Connection": "Conexión", + "Connection Status": "Estado de la conexión", + "Connection error": "Error de conexión", "Contact": "Póngase en contacto con", "Contact Account Name Column": "Columna Nombre de la cuenta de contacto", "Contact Benchmark Field": "Póngase en contacto con Benchmark Field", @@ -498,6 +504,8 @@ "Enable Public Endpoints": "Habilitar puntos finales públicos", "Enable Public GeoJSON": "Activar GeoJSON público", "Enable Salesforce Integration": "Activar la integración de Salesforce", + "Enable Salesforce Integration (Individual Properties)": "Habilitar la integración con Salesforce (propiedades individuales)", + "Enable Salesforce Integration (Portfolio of Properties)": "Habilitar la integración con Salesforce (Cartera de propiedades)", "Energy": "Energía", "Energy Alerts": "Alertas de energía", "Energy Capacity (kWh)": "Capacidad energética (kWh)", @@ -755,6 +763,7 @@ "Log in": "Conectarse", "Log in to SEED Platform": "Iniciar sesión en la Plataforma SEED", "Logging Email": "Correo electrónico de registro", + "Login": "Acceso", "Logout": "Cierre de sesión", "Longitude": "Longitud", "MAPPING YOUR DATA TO SEED": "ASIGNAR SUS DATOS A LAS SEMILLAS", @@ -902,6 +911,7 @@ "Not Compliant": "No conforme", "Not Null": "No nulo", "Not all inventory items were successfully deleted": "No se han eliminado correctamente todos los artículos del inventario", + "Not connected to Salesforce": "No está conectado a Salesforce", "Not seeing your column?": "¿No ves tu columna?", "Note:": "Nota:", "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"": "Nota: Los contadores se etiquetan con el siguiente formato: \"Tipo - Fuente - ID de fuente\"", @@ -1152,6 +1162,7 @@ "SF_ACCOUNT_RECORD_TYPE_TEXT": "Si su instancia de Salesforce tiene varios tipos de cuenta, proporcione el ID de tipo de registro del tipo de cuenta que se utilizará cuando las cuentas se creen automáticamente desde SEED", "SF_BENCHMARK_CONTACT_FIELDNAME_TEXT": "Si su registro de referencia de Salesforce almacena una relación de contacto de Salesforce, indique aquí el nombre del campo de Salesforce, por ejemplo: Contact_Name__c", "SF_BENCHMARK_ID_FIELDNAME_TEXT": "Nombre de campo del campo de Salesforce que se utiliza para identificar de forma exclusiva los registros de Benchmark. Ejemplo: 'Salesforce_Benchmark_ID__c'", + "SF_BUILDING_DESC": "Esta integración permite conectar su organización con una instancia de Salesforce para optimizar la gestión de datos y la automatización de flujos de trabajo. Esta integración presupone que Salesforce está configurado con objetos de Propiedad y Referencia, que se actualizarán con los datos individuales de las propiedades desde SEED.", "SF_COMPLIANCE_LABEL_TEXT": "Etiqueta utilizada para designar que una propiedad SEED es conforme. Ejemplo: \"Cumple\"", "SF_CONFIGURATION_TEXT": "Configure algunos parámetros necesarios para la transferencia de datos a Salesforce", "SF_CONNECTION_TEXT": "Introduzca los detalles de su instancia de Salesforce y asegúrese de que la conexión se realiza correctamente", @@ -1175,6 +1186,7 @@ "SF_LABELS_FIELDNAME_TEXT": "Si su registro de referencia de Salesforce almacena una cadena de todas las etiquetas de SEED aplicadas, introduzca aquí el nombre del campo de Salesforce, por ejemplo: SEED_Labels__c", "SF_LOGGING_EMAIL_TEXT": "Introduzca la dirección de correo electrónico que se utilizará para notificar errores durante el proceso de actualización de Salesforce", "SF_MAPPINGS_TEXT": "Asigne los campos de su objeto de referencia de Salesforce a columnas en SEED. Utilice el Administrador de Objetos en Salesforce para recuperar los nombres de campo (no las etiquetas de campo), ej: Cycle__c (no Cycle). Estos campos sólo se enviarán a Salesforce cuando una propiedad tenga aplicada la etiqueta correspondiente.", + "SF_PORTFOLIO_DESC": "Esta integración también le permite conectar su organización con una instancia de Salesforce, pero presupone que Salesforce está configurado con objetos de Objetivo e Informe Anual que se actualizarán con datos a nivel de cartera (agregados a partir de múltiples propiedades en SEED). ", "SF_SCHEDULED_UPDATE_TEXT": "Si desea actualizar automáticamente Salesforce a diario, configure los siguientes campos", "SF_SECURITY_TOKEN_TEXT": "Token de seguridad establecido en Salesforce", "SF_SEED_BENCHMARK_ID_FIELDNAME_TEXT": "Nombre de campo del campo SEED que se utiliza para identificar de forma exclusiva los registros de Benchmark. Ejemplo: 'Salesforce Benchmark ID'", @@ -1206,6 +1218,7 @@ "SUGGEST_UPDATE_GEOCODE_COLS": "Actualice la configuración de la columna de geocodificación en la página de configuración de columnas de su organización.", "Salesforce": "Salesforce", "Salesforce Account Object Record Type": "Tipo de registro de objeto de cuenta de Salesforce", + "Salesforce Connection": "Conexión con Salesforce", "Salesforce Connection Parameters": "Parámetros de conexión de Salesforce", "Salesforce Contact Object Record Type": "Tipo de registro de objeto de contacto de Salesforce", "Salesforce Field Mappings": "Asignaciones de campos de Salesforce", @@ -1213,6 +1226,7 @@ "Salesforce Instance URL": "URL de Salesforce", "Salesforce Integration": "Integración con Salesforce", "Salesforce Unique Benchmark ID Fieldname": "ID único de referencia de Salesforce Nombre de campo", + "Salesforce connection successful": "Conexión con Salesforce exitosa", "Save": "Guardar", "Save Changes": "Guardar cambios", "Save Concatenation": "Guardar concatenación", diff --git a/public/i18n/fr_CA.json b/public/i18n/fr_CA.json index f22b8005..c3fb4a5d 100644 --- a/public/i18n/fr_CA.json +++ b/public/i18n/fr_CA.json @@ -169,6 +169,7 @@ "Back to Mapping": "Retournez à les mappages", "Baseline Cycle": "Cycle de référence", "Begin Update": "Démarrer la mise à jour", + "Benchmark Configuration": "Configuration de référence", "Benchmarking": "Analyse comparative", "Block Number": "Numéro de bloc", "Body": "Corps", @@ -183,7 +184,7 @@ "Building has BAS field": "Le bâtiment dispose d'un champ SAB", "BuildingSync Recommended Measures": "Mesures recommandées par BuildingSync", "Buildings": "Bâtiments", - "By clicking the Log In button you accept the NREL Data Terms.": "En cliquant sur le bouton Connexion, vous acceptez les conditions d'utilisation des données NREL.", + "By clicking the Log In button you accept the NLR Data Terms.": "En cliquant sur le bouton Connexion, vous acceptez les conditions d'utilisation des données NLR.", "CLICK_LEGEND": "Cliquez sur une étiquette ci-dessous pour l'afficher\/masquer sur le graphique", "COLUMN_NAME_DUPLICATE_ERROR": "Erreur: Le nom de la nouvelle colonne ne peut pas correspondre au nom précédent.", "COLUMN_NAME_EXISTS_WARNING": "Attention: le nom de la colonne existe déjà.", @@ -243,6 +244,8 @@ "Classification Type": "Type de classification", "Clear Filters": "Effacer les filtres", "Clear Labels": "Effacer les étiquettes", + "Client ID": "ID client", + "Client Secret": "Secret du client", "Close": "Fermer", "Close Preview": "Fermer l'aperçu", "Collapse Tabs": "Réduire les onglets", @@ -287,7 +290,10 @@ "Confirm Save Mappings?": "Confirmer enregistrer les mappages?", "Confirm delete": "Confirmer la supprimation", "Confirm new password": "Confirmer le nouveau mot de passe", + "Connected to Salesforce": "Connecté à Salesforce", "Connection": "Connexion", + "Connection Status": "État de la connexion", + "Connection error": "Erreur de connexion", "Contact": "Contact", "Contact Account Name Column": "Colonne Nom du compte de contact", "Contact Benchmark Field": "Nom de champ Contact pour l'object Benchmark", @@ -498,6 +504,8 @@ "Enable Public Endpoints": "Activer les points de terminaison publics", "Enable Public GeoJSON": "Activer GeoJSON public", "Enable Salesforce Integration": "Activer la fonctionnalité Salesforce", + "Enable Salesforce Integration (Individual Properties)": "Activer l'intégration Salesforce (propriétés individuelles)", + "Enable Salesforce Integration (Portfolio of Properties)": "Activer l'intégration Salesforce (Portefeuille de propriétés)", "Energy": "Énergie", "Energy Alerts": "Alertes énergétiques", "Energy Capacity (kWh)": "Capacité énergétique (kWh)", @@ -755,6 +763,7 @@ "Log in": "S'identifier", "Log in to SEED Platform": "Connectez-vous à SEED Platform", "Logging Email": "Adresse courriel pour reportage", + "Login": "Se connecter", "Logout": "Déconnexion", "Longitude": "Longitude", "MAPPING YOUR DATA TO SEED": "MAPPAGE DE VOS DONNÉES À SEED", @@ -902,6 +911,7 @@ "Not Compliant": "Non conforme", "Not Null": "Pas nul", "Not all inventory items were successfully deleted": "Tous les éléments de l'inventaire n'ont pas été supprimés", + "Not connected to Salesforce": "Non connecté à Salesforce", "Not seeing your column?": "Vous ne voyez pas votre colonne?", "Note:": "Remarque:", "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"": "Remarque: Les compteurs sont étiquetés au format suivant: \"la catégorie - Source - Source ID\"", @@ -1152,6 +1162,7 @@ "SF_ACCOUNT_RECORD_TYPE_TEXT": "Si votre Salesforce a plusieurs types de Compte, fournissez le 'Record Type ID' à utiliser lorsqu'un compte est automatiquement créé par SEED", "SF_BENCHMARK_CONTACT_FIELDNAME_TEXT": "Si votre objet Benchmark a un champ pour capturer le Contact, inscrivez le nom du champ dans l'application Salesforce, ex: Contact_Name__c", "SF_BENCHMARK_ID_FIELDNAME_TEXT": "Nom du champ dans l'application Salesforce utilisé pour identifier uniquement un object 'Benchmark'. Example: 'Salesforce_Benchmark_ID__c'", + "SF_BUILDING_DESC": "Cette intégration vous permet de connecter votre organisation à une instance Salesforce pour une gestion des données optimisée et une automatisation des flux de travail. Elle suppose que Salesforce est configuré avec les objets Propriété et Benchmark, qui seront mis à jour avec les données de chaque propriété issues de SEED.", "SF_COMPLIANCE_LABEL_TEXT": "Étiquette qui signale qu'une propriété est en conformité. Example: 'Comforme'", "SF_CONFIGURATION_TEXT": "Configurez les paramètres necessaires pour transferez les données à Salesforce", "SF_CONNECTION_TEXT": "Inscrivez vos détails pour la connexion Salesforce", @@ -1175,6 +1186,7 @@ "SF_LABELS_FIELDNAME_TEXT": "Si votre objet Benchmark a un champ pour capturer tous les étiquettes SEED, inscrivez le nom du champ dans l'application Salesforce, ex: SEED_Labels__c", "SF_LOGGING_EMAIL_TEXT": "Inscrivez l'adresse courriel à utiliser pour le reportage des errors rencontrée pendant la mise à jour Salesforce", "SF_MAPPINGS_TEXT": "Associez les champs de données de votre objet Benchmark dans l'application Salesforce avec le nom du champ dans l'application SEED. Vous pouvez utiliser le gestionnaire d'object dans Salesforce pour trouver les noms de champs (et non les étiquettes de champs)", + "SF_PORTFOLIO_DESC": "Cette intégration vous permet également de connecter votre organisation à une instance Salesforce, mais suppose que Salesforce est configuré avec des objets Objectif et Rapport annuel qui seront mis à jour avec des données au niveau du portefeuille (agrégées à partir de plusieurs propriétés dans SEED). ", "SF_SCHEDULED_UPDATE_TEXT": "Si vous désirez faire une mise à jour automatique de l'application Salesforce quotidiennement, configurez les champs ci-dessous", "SF_SECURITY_TOKEN_TEXT": "Jeton d'authentification Salesforce", "SF_SEED_BENCHMARK_ID_FIELDNAME_TEXT": "Nom du champ dans SEED utilisé pour identifier uniquement un object 'Benchmark'. Example: 'Salesforce Benchmark ID'", @@ -1206,6 +1218,7 @@ "SUGGEST_UPDATE_GEOCODE_COLS": "Mettez à jour les paramètres de colonne de géocodage dans la page des paramètres de colonne de votre organisation.", "Salesforce": "Salesforce", "Salesforce Account Object Record Type": "Type d'enregistrement pour Compte Salesforce", + "Salesforce Connection": "Connexion Salesforce", "Salesforce Connection Parameters": "Paramètres pour la Connexion Salesforce", "Salesforce Contact Object Record Type": "Type d'enregistrement pour Contact Salesforce", "Salesforce Field Mappings": "Attribution de champs Salesforce", @@ -1213,6 +1226,7 @@ "Salesforce Instance URL": "Salesforce URL", "Salesforce Integration": "Intégration de Salesforce", "Salesforce Unique Benchmark ID Fieldname": "Unique nom de champ pour Benchmark ID Salesforce", + "Salesforce connection successful": "Connexion à Salesforce réussie", "Save": "Enregistrer", "Save Changes": "Enregistrer Les Modifications", "Save Concatenation": "Enregistrer la concaténation", diff --git a/src/@seed/services/terms/terms.service.ts b/src/@seed/services/terms/terms.service.ts index 4ca2d5c4..aafbacc8 100644 --- a/src/@seed/services/terms/terms.service.ts +++ b/src/@seed/services/terms/terms.service.ts @@ -7,9 +7,9 @@ export class TermsService { showTermsOfService(): void { this._confirmationService.open({ - title: 'DOE Standard Energy Efficiency Data Platform | NREL Data Terms', + title: 'DOE Standard Energy Efficiency Data Platform | NLR Data Terms', message: `
-

You, and your company or organization (the PROVIDER) have agreed to upload and provide PROPRIETARY DATA, including energy efficiency data, building data, and building energy performance data to the Standard Energy Efficiency Data (SEED™) Platform database that the U.S. Department of Energy (the Government) and Alliance for Sustainable Energy, LLC (“Alliance”) the manager and operator of the National Renewable Energy Laboratory (“NREL”) (the RECIPIENT) have created and provide for use for registered users.

+

You, and your company or organization (the PROVIDER) have agreed to upload and provide PROPRIETARY DATA, including energy efficiency data, building data, and building energy performance data to the Standard Energy Efficiency Data (SEED™) Platform database that the U.S. Department of Energy (the Government) and Alliance for Energy Innovation, LLC (“Alliance”) the manager and operator of the National Laboratory of the Rockies (“NLR”) (the RECIPIENT) have created and provide for use for registered users.

PROPRIETARY DATA is defined as follows:

(a) information that embody trade secrets or commercial or financial information that is confidential and privileged; (b) information that is confidential and privileged and developed at private expense (i.e., not with Federal funds); (c) information that is not customarily released to the public; and/or (d) information whose disclosure to the public could result in financial harm to the PROVIDER, to owners of buildings whose information is contained in the PROPRIETARY DATA, or to other stakeholders.

In order to upload PROPRIETARY DATA, you will be required to create an account and provide the RECIPIENT with a username, password, and email address. You are solely responsible for maintaining the confidentiality of the password and username you provided during the registration process and are fully responsible for all activities that occur under your password or account.

diff --git a/src/app/mock-api/common/auth/api.ts b/src/app/mock-api/common/auth/api.ts index e2f2236c..370c6e39 100644 --- a/src/app/mock-api/common/auth/api.ts +++ b/src/app/mock-api/common/auth/api.ts @@ -42,7 +42,7 @@ export class AuthMockApi { this._mockApiService.onPost('api/auth/sign-in', 1500).reply(({ request }) => { // Sign in successful const body = request.body as Record - if (body.email === 'alex.swindler@nrel.gov' && body.password === 'password') { + if (body.email === 'alex.swindler@nlr.gov' && body.password === 'password') { return [ 200, { diff --git a/src/app/mock-api/common/user/data.ts b/src/app/mock-api/common/user/data.ts index 0ef3a365..13d01897 100644 --- a/src/app/mock-api/common/user/data.ts +++ b/src/app/mock-api/common/user/data.ts @@ -3,15 +3,15 @@ import type { CurrentUser } from '@seed/api' export const user: CurrentUser = { first_name: 'Alex', last_name: 'Swindler', - email: 'Alex.Swindler@nrel.gov', - username: 'alex.swindler@nrel.gov', + email: 'Alex.Swindler@nlr.gov', + username: 'alex.swindler@nlr.gov', api_key: '226347f24542d889e2f76c043696cfd21d1e0556', is_superuser: true, id: 1, pk: 1, two_factor_method: 'disabled', org_id: 1, - org_name: 'NREL', + org_name: 'NLR', org_role: 'owner', ali_name: 'root', ali_id: 1, diff --git a/src/app/modules/auth/sign-in/sign-in.component.html b/src/app/modules/auth/sign-in/sign-in.component.html index a26902f8..2ee9fba6 100644 --- a/src/app/modules/auth/sign-in/sign-in.component.html +++ b/src/app/modules/auth/sign-in/sign-in.component.html @@ -72,11 +72,11 @@ NREL Data TermsNLR Data Terms @if (isTermsInvalid) { - You must accept the NREL Data Terms. + You must accept the NLR Data Terms. }
diff --git a/src/app/modules/auth/sign-up/sign-up.component.html b/src/app/modules/auth/sign-up/sign-up.component.html index 41fd72db..67dd85bb 100644 --- a/src/app/modules/auth/sign-up/sign-up.component.html +++ b/src/app/modules/auth/sign-up/sign-up.component.html @@ -65,11 +65,11 @@ NREL Data TermsNLR Data Terms @if (isTermsInvalid) { - You must accept the NREL Data Terms. + You must accept the NLR Data Terms. } diff --git a/src/app/modules/main/about/about.component.html b/src/app/modules/main/about/about.component.html index b32e7ea8..127c3d3e 100644 --- a/src/app/modules/main/about/about.component.html +++ b/src/app/modules/main/about/about.component.html @@ -4,19 +4,19 @@

Development Team:

Version

diff --git a/src/app/modules/main/documentation/documentation.component.ts b/src/app/modules/main/documentation/documentation.component.ts index bf3dc460..ef83c98f 100644 --- a/src/app/modules/main/documentation/documentation.component.ts +++ b/src/app/modules/main/documentation/documentation.component.ts @@ -25,7 +25,7 @@ export class DocumentationComponent { `, @@ -139,11 +139,11 @@ export class DocumentationComponent { answer: `

You can find more information about organizations contributing to SEED Platform development below:

`, }, ], diff --git a/src/index.html b/src/index.html index 187856bb..1344208d 100644 --- a/src/index.html +++ b/src/index.html @@ -1,4 +1,4 @@ - +