Skip to content

Commit 39d85ac

Browse files
committed
ifmeorg#796 adds temp_disable and controls some view models, work in progress
1 parent 630e8ff commit 39d85ac

File tree

3 files changed

+128
-11
lines changed

3 files changed

+128
-11
lines changed

Diff for: Gemfile.lock

+2-1
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ GEM
531531

532532
PLATFORMS
533533
ruby
534+
x86_64-darwin-19
534535

535536
DEPENDENCIES
536537
actionview (>= 6.0.3.3)
@@ -615,4 +616,4 @@ RUBY VERSION
615616
ruby 2.6.6p146
616617

617618
BUNDLED WITH
618-
2.1.4
619+
2.2.0

Diff for: config/locales/en.yml

+6
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,12 @@ en:
963963
Introduce yourself! Why are you here and what are you looking to
964964
achieve? Please note this will be seen when users search for you
965965
required: Required
966+
disable:
967+
text: Do you need a bit of a break from <strong>if-me.org</strong>?
968+
button: Temporarily disable my account
969+
confirm: >-
970+
Are you sure? You will not be able to access your data without
971+
enabling your account again.
966972
delete:
967973
text: Is <strong>if-me.org</strong> not working out for you?
968974
button: Permanently delete my account

Diff for: package.json

+120-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,126 @@
11
{
2-
"name": "ifme",
2+
"name": "isomorphic",
3+
"version": "3.0.5",
34
"private": true,
4-
"dependencies": {},
5+
"dependencies": {
6+
"@glidejs/glide": "^3.4.1",
7+
"@redq/js-info-bubble": "^0.8.1",
8+
"@uppy/core": "^1.5.1",
9+
"@uppy/dropbox": "^1.3.2",
10+
"@uppy/google-drive": "^1.3.2",
11+
"@uppy/instagram": "^1.3.2",
12+
"@uppy/react": "^1.3.2",
13+
"@uppy/tus": "^1.4.2",
14+
"antd": "^3.24.2",
15+
"antd-local-icon": "^0.1.3",
16+
"auth0-lock": "^11.17.3",
17+
"card-react": "^1.2.7",
18+
"chart.js": "^2.9.3",
19+
"classnames": "^2.2.6",
20+
"clone": "^2.1.2",
21+
"d3-shape": "^1.3.5",
22+
"enzyme-adapter-react-16": "^1.14.0",
23+
"enzyme-react-intl": "^2.0.6",
24+
"express": "^4.17.1",
25+
"firebase": "^7.2.0",
26+
"formik": "^1.5.8",
27+
"frappe-charts": "^0.0.8",
28+
"fuse.js": "^3.4.5",
29+
"globalize": "^1.4.2",
30+
"google-maps-react": "^2.0.2",
31+
"history": "^4.10.1",
32+
"js-rich-marker": "^1.1.2",
33+
"leaflet": "^1.5.1",
34+
"lodash": "^4.17.15",
35+
"moment": "^2.24.0",
36+
"node-sass": "^4.12.0",
37+
"nprogress": "^0.2.0",
38+
"prop-types": "^15.7.2",
39+
"react": "^16.11.0",
40+
"react-addons-shallow-compare": "^15.6.2",
41+
"react-beautiful-dnd": "^11.0.5",
42+
"react-big-calendar": "^0.22.1",
43+
"react-chartjs-2": "^2.7.6",
44+
"react-codemirror": "^1.0.0",
45+
"react-count-down": "^1.2.1",
46+
"react-credit-cards": "^0.8.0",
47+
"react-custom-scrollbars": "^4.2.1",
48+
"react-dates": "^21.2.0",
49+
"react-dnd": "^7.4.5",
50+
"react-dnd-html5-backend": "^7.4.4",
51+
"react-dom": "^16.11.0",
52+
"react-drawer": "^1.3.4",
53+
"react-dropzone-component": "^3.2.0",
54+
"react-element-resize": "^0.2.2",
55+
"react-error-overlay": "^6.0.3",
56+
"react-flexbox-grid": "^2.1.2",
57+
"react-flip-move": "^3.0.3",
58+
"react-google-charts": "^3.0.15",
59+
"react-grid-layout": "^0.16.6",
60+
"react-icons": "^3.7.0",
61+
"react-id-swiper": "^2.3.2",
62+
"react-instantsearch": "^4.3.0",
63+
"react-intl": "^2.9.0",
64+
"react-loadable": "^5.5.0",
65+
"react-motion-drawer": "^3.1.0",
66+
"react-perfect-scrollbar": "^1.5.3",
67+
"react-placeholder": "^3.0.2",
68+
"react-quill": "^1.3.3",
69+
"react-redux": "^7.1.1",
70+
"react-router": "^5.1.2",
71+
"react-router-dom": "^5.1.2",
72+
"react-scripts": "^3.2.0",
73+
"react-sidebar": "^3.0.2",
74+
"react-speech-recognition": "^2.0.4",
75+
"react-tag-input": "^6.4.1",
76+
"react-throttle": "^0.3.0",
77+
"react-trend": "^1.2.5",
78+
"react-vis": "^1.11.7",
79+
"react-youtube": "^7.9.0",
80+
"recharts": "^1.7.1",
81+
"redux": "^4.0.4",
82+
"redux-devtools": "^3.5.0",
83+
"redux-devtools-dock-monitor": "^1.1.3",
84+
"redux-devtools-log-monitor": "^1.4.0",
85+
"redux-saga": "^1.1.1",
86+
"redux-saga-firebase": "^0.15.0",
87+
"redux-thunk": "^2.3.0",
88+
"reselect": "^4.0.0",
89+
"rheostat": "^3.0.2",
90+
"rich-marker": "^0.0.1",
91+
"styled-components": "^4.4.0",
92+
"styled-theme": "^0.3.3",
93+
"swiper": "^5.0.4"
94+
},
95+
"devDependencies": {
96+
"babel-plugin-import": "^1.12.2",
97+
"customize-cra": "^0.8.0",
98+
"enzyme": "^3.10.0",
99+
"enzyme-to-json": "^3.4.2",
100+
"react-app-rewired": "^2.1.4",
101+
"redux-devtools-extension": "^2.13.8",
102+
"redux-mock-store": "^1.5.3"
103+
},
5104
"scripts": {
6-
"postinstall": "cd client && yarn install",
7-
"start": "foreman start -f Procfile.dev"
105+
"start": "react-app-rewired start",
106+
"build": "react-app-rewired build",
107+
"serve": "serve -s build",
108+
"test": "react-scripts test --env=jsdom",
109+
"eject": "react-scripts eject"
8110
},
9-
"engines": {
10-
"node": "14.8.0"
111+
"eslintConfig": {
112+
"extends": "react-app"
11113
},
12-
"cacheDirectories": [
13-
"node_modules",
14-
"client/node_modules"
15-
]
114+
"browserslist": {
115+
"production": [
116+
">0.2%",
117+
"not dead",
118+
"not op_mini all"
119+
],
120+
"development": [
121+
"last 1 chrome version",
122+
"last 1 firefox version",
123+
"last 1 safari version"
124+
]
125+
}
16126
}

0 commit comments

Comments
 (0)