Skip to content

Commit

Permalink
Simplified prose-sm usage
Browse files Browse the repository at this point in the history
  • Loading branch information
axelstudios committed Jan 14, 2025
1 parent 1e36dc1 commit b02631c
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: `<div class="prose prose-sm h-160 max-h-[calc(100vh-220px)] overflow-auto sm:-mr-10 sm:pr-10 mt-4 max-w-none">
message: `<div class="prose h-160 max-h-[calc(100vh-220px)] overflow-auto sm:-mr-10 sm:pr-10 mt-4 max-w-none">
<p>You, and your company or organization (the <strong>PROVIDER</strong>) have agreed to upload and provide <strong>PROPRIETARY DATA</strong>, 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 <strong>RECIPIENT</strong>) have created and provide for use for registered users.</p>
<p><strong>PROPRIETARY DATA</strong> is defined as follows:</p>
<p>(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.</p>
Expand Down
12 changes: 7 additions & 5 deletions src/@seed/styles/tailwind.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
18 changes: 0 additions & 18 deletions src/app/core/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -25,29 +22,14 @@ export class AuthService {
return localStorage.getItem('accessToken') ?? ''
}

/**
* Forgot password
*
* @param email
*/
forgotPassword(email: string): Observable<any> {
return this._httpClient.post('api/auth/forgot-password', email)
}

/**
* Reset password
*
* @param password
*/
resetPassword(password: string): Observable<any> {
return this._httpClient.post('api/auth/reset-password', password)
}

/**
* Sign in
*
* @param credentials
*/
signIn(credentials: { email: string; password: string }): Observable<any> {
// Throw error, if the user is already logged in
if (this._authenticated) {
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/main/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 class="truncate text-3xl font-extrabold capitalize leading-7 tracking-tight
</div>

<div class="flex-auto p-6 sm:p-10">
<div class="prose prose-sm max-w-3xl">
<div class="prose max-w-3xl">
<p>
The <strong>Standard Energy Efficiency Data (SEED)™ Platform</strong> 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
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/main/contact/contact.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 class="truncate text-3xl font-extrabold capitalize leading-7 tracking-tight
</div>

<div class="flex-auto p-6 sm:p-10">
<div class="prose prose-sm max-w-3xl">
<div class="prose max-w-3xl">
<h2>For SEED Platform™ Users:</h2>
<ul>
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<mat-expansion-panel-header [collapsedHeight]="'56px'">
<mat-panel-title class="select-none font-medium leading-tight">{{ faq.question }}</mat-panel-title>
</mat-expansion-panel-header>
<div class="prose prose-sm max-w-none" [innerHTML]="faq.answer" innerHTMLExternalLinks innerHTMLImageOverlay></div>
<div class="prose max-w-none" [innerHTML]="faq.answer" innerHTMLExternalLinks innerHTMLImageOverlay></div>
</mat-expansion-panel>
}
</mat-accordion>
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/main/home/home.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="flex min-w-0 flex-auto flex-col" *transloco="let t">
<div class="prose prose-sm flex-auto p-6 sm:p-10">
<div class="prose flex-auto p-6 sm:p-10">
<h1>{{ t('The SEED Platform™') }}</h1>
<p>{{ t('SEED_SUMMARY') }}</p>
</div>
Expand Down

0 comments on commit b02631c

Please sign in to comment.