Skip to content

Commit

Permalink
chore(sage-monorepo): update monorepo workspace (#2741)
Browse files Browse the repository at this point in the history
  • Loading branch information
tschaffter authored Jul 16, 2024
1 parent e5cd2b3 commit 2210b3d
Show file tree
Hide file tree
Showing 91 changed files with 3,128 additions and 3,481 deletions.
25 changes: 8 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,7 @@
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
// "@nx/enforce-module-boundaries": [
// "error",
// {
// "enforceBuildableLibDependency": true,
// "allow": [],
// "depConstraints": [
// {
// "sourceTag": "*",
// "onlyDependOnLibsWithTags": ["*"]
// }
// ]
// }
// ]
}
"rules": {}
},
{
"files": ["*.ts", "*.tsx"],
Expand All @@ -38,13 +24,18 @@
"singleQuote": true,
"printWidth": 80
}
]
],
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": "*.json",
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ build
# Angular
.angular

/.nx/cache
/.nx/cache
/.nx/workspace-data
6 changes: 3 additions & 3 deletions apps/model-ad/app/src/_app-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
@include mat.typography-hierarchy(fonts.$lato);
@include mat.core();

$primary: mat.define-palette(palettes.$dark-blue-palette, 600);
$accent: mat.define-palette(palettes.$accent-purple-palette, 400);
$primary: mat.m2-define-palette(palettes.$dark-blue-palette, 600);
$accent: mat.m2-define-palette(palettes.$accent-purple-palette, 400);

