refactor: clean up after rebase and component-generator

openedx · Jul 27, 2023 · acaff78 · acaff78
1 parent 06cc767
commit acaff78
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/component-generator/constants.js b/component-generator/constants.js
@@ -23,8 +23,8 @@ exports.COMPONENT_FILES = [
     templatePath: path.resolve(__dirname, './templates/README.md'),
   },
   {
-    targetPath: path.resolve(__dirname, '../src/componentName/componentName.scss'),
-    templatePath: path.resolve(__dirname, './templates/styles.scss'),
+    targetPath: path.resolve(__dirname, '../src/componentName/index.scss'),
+    templatePath: path.resolve(__dirname, './templates/index.scss'),
   },
   {
     targetPath: path.resolve(__dirname, '../src/componentName/componentName.test.jsx'),

diff --git a/component-generator/templates/styles.scss → component-generator/templates/index.scss b/component-generator/templates/styles.scss → component-generator/templates/index.scss
diff --git a/component-generator/utils.js b/component-generator/utils.js
@@ -81,7 +81,7 @@ function addComponentToExports(componentName) {
   );
   fs.appendFileSync(
     path.resolve(__dirname, '../src/index.scss'),
-    `@import './${componentName}/${componentName}.scss';\n`,
+    `@import "./${componentName}";\n`,
   );
 }
 

diff --git a/src/ChipCarousel/ChipCarousel.scss → src/ChipCarousel/index.scss b/src/ChipCarousel/ChipCarousel.scss → src/ChipCarousel/index.scss
@@ -14,19 +14,19 @@
       }
     }
   }
-}
 
-.pgn__chip-carousel__right-control,
-.pgn__chip-carousel__left-control {
-  position: absolute;
-  z-index: 2;
-  top: $chip-carousel-controls-top-offset;
-}
+  .pgn__chip-carousel__right-control,
+  .pgn__chip-carousel__left-control {
+    position: absolute;
+    z-index: 2;
+    top: $chip-carousel-controls-top-offset;
+  }
 
-.pgn__chip-carousel__right-control {
-  right: 0;
-}
+  .pgn__chip-carousel__right-control {
+    right: 0;
+  }
 
-.pgn__chip-carousel__left-control {
-  left: 0;
+  .pgn__chip-carousel__left-control {
+    left: 0;
+  }
 }
diff --git a/src/index.scss b/src/index.scss
@@ -11,7 +11,7 @@
 @import "./Collapsible";
 @import "./CloseButton";
 @import "./Chip";
-@import "./ChipCarousel/ChipCarousel";
+@import "./ChipCarousel";
 @import "./Code";
 @import "./Dropdown";
 @import "./Fieldset";