Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
38e1879
Fork of repo to try and update dependencies by re-building project on…
strinsberg May 11, 2020
c4fcb6c
Removed the template project stuff. Setup to have the program wars la…
strinsberg May 12, 2020
2d34223
Moved static images to the public folder because not all of them were…
strinsberg May 12, 2020
f602d3d
Fixed all the eslint errors. The project now builds, though there are…
strinsberg May 13, 2020
b1e6712
Removed some fixes made to appease eslint and replaced them with esli…
strinsberg May 13, 2020
a8f7156
Added unit tests back in. They are now run through @vue/cli with jest…
strinsberg May 13, 2020
e52a53d
Started adding back other files from the project that I think are imp…
strinsberg May 13, 2020
066de33
Setup the style lint package to lint css.
strinsberg May 13, 2020
c89a8ad
added jsdoc and set it up to work. Also, added some more run scripts …
strinsberg May 13, 2020
7b0fe62
Added tooltips to the discard and redraw buttons, that I thought had …
strinsberg May 13, 2020
1f68cbe
Added the @vue/cli client to the project so that contributors do not …
strinsberg May 14, 2020
644b303
running dev server opens a browser window for you.
strinsberg May 14, 2020
cce67fd
Did some investigating with test issues from the changeover. The fail…
strinsberg May 14, 2020
c2dbcce
Commented out the functions that are only being used with the comment…
strinsberg May 14, 2020
55eceea
Create a node.js action CI with github actions
strinsberg May 14, 2020
32403d2
Update nodejs.yml
strinsberg May 14, 2020
a4acefe
Added back the last of the project files that should be included. Mov…
strinsberg May 14, 2020
39fa05e
Merge branch 'master' of https://github.com/strinsberg/program-wars
strinsberg May 14, 2020
94708b9
Removed coverage from travis build because the way the coverage is do…
strinsberg May 14, 2020
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
13 changes: 0 additions & 13 deletions .babelrc

This file was deleted.

3 changes: 3 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

36 changes: 22 additions & 14 deletions .eslintrc.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
// http://eslint.org/docs/user-guide/configuring

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
},
env: {
browser: true,
jquery: true,
node: true
},
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
extends: 'standard',
// required to lint *.vue files
plugins: [
'html'
'extends': [
'plugin:vue/essential',
'eslint:recommended'
],
// add your custom rules here
'rules': {
parserOptions: {
parser: 'babel-eslint',
sourceType: 'module'
},
rules: {
// don't allow to ship with console statements unless specified
'no-console': 1,
// don't allow shadowing variables
Expand All @@ -33,5 +30,16 @@ module.exports = {
'dot-notation': 1,
// make sure vars are placed on top of their scope
'vars-on-top': 2
}
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
jest: true
}
}
]
}
31 changes: 31 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run test
- run: npm run lint
- run: npm run lint:style
- run: npm run build --if-present
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ index.sublime-workspace
npm-shrinkwrap.json
coverage/
.nyc_output/
documents/

*.swp
12 changes: 10 additions & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"extends": "stylelint-config-recommended"
}
"extends": "stylelint-config-recommended",
"ignoreFiles": [
"coverage/*",
"coverage/**",
"dist/*",
"dist/**",
"documents/*",
"documents/**"
]
}
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ install:
- npm install
script:
- npm run test
after_success:
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
# The coverage is now generated by jest and @vue/cli and It is not setup
# to match this behaviour yet
#after_success:
#- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
before_deploy:
- npm run build
- npm run build
if: branch = master
deploy:
provider: firebase
Expand Down
11 changes: 0 additions & 11 deletions .vscode/launch.json

This file was deleted.

3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

21 changes: 0 additions & 21 deletions .vscode/tasks.json

This file was deleted.

5 changes: 5 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
40 changes: 0 additions & 40 deletions build/build.js

This file was deleted.

45 changes: 0 additions & 45 deletions build/check-versions.js

This file was deleted.

9 changes: 0 additions & 9 deletions build/dev-client.js

This file was deleted.

83 changes: 0 additions & 83 deletions build/dev-server.js

This file was deleted.

Loading