feat: add checks for url and logo

angular-sanctuary · Jun 28, 2024 · ceb227f · ceb227f
1 parent 866fa51
commit ceb227f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 25 deletions.
diff --git a/plugin/src/generators/create-community/generator.ts b/plugin/src/generators/create-community/generator.ts
@@ -2,22 +2,15 @@ import { logger, readJson, Tree, updateJson } from '@nx/devkit';
 import { CreateCommunityGeneratorSchema } from './schema';
 import { exit } from 'node:process';
 import { Community } from '../models/community';
+import { isPublicAsset } from '../utils/isPublicAsset';
 
 const COMMUNITIES_PATH = 'angular-hub/src/public/assets/data/community.json';
 
 export async function createCommunityGenerator(
   tree: Tree,
   options: CreateCommunityGeneratorSchema,
 ) {
-  const { name, type } = options;
-
-  const packageJson = readJson(tree, 'package.json');
-  const angularCorePackage = packageJson['dependencies']['@angular/core'];
-
-  if (!angularCorePackage) {
-    logger.error(`[angular-hub] No @angular/core detected`);
-    return exit(1);
-  }
+  const { name, type, url, logo } = options;
 
   if (!name) {
     logger.error('[angular-hub] Name is missing');
@@ -29,6 +22,19 @@ export async function createCommunityGenerator(
     return exit(1);
   }
 
+  if (url && !isPublicAsset(url)) {
+    logger.error(
+      '[angular-hub] Url is not valid (should start with https or http). ',
+    );
+    return exit(1);
+  }
+
+  if (logo && !isPublicAsset(logo)) {
+    logger.info(
+      '[angular-hub] Make sure you upload the logo file at logos folder in the assets directory',
+    );
+  }
+
   const existingCommunities: Community[] = readJson(tree, COMMUNITIES_PATH);
 
   if (isCommunityExisting(existingCommunities, name)) {

diff --git a/plugin/src/generators/create-event/generator.ts b/plugin/src/generators/create-event/generator.ts
@@ -9,14 +9,6 @@ export async function createEventGenerator(
   tree: Tree,
   options: CreateEventGeneratorSchema,
 ) {
-  const packageJson = readJson(tree, 'package.json');
-  const angularCorePackage = packageJson['dependencies']['@angular/core'];
-
-  if (!angularCorePackage) {
-    logger.error(`[angular-hub] No @angular/core detected`);
-    return exit(1);
-  }
-
   if (!options.communityName) {
     logger.error('[angular-hub] Community name is missing');
     return exit(1);

diff --git a/plugin/src/generators/create-podcast/generator.ts b/plugin/src/generators/create-podcast/generator.ts
@@ -2,6 +2,7 @@ import { logger, readJson, Tree, updateJson } from '@nx/devkit';
 import { CreatePodcastGeneratorSchema } from './schema';
 import { exit } from 'node:process';
 import { Podcast } from '../models/podcast';
+import { isPublicAsset } from '../utils/isPublicAsset';
 
 const PODCASTS_PATH = 'angular-hub/src/public/assets/data/podcast.json';
 
@@ -11,14 +12,6 @@ export async function createPodcastGenerator(
 ) {
   const { name, logo, language, url } = options;
 
-  const packageJson = readJson(tree, 'package.json');
-  const angularCorePackage = packageJson['dependencies']['@angular/core'];
-
-  if (!angularCorePackage) {
-    logger.error(`[angular-hub] No @angular/core detected`);
-    return exit(1);
-  }
-
   if (!name) {
     logger.error('[angular-hub] Name is missing');
     return exit(1);
@@ -39,6 +32,19 @@ export async function createPodcastGenerator(
     return exit(1);
   }
 
+  if (!isPublicAsset(url)) {
+    logger.error(
+      '[angular-hub] Url is not valid (should start with https or http). ',
+    );
+    return exit(1);
+  }
+
+  if (!isPublicAsset(logo)) {
+    logger.info(
+      '[angular-hub] Make sure you upload the logo file at logos folder in the assets directory',
+    );
+  }
+
   const existingPodcasts: Podcast[] = readJson(tree, PODCASTS_PATH);
 
   if (isPodcastExisting(existingPodcasts, name)) {

diff --git a/plugin/src/generators/utils/isPublicAsset.ts b/plugin/src/generators/utils/isPublicAsset.ts
@@ -0,0 +1,3 @@
+export function isPublicAsset(assetLink: string): boolean {
+  return assetLink.startsWith('https://') || assetLink.startsWith('https://');
+}