Merge pull request #20 from rrigato/dev

Pipeline deploys new homepage
rrigato · Nov 25, 2023 · 19f05c9 · 19f05c9
2 parents 6d5a695 + c14a7f6
commit 19f05c9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/.github/scripts/homepage_source_files.sh b/.github/scripts/homepage_source_files.sh
@@ -6,5 +6,5 @@ cd dist
 
 ls
 
-aws s3 cp --dry-run . $AWS_S3_BUCKET_NAME \
+aws s3 cp --dryrun . s3://$AWS_S3_BUCKET_NAME \
 --recursive
diff --git a/.github/workflows/homepage_update.yml b/.github/workflows/homepage_update.yml
@@ -2,6 +2,7 @@ name: Updates web application
 on: 
   push: 
     branches:
+      - dev
       - master
 
 jobs:
@@ -26,7 +27,7 @@ jobs:
       - run: npm run build
 
       - name: script-execution-permissions
-        run: chmod +x '.github/scripts/homepage_source_files.sh'
+        run: chmod +x '../.github/scripts/homepage_source_files.sh'
 
       - name: upload-webpack-artifacts
         shell: bash
@@ -35,7 +36,7 @@ jobs:
           AWS_DEFAULT_REGION: 'us-east-1'
           AWS_S3_BUCKET_NAME: 'ryanrigato.com'
           AWS_SECRET_ACCESS_KEY: ${{secrets.PERSISTANT_STORAGE_KEY}}
-        run: '.github/scripts/homepage_source_files.sh'
+        run: '../.github/scripts/homepage_source_files.sh'
 
 
 

diff --git a/static/js/BookRecommendations.jsx b/static/js/BookRecommendations.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import '../css/homepageSection.css';
+
+/**Book Recommendations
+ * 
+ * @returns react jsx 
+ */
+export function BookRecommendations(){
+    return(
+        <div className='homepage-content'>
+            <div>
+                <ul>
+                    <h3>Everyday Reads</h3>
+                    <h3>Software Engineering</h3>
+                </ul>
+            </div>
+        </div>
+    );
+}
diff --git a/static/tests/BookRecommendations.test.js b/static/tests/BookRecommendations.test.js
@@ -1,13 +1,13 @@
 import {  render } from '@testing-library/react';
-// import { BookRecommendations } from '../js/BookRecommendations.jsx';
+import { BookRecommendations } from '../js/BookRecommendations.jsx';
 
 
 describe('BookRecommendations displayed on screen', () => {
     afterEach(() => {
         jest.resetAllMocks();
     });
 
-    test.skip('BookRecommendations section', async () => {        
+    test('BookRecommendations section', async () => {        
 
 
         const {getAllByRole, getByRole} = render(<BookRecommendations/>);
@@ -16,6 +16,6 @@ describe('BookRecommendations displayed on screen', () => {
         const numHeaders = getAllByRole(
             'heading'
         );
-        expect(numHeaders.length).toBe(1);
+        expect(numHeaders.length).toBe(2);
     });
 });
diff --git a/static/webpack.config.js b/static/webpack.config.js
@@ -17,7 +17,7 @@ module.exports = {
                 test: /\.jpg$/i,
                 type: 'asset/resource',
                 generator: {
-                    filename: 'img/[name][ext]',
+                    filename: '[name][ext]',
                 },
             },
             {