Skip to content

Commit

Permalink
new map markers and fixed typo in SearchBar.js
Browse files Browse the repository at this point in the history
  • Loading branch information
waltribeiro committed Feb 17, 2020
1 parent 74b70ca commit 6b2c5e2
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/testsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: |
echo Build started on `date`
echo Building the webapp...
docker-compose run prod_build
echo Build completed on `date`
echo Pushing the webapp to S3...
sudo apt-get update -y
sudo apt-get install python3-setuptools
sudo apt-get install -y python3-pip
sudo pip3 install awscli --upgrade --user
aws s3 sync docker/build s3://test.phlask.me/${GITHUB_SHA} --acl public-read --delete
aws s3 sync docker/testResults s3://test.phlask.me/${GITHUB_SHA}/testResults --acl public-read --delete
echo "Test site for this run can be accessed at: https://test.phlask.me/${GITHUB_SHA}"
echo Build started on `date`
echo Building the webapp...
docker-compose run prod_build
echo Build completed on `date`
echo Pushing the webapp to S3...
sudo apt-get update -y
sudo apt-get install python3-setuptools
sudo apt-get install -y python3-pip
sudo pip3 install awscli --upgrade --user
aws s3 sync docker/build s3://test.phlask.me/${GITHUB_SHA} --acl public-read --delete
aws s3 sync docker/testResults s3://test.phlask.me/${GITHUB_SHA}/testResults --acl public-read --delete
echo "Test site for this run can be accessed at: https://test.phlask.me/${GITHUB_SHA}"
- name: Record the test build
env:
AWS_DEFAULT_REGION: us-east-1
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Jetbrains
.idea
.vscode
.code-workspace
.cache/
dist/
coverage/
Expand All @@ -11,6 +12,9 @@ coverage/
# OS X
.DS_Store

#Photoshop files
.pxm

# ReactJS
build/

Expand Down
8 changes: 8 additions & 0 deletions _phlask.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"folders": [
{
"path": "."
}
],
"settings": {}
}
10 changes: 5 additions & 5 deletions src/components/ReactGoogleMaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ export class ReactGoogleMaps extends Component {
getIcon(access) {
switch (access) {
case "Public":
return "https://i.imgur.com/M12e1HV.png";
return "https://i.imgur.com/fsofse7.png";
case "Private-Shared":
return "https://i.imgur.com/DXMMxXR.png";
return "https://i.imgur.com/MMsmsHG.png";
case "Private":
return "https://i.imgur.com/kt825XO.png";
return "https://i.imgur.com/oLPMQtg.png";
case "Restricted":
return "https://i.imgur.com/5NOdOyY.png";
return "https://i.imgur.com/T93TDTO.png";
case "Semi-public":
return "https://i.imgur.com/DXMMxXR.png";
return "https://i.imgur.com/MMsmsHG.png";
case "TrashAcademy":
return "https://i.imgur.com/fXTeEKL.png";
default:
Expand Down
2 changes: 1 addition & 1 deletion src/components/SearchBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default class SearchBar extends React.Component {
loading
}) => (
<div>
{/* type="serach" is only HTML5 compliant */}
{/* type="search" is only HTML5 compliant */}
<input
{...getInputProps({
placeholder: "Search For Taps Near...",
Expand Down

0 comments on commit 6b2c5e2

Please sign in to comment.