$theme: mat.define-light-theme(
$theme: mat.m2-define-light-theme(
(
color: (
primary: $primary,
Expand Down
6 changes: 3 additions & 3 deletions apps/openchallenges/app/src/_app-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
@include mat.typography-hierarchy(fonts.$lato);
@include mat.core();

$primary: mat.define-palette(palettes.$dark-blue-palette, 600);
$accent: mat.define-palette(palettes.$accent-purple-palette, 400);
$primary: mat.m2-define-palette(palettes.$dark-blue-palette, 600);
$accent: mat.m2-define-palette(palettes.$accent-purple-palette, 400);

$theme: mat.define-light-theme(
$theme: mat.m2-define-light-theme(
(
color: (
primary: $primary,
Expand Down
10 changes: 5 additions & 5 deletions docs/_archive/app-styles-themes-assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Seed the theme file with the following template:
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, primary);
$accent: map.get($config, accent);
$warn: map.get($config, warn);
Expand All @@ -94,12 +94,12 @@ Seed the theme file with the following template:
// Specify the colors of the elements of the component here.
// Example:
.awesome-class {
color: mat.get-color-from-palette($primary, default);
color: mat.m2-get-color-from-palette($primary, default);
}
}

@mixin typography($theme) {
$config: mat.get-typography-config($theme);
$config: mat.m2-get-typography-config($theme);

// Specify the typography of the elements of the component here.
// Example:
Expand All @@ -111,12 +111,12 @@ Seed the theme file with the following template:
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
6 changes: 3 additions & 3 deletions docs/_archive/create-a-new-angular-component.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Once the exported styles files are copy-pasted to the app, some additional steps
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, 'primary');
$accent: map.get($config, 'accent');
$warn: map.get($config, 'warn');
Expand All @@ -349,12 +349,12 @@ Once the exported styles files are copy-pasted to the app, some additional steps
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
1 change: 0 additions & 1 deletion docs/_archive/projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
| openchallenges-styles | OpenChallenges SCSS styles |
| openchallenges-themes | OpenChallenges SCSS themes |
| openchallenges-ui | OpenChallenges reusable UI components |
| openchallenges-user-profile | OpenChallenges User profile page |
| shared-assets | Assets shared by multiple TypeScript projects |
| shared-java-util | Util library shared by multiple Java projects |
| shared-styles | SCSS styles shared by multiple TypeScript projects |
Expand Down
12 changes: 6 additions & 6 deletions libs/model-ad/not-found/src/lib/_not-found-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, primary);
$accent: map.get($config, accent);

.home-btn {
background-color: mat.get-color-from-palette($accent) !important;
background-color: mat.m2-get-color-from-palette($accent) !important;
color: white !important;
}
.home-btn:hover {
background-color: mat.get-color-from-palette($accent, 500);
background-color: mat.m2-get-color-from-palette($accent, 500);
}
}

@mixin typography($theme) {
$config: mat.get-typography-config($theme);
$config: mat.m2-get-typography-config($theme);

.err-code {
font-size: 160px;
}
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
19 changes: 9 additions & 10 deletions libs/model-ad/themes/src/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@

@import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap');


$lato: mat.define-typography-config(
$lato: mat.m2-define-typography-config(
$font-family: "'Lato', sans-serif",
$headline-5: mat.define-typography-level(46px, 56px, 700),
$headline-6: mat.define-typography-level(40px, 50px, 700),
$subtitle-1: mat.define-typography-level(28px, 38px, 700, $letter-spacing: -0.1px),
$subtitle-2: mat.define-typography-level(20px, 32px, 400, $letter-spacing: -0.1px),
$body-1: mat.define-typography-level(21px, 36px, 400, $letter-spacing: -0.1px),
$body-2: mat.define-typography-level(16px, 26px, 400),
$caption: mat.define-typography-level(14px, 21px, 400),
$button: mat.define-typography-level(16px, 18px, 700),
$headline-5: mat.m2-define-typography-level(46px, 56px, 700),
$headline-6: mat.m2-define-typography-level(40px, 50px, 700),
$subtitle-1: mat.m2-define-typography-level(28px, 38px, 700, $letter-spacing: -0.1px),
$subtitle-2: mat.m2-define-typography-level(20px, 32px, 400, $letter-spacing: -0.1px),
$body-1: mat.m2-define-typography-level(21px, 36px, 400, $letter-spacing: -0.1px),
$body-2: mat.m2-define-typography-level(16px, 26px, 400),
$caption: mat.m2-define-typography-level(14px, 21px, 400),
$button: mat.m2-define-typography-level(16px, 18px, 700),
);
12 changes: 6 additions & 6 deletions libs/model-ad/ui/src/lib/footer/_footer-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
@use 'libs/model-ad/styles/src/lib/constants';

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, 'primary');
$accent: map.get($config, 'accent');
$warn: map.get($config, 'warn');

footer {
background-color: mat.get-color-from-palette($primary, 600);
background-color: mat.m2-get-color-from-palette($primary, 600);
color: #fff;
}
.footer-link-group a,
.footer-links a {
color: #fff;
}
.footer-bottom {
background-color: mat.get-color-from-palette($primary, 800);
background-color: mat.m2-get-color-from-palette($primary, 800);
}
}

@mixin typography($theme) {
$config: mat.get-typography-config($theme);
$config: mat.m2-get-typography-config($theme);

footer {
font-weight: 500;
Expand All @@ -48,12 +48,12 @@
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
10 changes: 5 additions & 5 deletions libs/openchallenges/about/src/lib/_about-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, primary);
$accent: map.get($config, accent);

.goal-icon {
background-color: mat.get-color-from-palette($primary, 50);
background-color: mat.m2-get-color-from-palette($primary, 50);
}
}

@mixin typography($theme) {
$config: mat.get-typography-config($theme);
$config: mat.m2-get-typography-config($theme);

.container p {
font-size: 17px;
Expand All @@ -21,12 +21,12 @@
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, 'primary');
$accent: map.get($config, 'accent');
$warn: map.get($config, 'warn');
Expand Down Expand Up @@ -46,12 +46,12 @@
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
14 changes: 7 additions & 7 deletions libs/openchallenges/challenge/src/lib/_challenge-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, 'primary');
$accent: map.get($config, 'accent');
$warn: map.get($config, 'warn');
Expand Down Expand Up @@ -45,8 +45,8 @@
color: #000;

&.active {
color: #1C5E2A;
background-color: #D0FEDD;
color: #1c5e2a;
background-color: #d0fedd;
}

&.completed {
Expand All @@ -55,8 +55,8 @@
}

&.upcoming {
color: #E1861F;
background-color: #FFF5D1;
color: #e1861f;
background-color: #fff5d1;
}
}

Expand Down Expand Up @@ -94,12 +94,12 @@
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use '@angular/material' as mat;

@mixin color($theme) {
$config: mat.get-color-config($theme);
$config: mat.m2-get-color-config($theme);
$primary: map.get($config, 'primary');
$accent: map.get($config, 'accent');
$warn: map.get($config, 'warn');
Expand All @@ -13,12 +13,12 @@
}

@mixin theme($theme) {
$color-config: mat.get-color-config($theme);
$color-config: mat.m2-get-color-config($theme);
@if $color-config != null {
@include color($theme);
}

$typography-config: mat.get-typography-config($theme);
$typography-config: mat.m2-get-typography-config($theme);
@if $typography-config != null {
@include typography($theme);
}
Expand Down
Loading

0 comments on commit 2210b3d

Please sign in to comment.