Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
38d065f
Merge branch 'minh-nguyen-branch' of https://github.com/Computer-Scie…
minhngo3818 Jun 27, 2022
9a164d7
push misc-modification
minhngo3818 Jul 21, 2022
a56e2af
install format packages
minhngo3818 Jul 23, 2022
475bcb1
Add a instruction for format stylings
minhngo3818 Jul 23, 2022
439398f
Update README.md
minhngo3818 Jul 23, 2022
56873d3
Revert "push misc-modification"
minhngo3818 Jul 23, 2022
90f1cdb
fix typos and add rules
minhngo3818 Jul 23, 2022
bf00065
This fixes issue #12 which opens the corresponding tab indicated by e…
DanielZavala11 Jul 24, 2022
c1f8b84
add rules & setup dependencies for formatting
minhngo3818 Jul 25, 2022
441919b
update rules
minhngo3818 Jul 25, 2022
41c9b71
change unused vars rule from error to warn
minhngo3818 Jul 25, 2022
95093f3
update resources css
minhngo3818 Jul 26, 2022
83c7204
Merge branch 'main' into resources-css
minhngo3818 Jul 27, 2022
da2c968
add some instructions for formatting code
minhngo3818 Jul 29, 2022
cf4be94
add faker to generate fake data
minhngo3818 Jul 30, 2022
12c4ee3
add activity dummy data
minhngo3818 Jul 30, 2022
d80bb6c
Merge pull request #16 from minhngo3818/misc-modifcation
minhngo3818 Jul 30, 2022
ea3af29
Merge pull request #32 from Computer-Science-Club-OCC/format-code-ins…
minhngo3818 Jul 30, 2022
423e9c6
Merge pull request #19 from DanielZavala11/daniel-zavala-changes-branch
KHVBui Jul 31, 2022
6ecb9e5
Merge branch 'main' into resources-css
minhngo3818 Aug 1, 2022
a76576c
Remove redundant code for useState & toggleTab
KHVBui Aug 1, 2022
b68fb08
Keep imports of Resource section's file
KHVBui Aug 1, 2022
7fee78a
Merge pull request #21 from minhngo3818/resources-css
KHVBui Aug 1, 2022
de0317d
apply npm run format::fix to whole project
KHVBui Aug 1, 2022
4cb799f
Merge pull request #34 from Computer-Science-Club-OCC/prettier-reformat
KHVBui Aug 1, 2022
261bf69
Remove unnecessary files for the Navigation bar
KHVBui Aug 1, 2022
8feb67d
Delete activity-mockup.html
KHVBui Aug 1, 2022
16e8bdb
Remove unnecessary comments from Activity.js
KHVBui Aug 1, 2022
a093bd5
Remove unnecessary imports, comments, & functions
KHVBui Aug 1, 2022
96dbd71
Merge pull request #36 from Computer-Science-Club-OCC/file-cleanup
KHVBui Aug 1, 2022
e9a1d21
Merge branch 'Computer-Science-Club-OCC:main' into activity-dummy-dat…
Aug 1, 2022
b1d9463
Replaced '==' with '==='
KHVBui Aug 1, 2022
1a0cadf
Remove "unexpected" file extension "js"
KHVBui Aug 1, 2022
e15c41e
Create temp alt prop for Activity images
KHVBui Aug 1, 2022
5afd7aa
Resolve "no-static-element-interactions"
KHVBui Aug 1, 2022
fdddffa
Merge pull request #33 from minhngo3818/activity-dummy-data-merge
KHVBui Aug 1, 2022
cae51a2
Merge pull request #38 from Computer-Science-Club-OCC/Apply-Linter-Rules
minhngo3818 Aug 1, 2022
233b0f2
reformat fakeData for activity
minhngo3818 Aug 2, 2022
973e9f0
Merge pull request #42 from Computer-Science-Club-OCC/reformat-fakeDa…
KHVBui Aug 2, 2022
96c9038
Create Github Actions workflow for testing builds
KHVBui Aug 2, 2022
6f7b12f
Set CI to false to avoid treating warnings as errors
KHVBui Aug 2, 2022
8febf98
Remove npm test
KHVBui Aug 2, 2022
19e249b
Correct eol error from Prettier in windows build
KHVBui Aug 2, 2022
f6b1180
Merge pull request #35 from Computer-Science-Club-OCC/Build-Test-for-CI
minhngo3818 Aug 3, 2022
7daa3d4
Replace website's background image with solid black color
KHVBui Aug 3, 2022
88eaa15
Merge pull request #40 from Computer-Science-Club-OCC/change-background
KHVBui Aug 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"env": {
"browser": true,
"node": true,
"es2021": true,
"jest": true
},
"extends": [
"airbnb",
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:jest/recommended",
"plugin:jsx-a11y/recommended",
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react",
"jsx-a11y",
"prettier"
],
"rules": {
"indent": "off",
"no-unused-vars": "warn",
"no-empty-function": "error",
"no-underscore-dangle": "off",
"no-unused-expressions": "error",
"prettier/prettier": "error",
"arrow-body-style": "off",
"prefer-arrow-callback": "off",
"jsx-a11y/anchor-is-valid": [
"error",
{
"components": [ "Link" ],
"specialLink": [ "onClick", "to" ],
"aspects": [ "noHref" ]
}
],
"jsx-a11y/click-events-have-key-events": "off",
"jsx-a11y/interactive-supports-focus": "warn",
"react/button-has-type": "warn",
"react/jsx-uses-react": "off",
"react/jsx-filename-extension": "off",
"react/react-in-jsx-scope": "off",
"react/jsx-props-no-spreading": "warn",
"react/jsx-key": "off",
"no-shadow": "off",
"no-use-before-define": "warn",
"spaced-comment": [
"error",
"always",
{
"exceptions": [ "-", "*" ]
}
]
}
}
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto eol=lf
47 changes: 47 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build_test:

runs-on: ${{ matrix.os }}
env:
CI: false
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
node-version: [14.x]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- name: Install packages
run: npm ci

- name: Prettier
run: npm run format:diff

- name: Lint
run: npm run lint

- run: npm run build --if-present
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore artifacts:
dist
build
coverage
node_modules
19 changes: 19 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": true,
"semi": true,
"singleQuote": false,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "avoid",
"endOfLine": "lf",
"overrides": [
{
"files": "*.html",
"options": {
"parser": "html"
}
}
]
}
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@ To build:
Then run:

### `npm start`


# Format code
Before running server or pushing your commits.
Please run:
### `npm run format:fix`

Fix any red error messages that appear on browser or terminal, then save debugged files. The website will run normally after that.

Loading