Skip to content

Commit

Permalink
Merge pull request #2080 from thostetler/add-feedback-forms
Browse files Browse the repository at this point in the history
Add feedback forms
  • Loading branch information
thostetler committed Nov 16, 2020
2 parents e943d05 + 517c73b commit a1723ff
Show file tree
Hide file tree
Showing 73 changed files with 3,851 additions and 1,050 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"env": {
"browser": true,
"amd": true,
"es6": false,
"es6": true,
"commonjs": false,
"jquery": true,
"mocha": true
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "src/shared"]
path = src/shared
url = git@github.com:adsabs/ui-component-library.git
url = https://github.com/adsabs/ui-component-library.git
2 changes: 2 additions & 0 deletions grunt/aliases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ assets:
- 'clean:libs'
- 'concurrent:install'
- 'copy:libs'
- 'exec:suit_build'

# CSS Processing
css:
Expand All @@ -69,6 +70,7 @@ css:
# Testing
# Initial Setup
setup:
- 'exec:submodule_init'
- 'assets'
- 'copy:discovery_vars'
- 'sass'
Expand Down
6 changes: 5 additions & 1 deletion grunt/concurrent.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ module.exports = {
'curl:react',
'curl:react-bootstrap',
'curl:react-dom',
'curl:react-prop-types',
'curl:prop-types',
'curl:react-redux',
'curl:yup',
'curl:react-flexview',
'curl:deep-object-diff',
'curl:xstate-react',
],
hash_require: ['hash_require:js', 'hash_require:css'],
};
106 changes: 102 additions & 4 deletions grunt/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,99 @@ module.exports = function(grunt) {
return {
libs: {
files: [
{
cwd: 'node_modules/xstate/dist',
src: 'xstate.js',
dest: 'src/libs/xstate/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('xstate.js', 'index.js');
},
},
{
cwd: 'node_modules/recoil/umd',
src: 'recoil.min.js',
dest: 'src/libs/recoil/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('recoil.min.js', 'index.js');
},
},
{
cwd: 'node_modules/@hookform/resolvers/dist',
src: 'index.umd.production.min.js',
dest: 'src/libs/@hookform/',
expand: true,
rename: function(dest, src) {
return (
dest + src.replace('index.umd.production.min.js', 'index.js')
);
},
},
{
cwd: 'node_modules/regenerator-runtime',
src: 'runtime.js',
dest: 'src/libs/regenerator-runtime/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('runtime.js', 'index.js');
},
},
{
cwd: 'node_modules/react-async/dist-umd',
src: 'index.js',
dest: 'src/libs/react-async/',
expand: true,
},
{
cwd: 'node_modules/react-window/dist',
src: 'index-prod.umd.js',
dest: 'src/libs/react-window/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('index-prod.umd', 'index');
},
},
{
cwd: 'node_modules/react-data-table-component/dist',
src: 'react-data-table-component.umd.js',
dest: 'src/libs/react-data-table-component/',
expand: true,
rename: function(dest, src) {
return (
dest + src.replace('react-data-table-component.umd', 'index')
);
},
},
{
cwd: 'node_modules/react-is/umd',
src: 'react-is.production.min.js',
dest: 'src/libs/react-is/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('react-is.production.min', 'index');
},
},
{
cwd: 'node_modules/styled-components/dist',
src: 'styled-components.min.js',
dest: 'src/libs/styled-components/',
expand: true,
rename: function(dest, src) {
return dest + src.replace('styled-components.min', 'index');
},
},
{
cwd: 'node_modules/react-hook-form/dist/',
src: 'index.umd.production.min.js',
dest: 'src/libs/react-hook-form/',
expand: true,
rename: function(dest, src) {
return (
dest + src.replace('index.umd.production.min.js', 'index.js')
);
},
},
{
cwd: 'node_modules/hotkeys-js/dist',
src: 'hotkeys.min.js',
Expand Down Expand Up @@ -155,11 +248,16 @@ module.exports = function(grunt) {
files: [
{
expand: true,
src: ['./src/**'],
cwd: 'src',
src: [
'./config/**',
'./js/**',
'./libs/**',
'./styles/**',
'./*.html',
'./shared/dist/**',
],
dest: 'dist/',
rename: function(dest, src) {
return dest + src.replace('/src/', '/');
},
},
],
},
Expand Down
24 changes: 22 additions & 2 deletions grunt/curl.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,34 @@ module.exports = {
src: 'https://unpkg.com/react-dom@16/umd/react-dom.production.min.js',
dest: 'src/libs/react-dom/index.js',
},
'react-prop-types': {
'prop-types': {
src:
'https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.7.2/prop-types.min.js',
dest: 'src/libs/react-prop-types/index.js',
dest: 'src/libs/prop-types/index.js',
},
'react-redux': {
src:
'https://cdnjs.cloudflare.com/ajax/libs/react-redux/7.1.3/react-redux.min.js',
dest: 'src/libs/react-redux/index.js',
},
yup: {
src:
'https://raw.githubusercontent.com/thostetler/yup/master/build/index.umd.js',
dest: 'src/libs/yup/index.js',
},
'react-flexview': {
src:
'https://raw.githubusercontent.com/thostetler/react-flexview/master/build/index.umd.js',
dest: 'src/libs/react-flexview/index.js',
},
'deep-object-diff': {
src:
'https://raw.githubusercontent.com/thostetler/deep-object-diff/master/deep-object-diff.umd.js',
dest: 'src/libs/deep-object-diff/index.js',
},
'xstate-react': {
src:
'https://raw.githubusercontent.com/thostetler/xstate/master/packages/xstate-react/dist/xstate-react.umd.production.min.js',
dest: 'src/libs/xstate-react/index.js',
},
};
7 changes: 7 additions & 0 deletions grunt/exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,11 @@ module.exports = {
'cat test/coverage/reports/lcov/lcov.info | ./node_modules/coveralls/bin/coveralls.js',
},
server: 'node server',
suit_build: {
cwd: './src/shared',
cmd: 'sh ./install.sh',
},
submodule_init: {
cmd: 'git submodule update --init',
},
};
Loading

0 comments on commit a1723ff

Please sign in to comment.