Skip to content

Commit

Permalink
Merge pull request #27 from oslabs-beta/dev
Browse files Browse the repository at this point in the history
Initial Dev to Main codebase merge
  • Loading branch information
YouruiR authored Jul 12, 2023
2 parents ddc49fc + de9bbd6 commit 91215a9
Show file tree
Hide file tree
Showing 67 changed files with 30,764 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Default reviewers/codeowners for all code changes
* @mbildstein @wnguye03 @li-lucia @davidan1989 @YouruiR
20 changes: 10 additions & 10 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
## Overview

Issue Type
**Issue Type**

- [x] Bug
- [ ] Feature
- [ ] Tech Debt

Description
**Description**
A clear and concise description of the issue.

Ticket Item
**Ticket Item**

Figma link - optional
Spec link - optional
**Figma link - optional**
**Spec link - optional**

Steps to Reproduce Bug / Validate Feature / Confirm Tech Debt Fix
**Steps to Reproduce Bug / Validate Feature / Confirm Tech Debt Fix**

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

Previous behavior
**Previous behavior**
A clear and concise description of what was originally happening.

Expected behavior
**Expected behavior**
A clear and concise description of what you expected to happen.

Screenshots & Videos
**Screenshots & Videos**
If applicable, add screenshots and videos to help explain your issue type.

Additional context
**Additional context**
Add any other context about the problem here.
46 changes: 46 additions & 0 deletions .github/workflows/npmCD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: npm package CD

on:
pull_request:
types:
- closed
branches:
- 'main'
jobs:
npm_publish:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Check if PR is merged
id: check_merge
run: |
if [[ "$(git log -1 --pretty=%B "${{ github.event.pull_request.merge_commit_sha }}")" == *"Merge pull request"* ]]; then
echo "::set-output name=is_merged::true"
else
echo "::set-output name=is_merged::false"
fi
- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: npm ci
working-directory: ./npm-package
- name: Build files into dist
run: npm run build
working-directory: ./npm-package
- name: Check for changes in npm-package
id: changes
run: |
if git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.merge_commit_sha }} -- npm-package/ | grep -q .; then
echo "::set-output name=changes::true"
else
echo "::set-output name=changes::false"
fi
- name: Deploy
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npm run semantic-release
if: steps.check_merge.outputs.is_merged == 'true' && steps.changes.outputs.changes == 'true'
30 changes: 30 additions & 0 deletions .github/workflows/testsAndReviews.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Node.js Continuous Integration

on:
pull_request:
branches: [ "dev", "main" ]

workflow_dispatch:

jobs:
test_pull_request:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: npm ci
working-directory: ./npm-package
- name: Build TS files
run: npm run build
working-directory: ./npm-package
- name: Start express server
run: npm start &
working-directory: ./npm-package
- name: Run backend tests
run: npm test
working-directory: ./npm-package
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/

.DS_Store
.env
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"extends": ["prettier"]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnPaste": false
}
Binary file added chrome-extension/dist.zip
Binary file not shown.
1 change: 1 addition & 0 deletions chrome-extension/dist/assets/devtools-11f8aa67.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import"./modulepreload-polyfill-3cfb730f.js";try{chrome.devtools.panels.create("NextInspect","icon.png","src/pages/panel/index.html")}catch(e){console.log(e)}
1 change: 1 addition & 0 deletions chrome-extension/dist/assets/index-8ab484eb.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 91215a9

Please sign in to comment.