Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resize #41

Open
wants to merge 214 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
3b667e2
Refactor to work with transit library
ronanfitz Aug 10, 2017
2543c7b
Add google maps api script in public html
tylerlan Aug 10, 2017
1e5f385
Get most current version of transit-spa installed and working--mostly…
tylerlan Aug 11, 2017
0234291
Add overflow scroll and more visible corner scaler
tylerlan Aug 11, 2017
80463e9
Update transit-app version
tylerlan Aug 11, 2017
c27ed50
Configure dashboard to work with github-spa module
tylerlan Aug 11, 2017
8b79c41
Fix reducer to use github widget id
tylerlan Aug 14, 2017
5456ede
Change html title to reflect the action app name
tylerlan Aug 14, 2017
36e63b5
Change max width of transit component
tylerlan Aug 14, 2017
fe2609a
Update version of github-widget
tylerlan Aug 14, 2017
439ad8c
Add configure store
tylerlan Aug 20, 2017
fd37951
Install new version of react-redux to fix issue and remove configure …
tylerlan Aug 21, 2017
58f43da
Merge pull request #2 from databraid-dashboard/add-github-spa
Aug 23, 2017
b876ec7
Create yml file and add up and down scripts
Sanderson239 Aug 24, 2017
2a30591
Added transit SPA .env variable
Sanderson239 Aug 25, 2017
01f30bb
Fix compose.yml
ronanfitz Aug 25, 2017
e6fd267
Fix compose.yml
ronanfitz Aug 25, 2017
9478004
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
ronanfitz Aug 28, 2017
9c53207
Remove package-lock.json
meghanprestemon Aug 28, 2017
6f32c6a
Refactor App.jsx to map over props.widget.ids array to build widgets.
Dave-Gallup Aug 29, 2017
95ff146
Add button (no functionality yet) across top of dashboard.
Dave-Gallup Aug 29, 2017
117429f
Add actions and reducers for adding widgets.
Dave-Gallup Aug 29, 2017
7ec3df7
Refactor ReactGridLayout configs to be held in Redux store.
Dave-Gallup Aug 30, 2017
45ebe88
Add sidebar functionality and change temp button to show/hide sidebar
Dave-Gallup Aug 30, 2017
3023b60
Remove top button and implement sideStrip to control Sidebar.
Dave-Gallup Aug 30, 2017
cb350a0
Merge branch 'add-widget' of https://github.com/Dave-Gallup/dashboard…
michaelmurray6298 Aug 30, 2017
6d540a4
Fix linting errors.
Dave-Gallup Aug 30, 2017
8e5b95e
Fix package.json
ronanfitz Aug 30, 2017
327a78c
Merge branch 'add-widget' of https://github.com/Dave-Gallup/dashboard…
ronanfitz Aug 30, 2017
e170cbf
Merge branch 'add-widget' of https://github.com/Dave-Gallup/dashboard…
meghanprestemon Aug 30, 2017
7bc4f74
Refactor so only one dispatch is used to call ADD_WIDGET action.
Dave-Gallup Aug 31, 2017
11c66b1
Wrap widget components in WidgetContainer component.
Dave-Gallup Aug 31, 2017
62251d3
Refactor
Dave-Gallup Aug 31, 2017
326a0ea
Add 'x' on widgets to call removeWidget successfully.
Dave-Gallup Aug 31, 2017
45bf589
Merge pull request #9 from meghanprestemon/package-lock.json
Aug 31, 2017
2f311cc
Add sidebar with close functionality to widgets
Dave-Gallup Sep 1, 2017
0ad955c
Refactor widget sidestrips to work for all.
Dave-Gallup Sep 1, 2017
6562d37
Implement dashboard lock/unlock functionality
Dave-Gallup Sep 1, 2017
8994c2b
Scaffold reducer tests
meghanprestemon Sep 1, 2017
ef503b7
Make lock on dashboard sidebar menu only appear when widgets are present
Dave-Gallup Sep 1, 2017
c05736c
Fix widget sidestrip so any part can be clicked.
Dave-Gallup Sep 1, 2017
cc2ec5e
Inital actions test
michaelmurray6298 Sep 1, 2017
3639403
Remove hideSidebars global method.
Dave-Gallup Sep 5, 2017
ec72e47
Complete actions test
michaelmurray6298 Sep 5, 2017
89ae5d1
Update actions test
michaelmurray6298 Sep 5, 2017
6ee3ee7
Merge pull request #1 from michaelmurray6298/dave
michaelmurray6298 Sep 5, 2017
9d9198d
Correct CSS issue when locked
Dave-Gallup Sep 5, 2017
1daaf70
Edit addWidget component
michaelmurray6298 Sep 5, 2017
e12930d
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
Gwillison415 Sep 5, 2017
5d88541
Clean CSS
Dave-Gallup Sep 5, 2017
6e778b6
Change 'component' to 'widgetId' in App.jsx and clean package.json
Dave-Gallup Sep 5, 2017
567df0b
Merge pull request #10 from Dave-Gallup/add-widget-refactor
Sep 5, 2017
9ec1430
Inital actions test
michaelmurray6298 Sep 1, 2017
50f0b55
Complete actions test
michaelmurray6298 Sep 5, 2017
9012b57
Edit addWidget component
michaelmurray6298 Sep 5, 2017
1650cba
Change package.json
ronanfitz Sep 5, 2017
de9d2dc
Merge branch 'add-widget-refactor' of https://github.com/Dave-Gallup/…
ronanfitz Sep 5, 2017
ac7810c
Edit package.json
michaelmurray6298 Sep 5, 2017
1f89493
Edit package.json
michaelmurray6298 Sep 5, 2017
29059c7
Merge branch 'dev' of https://github.com/michaelmurray6298/dashboard-…
michaelmurray6298 Sep 5, 2017
9cfe872
Clean caret in package.json
Dave-Gallup Sep 5, 2017
81f8273
Change pathname for Slack widget
Gwillison415 Sep 5, 2017
d3b8140
Merge pull request #12 from michaelmurray6298/add-tests
Sep 5, 2017
b944326
Fix linting errors.
Dave-Gallup Sep 5, 2017
4d77fd7
Merge pull request #13 from Gwillison415/master
Sep 5, 2017
6633117
Slack refactor: exporting reducer (#15)
SSabu Sep 5, 2017
f153095
Change .env
ronanfitz Sep 5, 2017
f714eeb
Add root reducer
michaelmurray6298 Sep 6, 2017
ec56e76
Merge pull request #2 from michaelmurray6298/add-tests
michaelmurray6298 Sep 6, 2017
26a68ab
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
Dave-Gallup Sep 6, 2017
bfde1b7
Merge with upstream
Dave-Gallup Sep 6, 2017
77173cc
Fix lint erros following merge
Dave-Gallup Sep 6, 2017
1daf1fe
Mob fix (#16)
joshwyatt Sep 7, 2017
8fc4997
Modify package.json
Dave-Gallup Sep 7, 2017
9d878e0
Merge branch 'widget-sidebar' into widget-sidebar-2
Dave-Gallup Sep 8, 2017
df35842
Fix merge conflict
meghanprestemon Sep 8, 2017
6fa7683
Change versions
ronanfitz Sep 8, 2017
5b7d7df
Resolve merge conflicts
ronanfitz Sep 8, 2017
2929a52
Resolve merge conflicts
ronanfitz Sep 8, 2017
b9a1d0a
Complete reducer tests
meghanprestemon Sep 8, 2017
d1ddbb8
Remove unnecessary path extension in App.jsx
meghanprestemon Sep 8, 2017
23e3a56
Correct wrong import path for widget reducers
Dave-Gallup Sep 8, 2017
d4cfb7f
Remove inline styling in index.html and modify index.css
Dave-Gallup Sep 8, 2017
1e61637
Delete unnecessary css file
Dave-Gallup Sep 8, 2017
41bdeb5
Remove unnecessary css file
Dave-Gallup Sep 9, 2017
a546c6c
Update package.json
meghanprestemon Sep 11, 2017
a7d1834
Merge pull request #18 from meghanprestemon/tests
Sep 11, 2017
3539428
Dashboard Refactor Partial
SSabu Sep 5, 2017
1e74d88
Make widget-container css have default background be white
Dave-Gallup Sep 11, 2017
7293043
Add component snapshot test
SSabu Sep 8, 2017
dceb5de
Add snapshot test for App component
SSabu Sep 8, 2017
fa6e083
Put enviro variables in .gitignore
SSabu Sep 8, 2017
4990d8f
Update .gitignore
SSabu Sep 11, 2017
dc8f110
Merge branch 'widget-sidebar-2' of https://github.com/Dave-Gallup/das…
Dave-Gallup Sep 11, 2017
ee05455
Fix linting issues
SSabu Sep 11, 2017
f4cbe6b
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
michaelmurray6298 Sep 11, 2017
cc79825
Move react-dom to dependencies
SSabu Sep 11, 2017
74122c4
Remove .env.slack and update .gitignore
SSabu Sep 11, 2017
d2c9481
Merge pull request #19 from SSabu/snapshot-test
Sep 11, 2017
57f01be
Correct .gitignore to mirror upstream/dev
Dave-Gallup Sep 11, 2017
c0b6038
Remove .env.*-api files from push
Dave-Gallup Sep 11, 2017
771b8e8
Wrap widget components in WidgetContainer component.
Dave-Gallup Aug 31, 2017
b439b05
Refactor
Dave-Gallup Aug 31, 2017
48b1e96
Add 'x' on widgets to call removeWidget successfully.
Dave-Gallup Aug 31, 2017
d01cf7c
Add sidebar with close functionality to widgets
Dave-Gallup Sep 1, 2017
f72436d
Refactor widget sidestrips to work for all.
Dave-Gallup Sep 1, 2017
49213dc
Implement dashboard lock/unlock functionality
Dave-Gallup Sep 1, 2017
bfe1a64
Make lock on dashboard sidebar menu only appear when widgets are present
Dave-Gallup Sep 1, 2017
ea310df
Fix widget sidestrip so any part can be clicked.
Dave-Gallup Sep 1, 2017
1a369be
Remove hideSidebars global method.
Dave-Gallup Sep 5, 2017
eb1d16e
Correct CSS issue when locked
Dave-Gallup Sep 5, 2017
0bbed9a
Clean CSS
Dave-Gallup Sep 5, 2017
a2b2f23
Clean caret in package.json
Dave-Gallup Sep 5, 2017
dbf5b69
Fix linting errors.
Dave-Gallup Sep 5, 2017
adf7931
Slack refactor: exporting reducer (#15)
SSabu Sep 5, 2017
b997917
Modify package.json
Dave-Gallup Sep 7, 2017
f7bd18c
Correct wrong import path for widget reducers
Dave-Gallup Sep 8, 2017
01cd513
Remove inline styling in index.html and modify index.css
Dave-Gallup Sep 8, 2017
271755c
Remove unnecessary css file
Dave-Gallup Sep 9, 2017
5e34930
Make widget-container css have default background be white
Dave-Gallup Sep 11, 2017
806f8e3
Adjust CSS for react-grid-layout components in App.css
Dave-Gallup Sep 12, 2017
e2a7218
Merge branch 'widget-sidebar-2' of https://github.com/Dave-Gallup/das…
Dave-Gallup Sep 12, 2017
ce1a4b4
Merge pull request #17 from Dave-Gallup/widget-sidebar-2
Sep 12, 2017
d8b6b2e
Update dependencies
simona1 Sep 12, 2017
9c5eaee
Make the redux store persist
ronanfitz Sep 12, 2017
55f9778
Merge persist and upstream
ronanfitz Sep 12, 2017
6e94f04
Clean up differences with upstream
ronanfitz Sep 12, 2017
969aa7f
Fix linting errors
ronanfitz Sep 12, 2017
204c204
Complete action tests
meghanprestemon Sep 12, 2017
93800ef
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
simona1 Sep 12, 2017
2b42d63
Add reducer tests
meghanprestemon Sep 12, 2017
4c00dab
Fix linting errors
meghanprestemon Sep 12, 2017
7e50772
Update .env
meghanprestemon Sep 12, 2017
b86e965
Remove keys from .env
ronanfitz Sep 12, 2017
75760ff
Merge pull request #20 from ronanfitz/redux-persist
Sep 12, 2017
415a3a8
Upgrade containers and widget modules on start if required (#22)
joshwyatt Sep 12, 2017
e21d3bd
Fix merge conflicts
meghanprestemon Sep 13, 2017
347d10e
Merge pull request #21 from meghanprestemon/tests
Sep 13, 2017
2b6d979
localforage + new transit-widget
Sep 13, 2017
42ef3af
Make fixes since upstream pull to make test/linting work again.
Dave-Gallup Sep 14, 2017
e9263fc
Write function in reducers/index.js to have only one sidebar open at …
Dave-Gallup Sep 14, 2017
ba4b772
Adjust App.css to remove scrollbar spacing in body
Dave-Gallup Sep 14, 2017
02220af
Add test for collapseWidgetSidebars function in reducer
Dave-Gallup Sep 14, 2017
464f9be
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
Dave-Gallup Sep 14, 2017
b50aaba
Merge pull request #23 from Dave-Gallup/close-sidebars
Sep 14, 2017
25efe80
Fix existing reducer tests to pass with new initial state
Dave-Gallup Sep 14, 2017
fd11df0
Add onLayoutChange handlers,action & reducer to persist changes to gr…
Dave-Gallup Sep 14, 2017
df086c8
Create tests for SAVE_LAYOUT_CHANGE action and reducer.
Dave-Gallup Sep 14, 2017
2a125fc
Correct changes for tests
Dave-Gallup Sep 14, 2017
28dbf8f
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
Dave-Gallup Sep 14, 2017
792d5b1
Remove earlier changes which eliminated widget reducers from default …
Dave-Gallup Sep 15, 2017
270bd2e
Add 3px padding to body tag in App.css per Daniel's instructions.
Dave-Gallup Sep 15, 2017
1f891cf
Merge pull request #24 from Dave-Gallup/save-layout-change
Sep 15, 2017
a70b4ef
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
Dave-Gallup Sep 15, 2017
f264aa0
Updates
simona1 Sep 15, 2017
31efeb1
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
simona1 Sep 15, 2017
0c5a6ed
Make channel name fit and resize properly inside the drop-down menu
simona1 Sep 18, 2017
dbf11b6
Remove "homepage" from package.json
joshwyatt Sep 18, 2017
2468f0e
Add production env file (#25)
joshwyatt Sep 18, 2017
862d841
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
michaelmurray6298 Sep 18, 2017
5dbbab9
Install sheets widget
michaelmurray6298 Sep 18, 2017
af4a1bb
fixed prod urls
Sep 18, 2017
0e34963
Complete sheets integration
michaelmurray6298 Sep 19, 2017
0a6151d
Add dynamic widget placement functionality.
Dave-Gallup Sep 19, 2017
29661e3
Add 3px padding to body tag in App.css per Daniel's instructions.
Dave-Gallup Sep 15, 2017
5588b31
Add dynamic widget placement functionality.
Dave-Gallup Sep 19, 2017
0242854
Merge branch 'auto-place-widgets' of https://github.com/Dave-Gallup/d…
Dave-Gallup Sep 19, 2017
f67e64b
Abstract out widget types into config file and alter ADD_WIDGET reduc…
Dave-Gallup Sep 19, 2017
c26c232
Populate "Add widget" modal dynamically from configuration file.
Dave-Gallup Sep 19, 2017
1b32e6a
Adjust App.css to remove pusher padding.
Dave-Gallup Sep 19, 2017
dbf17e1
Make snapshot tests pass after changes.
Dave-Gallup Sep 19, 2017
a199601
update env variables and github spa
Sep 19, 2017
2fd4096
Update widget versions
michaelmurray6298 Sep 19, 2017
2e2ce2f
Update widget versions
michaelmurray6298 Sep 19, 2017
42dfe48
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
michaelmurray6298 Sep 19, 2017
e2d1b9c
Merge branch 'dev' into sheets-int
michaelmurray6298 Sep 19, 2017
80d7456
Correct slight mis-positioning in auto-placement of new widget.
Dave-Gallup Sep 19, 2017
0638e50
Add 3px padding to body tag in App.css per Daniel's instructions.
Dave-Gallup Sep 15, 2017
9a56b81
Add dynamic widget placement functionality.
Dave-Gallup Sep 19, 2017
fb3d60c
Add dynamic widget placement functionality.
Dave-Gallup Sep 19, 2017
747de08
Abstract out widget types into config file and alter ADD_WIDGET reduc…
Dave-Gallup Sep 19, 2017
6ce5a9e
Populate "Add widget" modal dynamically from configuration file.
Dave-Gallup Sep 19, 2017
db4fda9
Adjust App.css to remove pusher padding.
Dave-Gallup Sep 19, 2017
364fbba
Make snapshot tests pass after changes.
Dave-Gallup Sep 19, 2017
ca1e3a2
Correct slight mis-positioning in auto-placement of new widget.
Dave-Gallup Sep 19, 2017
bdaa72a
Clean out auto-positioning functionality.
Dave-Gallup Sep 19, 2017
6b5b5a0
Merge branch 'min-sizes' of https://github.com/Dave-Gallup/dashboard-…
Dave-Gallup Sep 19, 2017
49a7aab
Fix lint and testing errors.
Dave-Gallup Sep 19, 2017
d7d806f
Merge pull request #27 from michaelmurray6298/sheets-int
Sep 19, 2017
97d990b
Merge branch 'dev' into min-sizes
Dave-Gallup Sep 20, 2017
022b581
Merge branch 'dev' of https://github.com/databraid-dashboard/dashboar…
michaelmurray6298 Sep 20, 2017
f12f4ab
Add sheets API url
michaelmurray6298 Sep 20, 2017
63b34ce
Add React prefix
michaelmurray6298 Sep 20, 2017
e398ab7
Merge pull request #3 from michaelmurray6298/sheets-int
michaelmurray6298 Sep 20, 2017
a5da011
Rename .env variable
michaelmurray6298 Sep 20, 2017
76f418b
Merge pull request #30 from michaelmurray6298/dev
Sep 20, 2017
cd54495
Change dragging outline color to grey
michaelmurray6298 Sep 20, 2017
65b67dd
Merge pull request #28 from Dave-Gallup/min-sizes
Sep 20, 2017
07cc19f
Fix linting and tests
michaelmurray6298 Sep 20, 2017
eb5dd8f
Merge pull request #31 from michaelmurray6298/dev
Sep 20, 2017
8a3a48e
Update addWidgetModal cancel button
meghanprestemon Sep 21, 2017
856dee6
Update addWidgetModal cancel button
meghanprestemon Sep 21, 2017
f3b8590
Merge pull request #32 from meghanprestemon/closeModal
Sep 21, 2017
7d93c93
Add sheet api environmental variables to .gitignore
joshwyatt Sep 21, 2017
04db523
Add sheet api dev container (#33)
joshwyatt Sep 21, 2017
5e64d91
Change phrase in modal (#34)
ronanfitz Sep 21, 2017
8c1ee96
Add onClose attribute to addWidgetModal (#35)
meghanprestemon Sep 21, 2017
5bb25f8
Update snapshot for changed modal message
joshwyatt Sep 21, 2017
cb8237d
Transfer code from working auto-position so it works with current Dev
Dave-Gallup Sep 22, 2017
faa1451
Add 12px padding to .pusher>.ui.segment.basic in App.css to handle sl…
Dave-Gallup Sep 22, 2017
417970e
Set min width of Github config to 6 cols per Sandeep
Dave-Gallup Sep 22, 2017
18259de
Fix tests to handle corrected algorithm
Dave-Gallup Sep 22, 2017
9bbccf7
Merge pull request #36 from Dave-Gallup/auto-position
Sep 22, 2017
a641f87
Alter default widget sizes
Dave-Gallup Sep 28, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This is for the transit API
REACT_APP_GOOGLE_MAPS_API_KEY=AIzaSyCD3OBB8YjstMzmlR1vSfnROTWgz9sLi0E
11 changes: 11 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is for the transit API
REACT_APP_API_SERVER_URL=http://localhost:8001

# This is for the github API
REACT_APP_GITHUB_API_URL=http://localhost:8002

# This is for the slack API
REACT_APP_SLACK_API_URL=http://localhost:8000

# This is for the sheets API
REACT_APP_SHEETS_API_URL=http://localhost:8003
8 changes: 8 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This is for the transit API
REACT_APP_API_SERVER_URL=https://transit-api.databraid.net

# This is for the github API
REACT_APP_GITHUB_API_URL=https://github-api.databraid.net

# This is for the slack API
REACT_APP_SLACK_API_URL=https://slack-api.databraid.net
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
.env.development.local
.env.test.local
.env.production.local
.env.slack-api
.env.transit-api
.env.github-api
.env.sheet-api

npm-debug.log*
yarn-debug.log*
yarn-error.log*

google-credentials
46 changes: 46 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
version: "2"

services:

slack-api:
image: databraiddb/slack-api:latest
command: sh -c "sleep 5 && npm run dev"
ports:
- 8000:8000
environment:
- PORT=8000
depends_on:
- postgres
volumes:
- ./google-credentials:/app/google-credentials
- ./.env.slack-api:/app/.env

transit-api:
image: databraiddb/transit-api:latest
ports:
- 8001:8000
environment:
- PORT=8000
volumes:
- ./.env.transit-api:/app/.env

sheet-api:
image: databraiddb/sheet-api:latest
ports:
- 8003:8000
environment:
- PORT=8000
volumes:
- ./.env.sheet-api:/app/.env

github-api:
image: databraiddb/github-api:latest
ports:
- 8002:8000
environment:
- PORT=8000
volumes:
- ./.env.github-api:/app/.env

postgres:
image: databraiddb/slack-test-postgres:latest
Loading