Client - move package.json and lint config files
This commit is contained in:
Sam
parent
b3a0947019
commit
a266fc330e
28
Makefile
28
Makefile
@ -6,8 +6,8 @@ make-p:
|
||||
# Launch all P targets in parallel and exit as soon as one exits.
|
||||
set -m; (for p in $(P); do ($(MAKE) $$p || kill 0)& done; wait)
|
||||
|
||||
build-client: lint-react
|
||||
$(NPM) build
|
||||
build-client: lint-client
|
||||
cd fittrackee_client && $(NPM) build
|
||||
|
||||
clean-install:
|
||||
rm -fr $(NODE_MODULES)
|
||||
@ -40,10 +40,10 @@ init-db:
|
||||
install: install-client install-python
|
||||
|
||||
install-client:
|
||||
$(NPM) install --prod
|
||||
cd fittrackee_client && $(NPM) install --prod
|
||||
|
||||
install-client-dev:
|
||||
$(NPM) install
|
||||
cd fittrackee_client && $(NPM) install
|
||||
|
||||
install-dev: install-client-dev install-python-dev
|
||||
|
||||
@ -53,9 +53,9 @@ install-python:
|
||||
install-python-dev:
|
||||
$(POETRY) install
|
||||
|
||||
lint-all: lint-python lint-react
|
||||
lint-all: lint-python lint-client
|
||||
|
||||
lint-all-fix: lint-python-fix lint-react-fix
|
||||
lint-all-fix: lint-python-fix lint-client-fix
|
||||
|
||||
lint-python:
|
||||
$(PYTEST) --flake8 --isort --black -m "flake8 or isort or black" fittrackee e2e --ignore=fittrackee/migrations
|
||||
@ -63,11 +63,11 @@ lint-python:
|
||||
lint-python-fix:
|
||||
$(BLACK) fittrackee e2e
|
||||
|
||||
lint-react:
|
||||
$(NPM) lint
|
||||
lint-client:
|
||||
cd fittrackee_client && $(NPM) lint
|
||||
|
||||
lint-react-fix:
|
||||
$(NPM) lint-fix
|
||||
lint-client-fix:
|
||||
cd fittrackee_client && $(NPM) lint-fix
|
||||
|
||||
mail:
|
||||
docker run -d -e "MH_STORAGE=maildir" -v /tmp/maildir:/maildir -p 1025:1025 -p 8025:8025 mailhog/mailhog
|
||||
@ -93,14 +93,14 @@ serve-python:
|
||||
serve-python-dev:
|
||||
$(FLASK) run --with-threads -h $(HOST) -p $(API_PORT) --cert=adhoc
|
||||
|
||||
serve-react:
|
||||
$(NPM) start
|
||||
serve-client:
|
||||
cd fittrackee_client && $(NPM) start
|
||||
|
||||
serve:
|
||||
$(MAKE) P="serve-react serve-python" make-p
|
||||
$(MAKE) P="serve-client serve-python" make-p
|
||||
|
||||
serve-dev:
|
||||
$(MAKE) P="serve-react serve-python-dev" make-p
|
||||
$(MAKE) P="serve-client serve-python-dev" make-p
|
||||
|
||||
test-e2e: init-db
|
||||
$(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
|
||||
|
||||
@ -22,11 +22,11 @@ GUNICORN = $(VENV)/bin/gunicorn
|
||||
BLACK = $(VENV)/bin/black
|
||||
|
||||
# Node env
|
||||
NODE_MODULES = $(PWD)/node_modules
|
||||
NODE_MODULES = $(PWD)/fittrackee_client/node_modules
|
||||
NPM ?= yarn
|
||||
|
||||
#Sphinx Docs
|
||||
SPHINXOPTS ?=
|
||||
SPHINXBUILD ?= $(VENV)/bin/sphinx-build
|
||||
SOURCEDIR = docsrc/source
|
||||
BUILDDIR = docsrc/build
|
||||
SPHINXOPTS ?=
|
||||
SPHINXBUILD ?= $(VENV)/bin/sphinx-build
|
||||
SOURCEDIR = docsrc/source
|
||||
BUILDDIR = docsrc/build
|
||||
|
||||
8
fittrackee/dist/asset-manifest.json
vendored
8
fittrackee/dist/asset-manifest.json
vendored
@ -1,14 +1,14 @@
|
||||
{
|
||||
"files": {
|
||||
"main.css": "/static/css/main.9eb63bc2.chunk.css",
|
||||
"main.js": "/static/js/main.e589eaf8.chunk.js",
|
||||
"main.js.map": "/static/js/main.e589eaf8.chunk.js.map",
|
||||
"main.js": "/static/js/main.cfad68ad.chunk.js",
|
||||
"main.js.map": "/static/js/main.cfad68ad.chunk.js.map",
|
||||
"runtime-main.js": "/static/js/runtime-main.2d7c76f9.js",
|
||||
"runtime-main.js.map": "/static/js/runtime-main.2d7c76f9.js.map",
|
||||
"static/js/2.8ad7236a.chunk.js": "/static/js/2.8ad7236a.chunk.js",
|
||||
"static/js/2.8ad7236a.chunk.js.map": "/static/js/2.8ad7236a.chunk.js.map",
|
||||
"index.html": "/index.html",
|
||||
"precache-manifest.5c6aeed76c2cb8cfc6f5407698470a91.js": "/precache-manifest.5c6aeed76c2cb8cfc6f5407698470a91.js",
|
||||
"precache-manifest.56235de1a9643cca3a1527267ba9c420.js": "/precache-manifest.56235de1a9643cca3a1527267ba9c420.js",
|
||||
"service-worker.js": "/service-worker.js",
|
||||
"static/css/main.9eb63bc2.chunk.css.map": "/static/css/main.9eb63bc2.chunk.css.map",
|
||||
"static/js/2.8ad7236a.chunk.js.LICENSE.txt": "/static/js/2.8ad7236a.chunk.js.LICENSE.txt",
|
||||
@ -21,6 +21,6 @@
|
||||
"static/js/runtime-main.2d7c76f9.js",
|
||||
"static/js/2.8ad7236a.chunk.js",
|
||||
"static/css/main.9eb63bc2.chunk.css",
|
||||
"static/js/main.e589eaf8.chunk.js"
|
||||
"static/js/main.cfad68ad.chunk.js"
|
||||
]
|
||||
}
|
||||
2
fittrackee/dist/index.html
vendored
2
fittrackee/dist/index.html
vendored
@ -1 +1 @@
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/foundation-icons/3.0/foundation-icons.min.css"><link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""><title>FitTrackee</title><link href="/static/css/main.9eb63bc2.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script><script type="text/javascript">$(document).ready((function(){$("li.nav-item").click((function(){$("button.navbar-toggler").toggleClass("collapsed"),$("#navbarSupportedContent").toggleClass("show")}))}))</script><script>!function(e){function t(t){for(var n,i,l=t[0],f=t[1],a=t[2],p=0,s=[];p<l.length;p++)i=l[p],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(t);s.length;)s.shift()();return u.push.apply(u,a||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/";var l=this.webpackJsonpfittrackee_client=this.webpackJsonpfittrackee_client||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var a=0;a<l.length;a++)t(l[a]);var c=f;r()}([])</script><script src="/static/js/2.8ad7236a.chunk.js"></script><script src="/static/js/main.e589eaf8.chunk.js"></script></body></html>
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/foundation-icons/3.0/foundation-icons.min.css"><link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""><title>FitTrackee</title><link href="/static/css/main.9eb63bc2.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script><script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script><script type="text/javascript">$(document).ready((function(){$("li.nav-item").click((function(){$("button.navbar-toggler").toggleClass("collapsed"),$("#navbarSupportedContent").toggleClass("show")}))}))</script><script>!function(e){function t(t){for(var n,i,l=t[0],f=t[1],a=t[2],p=0,s=[];p<l.length;p++)i=l[p],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(t);s.length;)s.shift()();return u.push.apply(u,a||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/";var l=this.webpackJsonpfittrackee_client=this.webpackJsonpfittrackee_client||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var a=0;a<l.length;a++)t(l[a]);var c=f;r()}([])</script><script src="/static/js/2.8ad7236a.chunk.js"></script><script src="/static/js/main.cfad68ad.chunk.js"></script></body></html>
|
||||
@ -1,10 +1,10 @@
|
||||
self.__precacheManifest = (self.__precacheManifest || []).concat([
|
||||
{
|
||||
"revision": "ce27ec4197f51699274b624e1dd24806",
|
||||
"revision": "e8145b94f717ebb9c4d8bc46877d6b9a",
|
||||
"url": "/index.html"
|
||||
},
|
||||
{
|
||||
"revision": "18e9a261449a30132350",
|
||||
"revision": "48aee7e0e86e7086b38f",
|
||||
"url": "/static/css/main.9eb63bc2.chunk.css"
|
||||
},
|
||||
{
|
||||
@ -16,8 +16,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
|
||||
"url": "/static/js/2.8ad7236a.chunk.js.LICENSE.txt"
|
||||
},
|
||||
{
|
||||
"revision": "18e9a261449a30132350",
|
||||
"url": "/static/js/main.e589eaf8.chunk.js"
|
||||
"revision": "48aee7e0e86e7086b38f",
|
||||
"url": "/static/js/main.cfad68ad.chunk.js"
|
||||
},
|
||||
{
|
||||
"revision": "c25e4b04867fdd1a7bb1",
|
||||
2
fittrackee/dist/service-worker.js
vendored
2
fittrackee/dist/service-worker.js
vendored
@ -14,7 +14,7 @@
|
||||
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
|
||||
|
||||
importScripts(
|
||||
"/precache-manifest.5c6aeed76c2cb8cfc6f5407698470a91.js"
|
||||
"/precache-manifest.56235de1a9643cca3a1527267ba9c420.js"
|
||||
);
|
||||
|
||||
self.addEventListener('message', (event) => {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,4 +1,51 @@
|
||||
{
|
||||
"name": "fittrackee_client",
|
||||
"version": "0.1.0"
|
||||
"version": "0.3.0-beta",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@mapbox/togeojson": "^0.16.0",
|
||||
"connected-react-router": "^6.8.0",
|
||||
"date-fns": "^2.16.1",
|
||||
"history": "^4.10.1",
|
||||
"i18next": "^19.7.0",
|
||||
"i18next-browser-languagedetector": "^6.0.1",
|
||||
"i18next-xhr-backend": "^3.2.2",
|
||||
"leaflet": "^1.7.1",
|
||||
"luxon": "^1.25.0",
|
||||
"object-hash": "^2.0.3",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-helmet": "^6.1.0",
|
||||
"react-i18next": "^11.7.2",
|
||||
"react-leaflet": "^2.7.0",
|
||||
"react-redux": "^7.2.1",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^3.4.3",
|
||||
"react-timezone": "^2.4.0",
|
||||
"recharts": "^1.8.5",
|
||||
"redux": "^4.0.5",
|
||||
"redux-thunk": "^2.3.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "NODE_ENV=production react-scripts build && rm -rf ../fittrackee/dist/* && cp -a build/. ../fittrackee/dist",
|
||||
"eject": "react-scripts eject",
|
||||
"lint": "node_modules/.bin/eslint --cache --ext .jsx --ext .js src",
|
||||
"lint-fix": "node_modules/.bin/eslint --cache --ext .jsx --ext .js --fix"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
],
|
||||
"devDependencies": {
|
||||
"eslint-config-prettier": "^6.11.0",
|
||||
"eslint-plugin-prettier": "^3.1.4",
|
||||
"eslint-plugin-testcafe": "^0.2.1",
|
||||
"prettier": "^2.1.2"
|
||||
}
|
||||
}
|
||||
|
||||
51
package.json
51
package.json
@ -1,51 +0,0 @@
|
||||
{
|
||||
"name": "fittrackee_client",
|
||||
"version": "0.3.0-beta",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@mapbox/togeojson": "^0.16.0",
|
||||
"connected-react-router": "^6.8.0",
|
||||
"date-fns": "^2.16.1",
|
||||
"history": "^4.10.1",
|
||||
"i18next": "^19.7.0",
|
||||
"i18next-browser-languagedetector": "^6.0.1",
|
||||
"i18next-xhr-backend": "^3.2.2",
|
||||
"leaflet": "^1.7.1",
|
||||
"luxon": "^1.25.0",
|
||||
"object-hash": "^2.0.3",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-helmet": "^6.1.0",
|
||||
"react-i18next": "^11.7.2",
|
||||
"react-leaflet": "^2.7.0",
|
||||
"react-redux": "^7.2.1",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^3.4.3",
|
||||
"react-timezone": "^2.4.0",
|
||||
"recharts": "^1.8.5",
|
||||
"redux": "^4.0.5",
|
||||
"redux-thunk": "^2.3.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "cd fittrackee_client && react-scripts start",
|
||||
"build": "NODE_ENV=production cd fittrackee_client && react-scripts build && rm -rf ../fittrackee/dist/* && cp -a build/. ../fittrackee/dist",
|
||||
"eject": "cd fittrackee_client && react-scripts eject",
|
||||
"lint": "eslint --cache --ext .jsx --ext .js fittrackee_client/src",
|
||||
"lint-fix": "eslint --cache --ext .jsx --ext .js fittrackee_client/src --fix"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
],
|
||||
"devDependencies": {
|
||||
"eslint-config-prettier": "^6.11.0",
|
||||
"eslint-plugin-prettier": "^3.1.4",
|
||||
"eslint-plugin-testcafe": "^0.2.1",
|
||||
"prettier": "^2.1.2"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user