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.

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

Client code cleanup: re-organize file structure, set up prettier #917

Merged
merged 9 commits into from
Jul 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -24,6 +24,7 @@
/config/env/development.env

# Ignore all IDE, TextEditor configuration files
.vs/
.idea/
.tags
*.swp
Expand Down
5 changes: 3 additions & 2 deletions circle.yml
Expand Up @@ -17,19 +17,20 @@ dependencies:
override:
- gem install bundler
- bundle install --path=vendor/bundle --jobs=4 --retry=3
- yarn
- yarn install

test:
pre:
- RAILS_ENV=test bundle exec rake db:create db:schema:load
- cd client &&
RAILS_ENV=test bundle exec rake react_on_rails:locale &&
yarn run lint:setup && yarn run lint && yarn run build:test
yarn lint:setup && yarn lint:build && yarn build:test
override:
- bundle exec rspec --format progress --format RspecJunitFormatter -o
$CIRCLE_TEST_REPORTS/rspec.xml
- RAILS_ENV=test bundle exec rake jasmine:ci
- bundle exec bundle-audit check --update
- cd client && yarn test

deployment:
staging:
Expand Down
4 changes: 2 additions & 2 deletions client/.eslintrc
Expand Up @@ -8,6 +8,8 @@
},
"root": true,
"rules": {
"import/prefer-default-export": ["off"],
"react/require-default-props": ["off"],
"react/sort-comp": [2, {
"order": [
"type-annotations",
Expand All @@ -24,9 +26,7 @@
"import/resolver": {
"node": {
"paths": [
// allow absolute import from "app/libs/.." as "libs/.."
"./app",
// allow absolute import from "../configs/locales.." as "configs/locales.."
".."
]
}
Expand Down
4 changes: 4 additions & 0 deletions client/.prettierrc
@@ -0,0 +1,4 @@
{
"trailingComma": "es5",
"singleQuote": true
}
47 changes: 0 additions & 47 deletions client/README.md

This file was deleted.

37 changes: 0 additions & 37 deletions client/app/bundles/momentsApp/components/Chart/Chart.jsx

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions client/app/bundles/momentsApp/components/Chart/index.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.