From 39d85ac5fcca52324d6b8cbd91a4764f03b4c86b Mon Sep 17 00:00:00 2001 From: tlansey Date: Tue, 15 Dec 2020 18:11:25 -0500 Subject: [PATCH] #796 adds temp_disable and controls some view models, work in progress --- Gemfile.lock | 3 +- config/locales/en.yml | 6 ++ package.json | 130 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 128 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1863d646e..28e5f11a2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -531,6 +531,7 @@ GEM PLATFORMS ruby + x86_64-darwin-19 DEPENDENCIES actionview (>= 6.0.3.3) @@ -615,4 +616,4 @@ RUBY VERSION ruby 2.6.6p146 BUNDLED WITH - 2.1.4 + 2.2.0 diff --git a/config/locales/en.yml b/config/locales/en.yml index 8f37fb5113..092fcca397 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -963,6 +963,12 @@ en: Introduce yourself! Why are you here and what are you looking to achieve? Please note this will be seen when users search for you required: Required + disable: + text: Do you need a bit of a break from if-me.org? + button: Temporarily disable my account + confirm: >- + Are you sure? You will not be able to access your data without + enabling your account again. delete: text: Is if-me.org not working out for you? button: Permanently delete my account diff --git a/package.json b/package.json index d6f08ea51e..6d6d7e1472 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,126 @@ { - "name": "ifme", + "name": "isomorphic", + "version": "3.0.5", "private": true, - "dependencies": {}, + "dependencies": { + "@glidejs/glide": "^3.4.1", + "@redq/js-info-bubble": "^0.8.1", + "@uppy/core": "^1.5.1", + "@uppy/dropbox": "^1.3.2", + "@uppy/google-drive": "^1.3.2", + "@uppy/instagram": "^1.3.2", + "@uppy/react": "^1.3.2", + "@uppy/tus": "^1.4.2", + "antd": "^3.24.2", + "antd-local-icon": "^0.1.3", + "auth0-lock": "^11.17.3", + "card-react": "^1.2.7", + "chart.js": "^2.9.3", + "classnames": "^2.2.6", + "clone": "^2.1.2", + "d3-shape": "^1.3.5", + "enzyme-adapter-react-16": "^1.14.0", + "enzyme-react-intl": "^2.0.6", + "express": "^4.17.1", + "firebase": "^7.2.0", + "formik": "^1.5.8", + "frappe-charts": "^0.0.8", + "fuse.js": "^3.4.5", + "globalize": "^1.4.2", + "google-maps-react": "^2.0.2", + "history": "^4.10.1", + "js-rich-marker": "^1.1.2", + "leaflet": "^1.5.1", + "lodash": "^4.17.15", + "moment": "^2.24.0", + "node-sass": "^4.12.0", + "nprogress": "^0.2.0", + "prop-types": "^15.7.2", + "react": "^16.11.0", + "react-addons-shallow-compare": "^15.6.2", + "react-beautiful-dnd": "^11.0.5", + "react-big-calendar": "^0.22.1", + "react-chartjs-2": "^2.7.6", + "react-codemirror": "^1.0.0", + "react-count-down": "^1.2.1", + "react-credit-cards": "^0.8.0", + "react-custom-scrollbars": "^4.2.1", + "react-dates": "^21.2.0", + "react-dnd": "^7.4.5", + "react-dnd-html5-backend": "^7.4.4", + "react-dom": "^16.11.0", + "react-drawer": "^1.3.4", + "react-dropzone-component": "^3.2.0", + "react-element-resize": "^0.2.2", + "react-error-overlay": "^6.0.3", + "react-flexbox-grid": "^2.1.2", + "react-flip-move": "^3.0.3", + "react-google-charts": "^3.0.15", + "react-grid-layout": "^0.16.6", + "react-icons": "^3.7.0", + "react-id-swiper": "^2.3.2", + "react-instantsearch": "^4.3.0", + "react-intl": "^2.9.0", + "react-loadable": "^5.5.0", + "react-motion-drawer": "^3.1.0", + "react-perfect-scrollbar": "^1.5.3", + "react-placeholder": "^3.0.2", + "react-quill": "^1.3.3", + "react-redux": "^7.1.1", + "react-router": "^5.1.2", + "react-router-dom": "^5.1.2", + "react-scripts": "^3.2.0", + "react-sidebar": "^3.0.2", + "react-speech-recognition": "^2.0.4", + "react-tag-input": "^6.4.1", + "react-throttle": "^0.3.0", + "react-trend": "^1.2.5", + "react-vis": "^1.11.7", + "react-youtube": "^7.9.0", + "recharts": "^1.7.1", + "redux": "^4.0.4", + "redux-devtools": "^3.5.0", + "redux-devtools-dock-monitor": "^1.1.3", + "redux-devtools-log-monitor": "^1.4.0", + "redux-saga": "^1.1.1", + "redux-saga-firebase": "^0.15.0", + "redux-thunk": "^2.3.0", + "reselect": "^4.0.0", + "rheostat": "^3.0.2", + "rich-marker": "^0.0.1", + "styled-components": "^4.4.0", + "styled-theme": "^0.3.3", + "swiper": "^5.0.4" + }, + "devDependencies": { + "babel-plugin-import": "^1.12.2", + "customize-cra": "^0.8.0", + "enzyme": "^3.10.0", + "enzyme-to-json": "^3.4.2", + "react-app-rewired": "^2.1.4", + "redux-devtools-extension": "^2.13.8", + "redux-mock-store": "^1.5.3" + }, "scripts": { - "postinstall": "cd client && yarn install", - "start": "foreman start -f Procfile.dev" + "start": "react-app-rewired start", + "build": "react-app-rewired build", + "serve": "serve -s build", + "test": "react-scripts test --env=jsdom", + "eject": "react-scripts eject" }, - "engines": { - "node": "14.8.0" + "eslintConfig": { + "extends": "react-app" }, - "cacheDirectories": [ - "node_modules", - "client/node_modules" - ] + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + } }