Skip to content

Commit

Permalink
ifmeorg#796 adds temp_disable and controls some view models, work in …
Browse files Browse the repository at this point in the history
…progress
  • Loading branch information
tlansey committed Dec 15, 2020
1 parent 630e8ff commit 39d85ac
Show file tree
Hide file tree
Showing 3 changed files with 128 additions and 11 deletions.
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ GEM

PLATFORMS
ruby
x86_64-darwin-19

DEPENDENCIES
actionview (>= 6.0.3.3)
Expand Down Expand Up @@ -615,4 +616,4 @@ RUBY VERSION
ruby 2.6.6p146

BUNDLED WITH
2.1.4
2.2.0
6 changes: 6 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <strong>if-me.org</strong>?
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 <strong>if-me.org</strong> not working out for you?
button: Permanently delete my account
Expand Down
130 changes: 120 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
}

0 comments on commit 39d85ac

Please sign in to comment.