From 12b8d5ea8619b0849238f89b24bf0c27695f5e57 Mon Sep 17 00:00:00 2001 From: MaxKless <34165455+MaxKless@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:47:09 +0200 Subject: [PATCH] cleanup(misc): make nx console links on various starter pages consistent (#19867) --- .../lib/tags/install-nx-console.component.tsx | 2 +- .../src/app/nx-welcome.component.ts__tpl__ | 40 ++++++++++++---- .../src/app/nx-welcome.component.ts__tpl__ | 40 ++++++++++++---- .../files/src/app/App.tsx.template | 28 +++++++---- .../__snapshots__/application.spec.ts.snap | 38 ++++++++++++++- .../lib/create-application-files.helpers.ts | 47 ++++++++++++++++++- .../src/components/NxWelcome.vue__tmpl__ | 36 ++++++++++---- .../files/app/src/app/App.tsx.template | 28 +++++++---- .../files/nx-welcome/src/app/nx-welcome.tsx | 42 +++++++++++++---- .../common/src/app/NxWelcome.vue.template | 42 +++++++++++++---- .../app-vite/src/app/app.element.__style__ | 10 +++- .../app-vite/src/app/app.element.ts__tmpl__ | 38 ++++++++++++++- .../app-webpack/src/app/app.element.__style__ | 10 +++- .../src/app/app.element.ts__tmpl__ | 38 ++++++++++++++- 14 files changed, 361 insertions(+), 78 deletions(-) diff --git a/nx-dev/ui-markdoc/src/lib/tags/install-nx-console.component.tsx b/nx-dev/ui-markdoc/src/lib/tags/install-nx-console.component.tsx index 591d023f6871e..c80e8dfd12635 100644 --- a/nx-dev/ui-markdoc/src/lib/tags/install-nx-console.component.tsx +++ b/nx-dev/ui-markdoc/src/lib/tags/install-nx-console.component.tsx @@ -29,7 +29,7 @@ export const InstallNxConsole = () => ( className="block text-xs font-medium opacity-80" > - The official VSCode plugin for Nx. + The official VSCode extension for Nx.

diff --git a/packages/angular/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ b/packages/angular/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ index 47c3e2ed7ba49..7089208c7e598 100644 --- a/packages/angular/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ +++ b/packages/angular/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ @@ -283,6 +283,15 @@ import { Component, ViewEncapsulation } from '@angular/core'; .nx-console svg { color: rgba(0, 122, 204, 1); } + .nx-console-jetbrains { + margin-top: 2rem; + } + .nx-console-jetbrains:hover { + background-color: rgba(255, 49, 140, 1); + } + .nx-console-jetbrains svg { + color: rgba(255, 49, 140, 1); + } #nx-repo:hover { background-color: rgba(24, 23, 23, 1); } @@ -639,24 +648,35 @@ import { Component, ViewEncapsulation } from '@angular/core'; Install Nx Console for VSCode - The official VSCode plugin for Nx. + The official VSCode extension for Nx. - IntelliJ - - + height="48" + width="48" + viewBox="20 20 60 60" + xmlns="http://www.w3.org/2000/svg" + > + + + + + + + + + + + + + + Install Nx Console for JetBrains Available for WebStorm, Intellij IDEA Ultimate and more! diff --git a/packages/angular/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ b/packages/angular/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ index f7ca04c85c840..a5ca96c8786e1 100644 --- a/packages/angular/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ +++ b/packages/angular/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ @@ -286,6 +286,15 @@ import { CommonModule } from '@angular/common'; .nx-console svg { color: rgba(0, 122, 204, 1); } + .nx-console-jetbrains { + margin-top: 2rem; + } + .nx-console-jetbrains:hover { + background-color: rgba(255, 49, 140, 1); + } + .nx-console-jetbrains svg { + color: rgba(255, 49, 140, 1); + } #nx-repo:hover { background-color: rgba(24, 23, 23, 1); } @@ -642,24 +651,35 @@ import { CommonModule } from '@angular/common'; Install Nx Console for VSCode - The official VSCode plugin for Nx. + The official VSCode extension for Nx. - IntelliJ - - + height="48" + width="48" + viewBox="20 20 60 60" + xmlns="http://www.w3.org/2000/svg" + > + + + + + + + + + + + + + + Install Nx Console for JetBrains Available for WebStorm, Intellij IDEA Ultimate and more! diff --git a/packages/expo/src/generators/application/files/src/app/App.tsx.template b/packages/expo/src/generators/application/files/src/app/App.tsx.template index 49afed21799f4..8593ac7ad5133 100644 --- a/packages/expo/src/generators/application/files/src/app/App.tsx.template +++ b/packages/expo/src/generators/application/files/src/app/App.tsx.template @@ -10,7 +10,7 @@ import { TouchableOpacity, Linking, } from 'react-native'; -import Svg, { Path } from 'react-native-svg'; +import Svg, { G, Path } from 'react-native-svg'; export const App = () => { const [whatsNextYCoord, setWhatsNextYCoord] = useState(0); @@ -308,11 +308,14 @@ export const App = () => { Install Nx Console for VSCode - The official VSCode plugin for Nx. + The official VSCode extension for Nx. + + + Linking.openURL( @@ -321,13 +324,20 @@ export const App = () => { } > - - + + + + + + + + + + + + + + - Install Nx Console - Plugin for VSCode + Install Nx Console for VSCode + The official VSCode extension for Nx. + + + + + + + + + + + + + + + + + + + + Install Nx Console for JetBrains + + Available for WebStorm, Intellij IDEA Ultimate and more! +
diff --git a/packages/next/src/generators/application/lib/create-application-files.helpers.ts b/packages/next/src/generators/application/lib/create-application-files.helpers.ts index d21e7aea5c8b4..097301a303651 100644 --- a/packages/next/src/generators/application/lib/create-application-files.helpers.ts +++ b/packages/next/src/generators/application/lib/create-application-files.helpers.ts @@ -246,10 +246,44 @@ export function createAppJsx(name: string) { - Install Nx Console - Plugin for VSCode + Install Nx Console for VSCode + The official VSCode extension for Nx. + + + + + + + + + + + + + + + + + + Install Nx Console for JetBrains + + Available for WebStorm, Intellij IDEA Ultimate and more! + + +
Install Nx Console for VSCode - The official VSCode plugin for Nx. + The official VSCode extension for Nx. - IntelliJ - + + + + + + + + + + + + + Install Nx Console for JetBrains @@ -672,6 +681,15 @@ pre { .nx-console svg { color: rgba(0, 122, 204, 1); } +.nx-console-jetbrains { + margin-top: 2rem; + } +.nx-console-jetbrains:hover { + background-color: rgba(255, 49, 140, 1); +} +.nx-console-jetbrains svg { + color: rgba(255, 49, 140, 1); +} #nx-repo:hover { background-color: rgba(24, 23, 23, 1); } diff --git a/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template b/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template index 88cb31cf2aad5..1bbb541beedf4 100644 --- a/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template +++ b/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template @@ -10,7 +10,7 @@ import { TouchableOpacity, Linking, } from 'react-native'; -import Svg, { Path } from 'react-native-svg'; +import Svg, { G, Path } from 'react-native-svg'; export const App = () => { const [whatsNextYCoord, setWhatsNextYCoord] = useState(0); @@ -308,11 +308,14 @@ export const App = () => { Install Nx Console for VSCode - The official VSCode plugin for Nx. + The official VSCode extension for Nx. + + + Linking.openURL( @@ -321,13 +324,20 @@ export const App = () => { } > - - + + + + + + + + + + + + + +