Linh - Implement Bluesky auto-poster frontend

.github/workflows/deploy.yml

@@ -23,14 +23,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
       # We don't run tests here since we assume it's already done during PR process.
       # - name: Update Browser List
       #   run: npx browserslist@latest --update-db
       - name: Build React App
-        run: yarn run build && cp build/index.html build/200.html 
+        run: npm run build && cp build/index.html build/200.html 
         env:
           NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
           REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}

.github/workflows/pull_request_test.yml

@@ -49,10 +49,10 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 20
-        cache: 'yarn'
+        cache: 'npm'
     - name: Install Dependencies
-      run: yarn install --frozen-lockfile
+      run: npm ci
     - name: Run Unit Tests for Changed Files Only
-      run: yarn run test:changed
+      run: npm run test:changed
     - name: Run Lint
-      run: yarn run lint
+      run: npm run lint

.github/workflows/test.yml

@@ -12,17 +12,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up Node.js & cache Yarn
+      - name: Set up Node.js & cache npm
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: yarn
+          cache: npm
 
       - name: Install dependencies
-        run: yarn install
+        run: npm ci
 
       - name: Run tests
-        run: yarn test
+        run: npm test
 
       - name: Upload test results
         if: failure()

fix-conflicts.js

@@ -0,0 +1,70 @@
+const fs = require('fs');
+
+const files = [
+  'src/components/Announcements/SocialMediaComposer.module.css',
+  'src/components/ApplicationAnalytics/jobAnalytics.module.css',
+  'src/components/BMDashboard/AddMaterial/AddMaterial.module.css',
+  'src/components/BMDashboard/Equipment/Update/UpdateEquipment.module.css',
+  'src/components/BMDashboard/Issues/issueChart.module.css',
+  'src/components/BMDashboard/Issues/issueCharts.module.css',
+  'src/components/BMDashboard/ItemList/ItemListView.module.css',
+  'src/components/BMDashboard/Lesson/LessonForm.module.css',
+  'src/components/BMDashboard/LessonList/LessonCard.module.css',
+  'src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.module.css',
+  'src/components/BMDashboard/UtilizationChart/UtilizationChart.module.css',
+  'src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.module.css',
+  'src/components/BMDashboard/WeeklyProjectSummary/IssueBreakdownChart.module.css',
+  'src/components/Collaboration/Collaboration.module.css',
+  'src/components/CommunityPortal/Activities/ActivityAttendance.module.css',
+  'src/components/CommunityPortal/Activities/activityId/ActivityComments.module.css',
+  'src/components/EductionPortal/EvaluationResults/EvaluationResults.module.css',
+  'src/components/EductionPortal/EvaluationResults/OverallPerformance.module.css',
+  'src/components/EductionPortal/EvaluationResults/TeacherFeedback.module.css',
+  'src/components/EductionPortal/StudentTasks/StudentTasks.module.css',
+  'src/components/EductionPortal/StudentTasks/TaskDetails.module.css',
+  'src/components/ExperienceDonutChart/ExperienceDonutChart.module.css',
+  'src/components/Header/Header.module.css',
+  'src/components/HGNForm/TopCommunityMembers/TopCommunityMembers.module.css',
+  'src/components/HGNPRDashboard/ReviewersStackedBarChart/ReviewersStackedBarChart.module.css',
+  'src/components/HGNSkillsDashboard/SkillsProfilePage/styles/ProfileDetails.module.css',
+  'src/components/LandingPage/HelpModal.module.css',
+  'src/components/LBDashboard/SentimentBreakdownDonutChart/SentimentBreakdownDonutChart.module.css',
+  'src/components/MaterialSummary/MaterialSummary.module.css',
+  'src/components/Projects/projects.module.css',
+];
+
+function resolveKeepHead(content) {
+  const lines = content.split('\n');
+  const result = [];
+  let state = 'normal';
+  for (const line of lines) {
+    if (line.startsWith('<<<<<<< ')) {
+      state = 'head';
+    } else if (line === '=======' && state === 'head') {
+      state = 'other';
+    } else if (line.startsWith('>>>>>>> ') && state === 'other') {
+      state = 'normal';
+    } else if (state !== 'other') {
+      result.push(line);
+    }
+  }
+  return result.join('\n');
+}
+
+let count = 0;
+for (const f of files) {
+  if (!fs.existsSync(f)) {
+    console.log('NOT FOUND: ' + f);
+    continue;
+  }
+  const content = fs.readFileSync(f, 'utf8');
+  if (!content.includes('<<<<<<<')) {
+    console.log('No conflict: ' + f);
+    continue;
+  }
+  const resolved = resolveKeepHead(content);
+  fs.writeFileSync(f, resolved, 'utf8');
+  console.log('Fixed: ' + f);
+  count++;
+}
+console.log('Total: ' + count);

jsconfig.json

@@ -7,4 +7,3 @@
   },
   "include": ["src"]
 }
-