Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Dev branch to Main branch #10

Merged
merged 3 commits into from
Oct 15, 2023
Merged

Merge Dev branch to Main branch #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
326d303
chore: Update all packages
lily4178993 Oct 15, 2023
7040cf9
chore(linter): Fix js linter errors
lily4178993 Oct 15, 2023
6be94d3
Merge pull request #9 from lily4178993/bugs-fix-dependencies
lily4178993 Oct 15, 2023
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
48 changes: 24 additions & 24 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"extends": ["airbnb-base"],
"rules": {
"no-shadow": "off",
"no-param-reassign": "off",
"eol-last": "off",
"import/extensions": [ 1, {
"js": "always", "json": "always"
}]
},
"ignorePatterns": [
"dist/",
"build/"
]
}
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"extends": ["airbnb-base"],
"rules": {
"no-shadow": "off",
"no-param-reassign": "off",
"eol-last": "off",
"import/extensions": [ 1, {
"js": "always", "json": "always"
}]
},
"ignorePatterns": [
"dist/",
"build/"
]
}
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
run: |
npm install --save-dev hint@7.x
[ -f .hintrc ] || wget https://github.com/raw/microverseinc/linters-config/master/html-css-js/.hintrc
# - name: Webhint Report
# run: npx hint .
- name: Webhint Report
run: npx hint .
stylelint:
name: Stylelint
runs-on: ubuntu-22.04
Expand Down
38 changes: 19 additions & 19 deletions .stylelintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
}
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
}
2 changes: 1 addition & 1 deletion dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Leaderboard</title><script defer="defer" src="main.%5BcontentHash%5D.js"></script></head><body><header><h1>Leaderboard</h1></header><main><div class="scoreboard-container"><div class="head"><h2>Recent scores</h2><button type="submit" id="btn-refresh" class="button">Refresh</button></div><ul class="body"></ul><p id="error-refresh" class="footer"></p></div><div class="add-score-container"><div class="head"><h2>Add your score</h2></div><form><input name="username" id="username" class="input-field" placeholder="Your name"/> <input type="number" name="score" id="score" class="input-field" placeholder="Your score"/> <input type="submit" value="Submit" class="button"/></form></div><div id="snackbar">Your information has been saved. Click 'Refresh' to refresh the scoreboard.</div></main></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Leaderboard</title><script defer=defer src=maindc05d26171cb029ee8b3.js></script><link href=maindc05d26171cb029ee8b3.css rel=stylesheet></head><body><header><h1>Leaderboard</h1></header><main><div class=scoreboard-container><div class=head><h2>Recent scores</h2><button type=submit id=btn-refresh class=button>Refresh</button></div><ul class=body></ul><p id=error-refresh class=footer></p></div><div class=add-score-container><div class=head><h2>Add your score</h2></div><form><input type=text name=username id=username class=input-field placeholder="Your name"> <input type=number name=score id=score class=input-field placeholder="Your score"> <input type=submit value=Submit class=button></form></div><div id=snackbar>Your information has been saved. Click 'Refresh' to refresh the scoreboard.</div></main></body></html>
1 change: 0 additions & 1 deletion dist/main.[contentHash].js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions dist/maindc05d26171cb029ee8b3.css
View file
Open in desktop

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

Loading