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

Release update #578

Merged
merged 40 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e126b23
moved menu out from under WAVE tool
jmensch1 Apr 14, 2020
3b67b34
MultiSelect component
jmensch1 Apr 19, 2020
dfa0c08
using MultiSelect in NCSelector and CCSelector
jmensch1 Apr 19, 2020
07c0468
InfoTitle component
jmensch1 Apr 19, 2020
a665e80
using NCSelector, CCSelector, InfoTitle in menu/modal
jmensch1 Apr 20, 2020
ab4ff29
Added old and new jmeter logs
sellnat77 Apr 21, 2020
a4abbf3
Merge pull request #548 from hackforla/LoadTesting
jmensch1 Apr 21, 2020
79d6023
Merge branch 'dev' into FRONT-GroupedNCsAndAccessibility
jmensch1 Apr 21, 2020
613783d
moved lastPulled into /apistatus response
jmensch1 Apr 22, 2020
f89c14b
Merge pull request #549 from hackforla/LastPulledInApiStatus
sellnat77 Apr 22, 2020
fd4eee7
Merge branch 'dev' into FRONT-GroupedNCsAndAccessibility
sellnat77 Apr 22, 2020
f66c1bf
updated NC regions from empowerla website
jmensch1 Apr 22, 2020
35defc4
jmeter readme
jmensch1 Apr 26, 2020
f7e566c
Merge pull request #564 from hackforla/BACK-JMeterReadme
sellnat77 Apr 26, 2020
756562d
Merge branch 'dev' into FRONT-GroupedNCsAndAccessibility
adamkendis Apr 28, 2020
8327a87
Merge pull request #547 from hackforla/FRONT-GroupedNCsAndAccessibility
adamkendis Apr 28, 2020
c34ed9e
Added datapipeline.py to dataAnalysis
nikpap123 Apr 28, 2020
cbf6798
Included team members contributions
nikpap123 Apr 28, 2020
87e87e7
Added alt text to images. Increased margin size
adamkendis Apr 28, 2020
94a0cbb
Merge pull request #566 from hackforla/311-Data-Pipeline
ryanmswan Apr 29, 2020
1d5f6f9
Merge branch 'dev' into 563-FRONT-altText
adamkendis Apr 29, 2020
b34d51e
Merge pull request #567 from adamkendis/563-FRONT-altText
jmensch1 Apr 29, 2020
62ab40c
Remove Node.js installation in CI pipeline
raydog99 May 1, 2020
910e8ad
/pin-clusters with redis
jmensch1 Apr 30, 2020
3f7b828
/heatmap endpoint
jmensch1 May 3, 2020
c0ef88a
Merge branch 'dev' into 492-DEVOPS-remove-node-installation
sellnat77 May 4, 2020
4308eba
Merge pull request #573 from hackforla/492-DEVOPS-remove-node-install…
sellnat77 May 4, 2020
d06be40
added REDIS_URL to settings
jmensch1 May 4, 2020
3159d16
Merge branch 'dev' into BACK-PinClustersWithRedis
jmensch1 May 4, 2020
68b5a33
integration of /pin-clusters
jmensch1 Apr 29, 2020
20ff533
Merge pull request #574 from hackforla/BACK-PinClustersWithRedis
sellnat77 May 4, 2020
dc10bb1
Merge branch 'dev' into 565-FRONT-PinClusters
jmensch1 May 4, 2020
0c81003
Merge pull request #575 from hackforla/565-FRONT-PinClusters
adamkendis May 5, 2020
a656a93
Extended menu to bottom of viewport, added footer transition style.
adamkendis May 5, 2020
6e77c92
Updated footer to resize on menu open.
adamkendis May 5, 2020
0fbabef
Removed shadow from header. Removed border from menu close button.
adamkendis May 5, 2020
1ddd573
Updated Footer to resize on menu open or close. StaticFooter is now s…
adamkendis May 5, 2020
e80f3ad
Footer rendering based on current path.
adamkendis May 5, 2020
6b2ca97
Merge branch 'dev' into 560-FRONT-footerFixes
adamkendis May 5, 2020
f3ed52f
Merge pull request #583 from adamkendis/560-FRONT-footerFixes
jmensch1 May 6, 2020
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
7 changes: 0 additions & 7 deletions .github/workflows/Continuous_Delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,8 @@ env:
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [11.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Rebuild sass
run: npm rebuild node-sass
- name: Install Packages
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/Continuous_Integration_Frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@ on: [pull_request]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [11.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install Packages
run: npm install
- name: Lint
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/Publish_Frontend_Package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@ on:
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [11.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Build and Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand Down
17 changes: 17 additions & 0 deletions Orchestration/docker-compose-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
PROJECT_URL: REDACTED
GITHUB_TOKEN: REDACTED
TOKEN: REDACTED
REDIS_URL: redis://redis:6379
ports:
- 5000:5000

Expand Down Expand Up @@ -47,5 +48,21 @@ services:
container_name: "postgres-dashboard"
ports:
- 8080:8080

redis:
build:
context: ../redis
container_name: "311-redis"
expose:
- 6379

rebrow:
image: marian/rebrow
links:
- redis:redis
container_name: "redis-dashboard"
ports:
- 5001:5001

volumes:
backend_data:
Loading