From b02631c04eed5920f9ac49e4ed8e4cd9a470fa3b Mon Sep 17 00:00:00 2001 From: Alex Swindler Date: Tue, 14 Jan 2025 15:23:54 -0700 Subject: [PATCH] Simplified prose-sm usage --- README.md | 2 +- eslint.config.mjs | 3 +++ .../terms-of-service.service.ts | 2 +- src/@seed/styles/tailwind.scss | 12 +++++++----- src/app/core/auth/auth.service.ts | 18 ------------------ .../modules/main/about/about.component.html | 2 +- .../main/contact/contact.component.html | 2 +- .../documentation/documentation.component.html | 2 +- src/app/modules/main/home/home.component.html | 2 +- 9 files changed, 16 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 4dc2528..914d4c0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ 1. Run `pnpm lint`, or `pnpm lint:fix` to automatically fix issues ### Update Translations -1. Create a `.env` file in the root of the project directory that matches the format of `.env.example`, and add your Lokalise API key +1. Create a `.env` file in the root of the project directory that matches the format of [`.env.example`](.env.example), and add your Lokalise API key 2. Run `pnpm update-translations` ## Coding Standards diff --git a/eslint.config.mjs b/eslint.config.mjs index ebe89fc..e8a788f 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -101,6 +101,9 @@ export default tseslint.config( ], 'newlines-between': 'never', }], + 'no-sequences': ['error', { + allowInParentheses: false, + }], 'object-shorthand': 'error', 'prefer-template': 'error', 'semi-style': ['error', 'first'], diff --git a/src/@seed/services/terms-of-service/terms-of-service.service.ts b/src/@seed/services/terms-of-service/terms-of-service.service.ts index 931afa9..61bb94f 100644 --- a/src/@seed/services/terms-of-service/terms-of-service.service.ts +++ b/src/@seed/services/terms-of-service/terms-of-service.service.ts @@ -9,7 +9,7 @@ export class TermsOfServiceService { // TODO move TOS to a shared constant so that it can be used on the sign-in pages this._confirmationService.open({ title: 'DOE Standard Energy Efficiency Data Platform | NREL Data Terms', - message: `
+ 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.

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.

diff --git a/src/@seed/styles/tailwind.scss b/src/@seed/styles/tailwind.scss index 646ac19..b011220 100644 --- a/src/@seed/styles/tailwind.scss +++ b/src/@seed/styles/tailwind.scss @@ -39,11 +39,6 @@ font-size: 0.875rem; } - /* Stylistic alternates for Inter */ - body { - font-feature-settings: 'salt'; - } - /* Better spacing and border for horizontal rule */ hr { margin: 32px 0; @@ -141,3 +136,10 @@ /* This injects Tailwind's component classes and any component classes registered by plugins. */ @tailwind components; + +@layer components { + .prose { + // Always apply prose-sm to prose + @apply prose-sm; + } +} diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 7d1faee..c7f1d53 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -14,9 +14,6 @@ export class AuthService { private _httpClient = inject(HttpClient) private _userService = inject(UserService) - /** - * Setter & getter for access token - */ set accessToken(token: string) { localStorage.setItem('accessToken', token) } @@ -25,29 +22,14 @@ export class AuthService { return localStorage.getItem('accessToken') ?? '' } - /** - * Forgot password - * - * @param email - */ forgotPassword(email: string): Observable { return this._httpClient.post('api/auth/forgot-password', email) } - /** - * Reset password - * - * @param password - */ resetPassword(password: string): Observable { return this._httpClient.post('api/auth/reset-password', password) } - /** - * Sign in - * - * @param credentials - */ signIn(credentials: { email: string; password: string }): Observable { // Throw error, if the user is already logged in if (this._authenticated) { diff --git a/src/app/modules/main/about/about.component.html b/src/app/modules/main/about/about.component.html index 6752315..7e171dc 100644 --- a/src/app/modules/main/about/about.component.html +++ b/src/app/modules/main/about/about.component.html @@ -8,7 +8,7 @@

-
+

The Standard Energy Efficiency Data (SEED)™ Platform is a software application that helps organizations easily manage data on the energy performance of large groups of buildings. Users can combine data from multiple sources, clean and validate diff --git a/src/app/modules/main/contact/contact.component.html b/src/app/modules/main/contact/contact.component.html index 232be03..000b3f7 100644 --- a/src/app/modules/main/contact/contact.component.html +++ b/src/app/modules/main/contact/contact.component.html @@ -8,7 +8,7 @@

-
+

For SEED Platform™ Users:

  • diff --git a/src/app/modules/main/documentation/documentation.component.html b/src/app/modules/main/documentation/documentation.component.html index 6b74dd2..ece008f 100644 --- a/src/app/modules/main/documentation/documentation.component.html +++ b/src/app/modules/main/documentation/documentation.component.html @@ -12,7 +12,7 @@ {{ faq.question }} -
    +
    } diff --git a/src/app/modules/main/home/home.component.html b/src/app/modules/main/home/home.component.html index 38e507e..2c88a6f 100644 --- a/src/app/modules/main/home/home.component.html +++ b/src/app/modules/main/home/home.component.html @@ -1,5 +1,5 @@
    -
    +

    {{ t('The SEED Platform™') }}

    {{ t('SEED_SUMMARY') }}