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

Development #3

Open
wants to merge 130 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
4ba0bef
Integrate mapbox-gl.
liayoo Apr 13, 2020
d06d00a
feat: change js to ts and edit map process
ehdgus8077 Apr 13, 2020
1f6ef61
Merge pull request #1 from liayoo/feature/donghyeon/googleMap_ts
ehdgus8077 Apr 13, 2020
1c805a1
Integrate mapbox-gl.
liayoo Apr 13, 2020
8fba39d
Merge branch 'feature/lia/add-mapbox' of github.com:liayoo/crowdy int…
liayoo Apr 13, 2020
fd1bf19
Update to use new apis.
liayoo Apr 13, 2020
ab4b52e
Merge pull request #2 from liayoo/feature/lia/add-mapbox
liayoo Apr 14, 2020
b87f22d
feat: add swagger and unit test
ehdgus8077 Apr 14, 2020
a953f5e
fix: add encodeURI
ehdgus8077 Apr 14, 2020
7a8db08
Merge branch 'development' into feature/donghyeon/unitTest_swagger
liayoo Apr 14, 2020
46b4b43
Merge pull request #3 from liayoo/feature/donghyeon/unitTest_swagger
ehdgus8077 Apr 14, 2020
bbf9550
Update map related ui, fly to new data points.
liayoo Apr 14, 2020
ba35a5a
Separate file for getInfoFromNowStatus function.
liayoo Apr 14, 2020
939dad8
Toggle 'no time data' elements
Apr 16, 2020
a1756ab
Merge pull request #5 from liayoo/feature/joonhyung/no-time-data-toggle
liayoo Apr 17, 2020
831daa1
Merge pull request #4 from liayoo/feature/lia/update-map
liayoo Apr 17, 2020
af3beaf
Change data update logic.
liayoo Apr 17, 2020
65fef01
fix: edit feature for parsing
ehdgus8077 Apr 17, 2020
5401c3e
Merge pull request #8 from liayoo/fix/donghyeon/googleMap
liayoo Apr 18, 2020
821c23c
Merge pull request #7 from liayoo/bugfix/lia/fix-data-update-logic
liayoo Apr 18, 2020
1ee0d6d
Add day, time selects and toggle functionalities.
liayoo Apr 19, 2020
7cb8fb3
Refactor code, disable selecting time when day is 'Live Data'.
liayoo Apr 19, 2020
4c958a8
Use a for loop for constructing the times array.
liayoo Apr 20, 2020
053724b
Merge pull request #9 from liayoo/feature/lia/time-select-toggle
liayoo Apr 20, 2020
b8ace81
Remove material ui
jaycho46 Apr 20, 2020
006d6f9
Update hero section
jaycho46 Apr 20, 2020
4c45313
Remove mapbox access token env var.
liayoo Apr 20, 2020
1390be3
Merge pull request #10 from liayoo/hotfix/lia/remove-envs
liayoo Apr 20, 2020
25ce665
Update map section
jaycho46 Apr 20, 2020
e7ed0f6
Add media query
jaycho46 Apr 20, 2020
be3e731
Merge branch 'development' into feature/joonhyung/ui-update
jaycho46 Apr 20, 2020
b7905a8
Add react-text-loop
jaycho46 Apr 20, 2020
72586a3
Merge pull request #11 from liayoo/feature/joonhyung/ui-update
liayoo Apr 21, 2020
29b7676
Fix toggle and category resets.
liayoo Apr 21, 2020
0167303
Merge pull request #12 from liayoo/hotfix/lia/fix-toggle
liayoo Apr 21, 2020
072ef59
Merge branch 'development' into feature/joonhyung/text-loop
jaycho46 Apr 21, 2020
0b19ab1
fix: edit dockerfile
ehdgus8077 Apr 21, 2020
3647791
Merge pull request #14 from liayoo/feature/joonhyung/text-loop
jaycho46 Apr 21, 2020
92be687
fix: fix bug </api/locations>
ehdgus8077 Apr 21, 2020
e96064e
feat: add text loop
ehdgus8077 Apr 21, 2020
9539cd0
fix: fix bug
ehdgus8077 Apr 21, 2020
572b4a3
Merge pull request #15 from liayoo/fix/donghyeon/ainize
ehdgus8077 Apr 21, 2020
ed300c4
Use default coords if userGps not available.
liayoo Apr 21, 2020
aa6e96a
Merge pull request #16 from liayoo/feature/lia/use-default-coords
liayoo Apr 21, 2020
517dc43
Fix hero styles.
liayoo Apr 21, 2020
b69cc2c
Merge pull request #18 from liayoo/fix/lia/fix-hero-styles
liayoo Apr 21, 2020
fac74bc
Update github repo url.
liayoo Apr 22, 2020
75b5460
Add attributions.
liayoo Apr 22, 2020
d4ffd82
Zoom only when scrolling and holding specific keys.
liayoo Apr 22, 2020
b2f5a43
feat: add ga
ehdgus8077 Apr 22, 2020
fe7fd8a
Fix user gps issues.
liayoo Apr 22, 2020
ad65f3f
Add geolocate control, update popup card ui.
liayoo Apr 23, 2020
cb69151
Add styles for mobile.
liayoo Apr 23, 2020
b83d90a
Merge pull request #20 from ainize-team2/fix/lia/qa-issues
liayoo Apr 23, 2020
150fb6f
Add line break in hero section
jaycho46 Apr 23, 2020
d6bba82
Fix text loop interval
jaycho46 Apr 23, 2020
bd317c5
Fix color of text for input field
jaycho46 Apr 23, 2020
64af93b
Merge pull request #21 from ainize-team2/fix/joonhyung/ui-fix
jaycho46 Apr 24, 2020
22880ae
fix: conflict
ehdgus8077 Apr 24, 2020
689781a
fix: edit trackingId
ehdgus8077 Apr 24, 2020
5a8e73d
Merge pull request #19 from ainize-team2/feature/donghyeon/ga
ehdgus8077 Apr 24, 2020
ef44f20
Update github repo url.
liayoo Apr 24, 2020
6f96ad7
Merge pull request #23 from ainize-team2/fix/lia/github-url
liayoo Apr 24, 2020
79ee8fc
Update favicon.
liayoo Apr 24, 2020
3adcf94
Add spinners.
liayoo Apr 24, 2020
c0d03a2
Adjust map height.
liayoo Apr 24, 2020
b2ceea4
Merge pull request #25 from ainize-team2/feature/lia/update-favicon
liayoo Apr 24, 2020
d16e2f9
Change map tile server.
liayoo Apr 24, 2020
2c5f419
Merge pull request #27 from ainize-team2/fix/lia/switch-tile-server
liayoo Apr 24, 2020
fe5aae0
Add about page
jaycho46 Apr 26, 2020
52b366b
Merge pull request #28 from ainize-team2/feature/joonhyung/about-page
jaycho46 Apr 27, 2020
8e7239c
Fix links.
liayoo Apr 27, 2020
9132ec6
Update swagger.
liayoo Apr 27, 2020
2bedbdb
Merge pull request #29 from ainize-team2/hotfix/lia/fix-links
liayoo Apr 27, 2020
46f3289
Update health check api.
liayoo Apr 27, 2020
2035602
Change to sendStatus.
liayoo Apr 28, 2020
56f2e2a
Add a run-on-ainize button.
liayoo Apr 28, 2020
f3c15df
Merge pull request #30 from ainize-team2/fix/lia/change-health-endpoint
liayoo Apr 28, 2020
a78cd0a
Add home link to logo
liayoo Apr 29, 2020
fc2683a
Block drag rotate on map.
liayoo Apr 29, 2020
67c9b35
Change the position of geolocation controller.
liayoo Apr 29, 2020
c5339f2
Add a spinner.
liayoo Apr 29, 2020
ebdca9b
Change search bar placeholder.
liayoo Apr 29, 2020
2647981
Disable clicks on categories while loading.
liayoo Apr 29, 2020
67e8517
Show currently selected day and time.
liayoo Apr 29, 2020
20694df
Update spinner styles.
liayoo Apr 29, 2020
af4cc9c
Apply lat/lng change thresholds.
liayoo May 6, 2020
8375b41
Merge pull request #31 from ainize-team2/fix/lia/qa-issues
liayoo May 6, 2020
a277495
feat: add ga evnet for search
ehdgus8077 May 6, 2020
0f2405e
fix: edit useEffect for ga
ehdgus8077 May 6, 2020
ce5457c
Merge pull request #32 from ainize-team2/feature/donghyeon/searchQa
ehdgus8077 May 6, 2020
b35c9a4
Fix map coords bug.
liayoo May 7, 2020
f5137a8
Merge pull request #33 from ainize-team2/fix/lia/qa-issues
liayoo May 7, 2020
63ce2a5
Update about page
jaycho46 May 7, 2020
833a35d
Merge pull request #34 from ainize-team2/feature/joonhyung/about-page
jaycho46 May 8, 2020
b406fdc
feat: add ga about link
ehdgus8077 May 8, 2020
f62fcc7
Merge pull request #35 from ainize-team2/feature/donghyeon/aboutPageGa
ehdgus8077 May 8, 2020
7b590e4
Update button color
jaycho46 May 11, 2020
eb14634
Update quote background
jaycho46 May 11, 2020
8d09572
Merge pull request #37 from ainize-team2/fix/joonhyung/ui-fix
jaycho46 May 11, 2020
b6cd134
Update default coords.
liayoo May 11, 2020
b7f99e6
Reduce debounce threshold.
liayoo May 11, 2020
6a42988
Change ainize link.
liayoo May 11, 2020
a7fc012
Change search placeholder.
liayoo May 11, 2020
808b17e
Hide N/A time.
liayoo May 11, 2020
72accd0
Add a navigationControl.
liayoo May 11, 2020
3f07d09
Update how to join paragraph.
liayoo May 11, 2020
30340cb
Fix useEffect hook for ga in about page.
liayoo May 11, 2020
a1504a8
Update map mobile ui.
liayoo May 12, 2020
31b842f
Update mobile css.
liayoo May 12, 2020
4a04fef
Fix map rapidly switching locations.
liayoo May 12, 2020
ec96fdd
Fix margins.
liayoo May 12, 2020
4b8ca8b
Merge pull request #38 from ainize-team2/fix/lia/qa-issues
liayoo May 13, 2020
b3eabe9
Add og tag.
liayoo May 14, 2020
6ba9ef9
Add twitter card meta tags.
liayoo May 18, 2020
4f4a905
Update icon for safari.
liayoo May 18, 2020
d7089ef
Merge pull request #39 from ainize-team2/fix/lia/qa-issues
liayoo May 18, 2020
5be4f93
Add search button on map and remove auto search.
liayoo May 18, 2020
556feda
fix: edit ga event
ehdgus8077 May 21, 2020
1a1f41b
Fix excludeNoTimeData bug.
liayoo May 23, 2020
51bb22a
Update footer.
liayoo May 23, 2020
31f6380
Add title and description tags.
liayoo May 23, 2020
c60b5c1
Merge pull request #40 from ainize-team2/fix/lia/qa-issues
liayoo May 23, 2020
e492fc9
Merge pull request #41 from ainize-team2/fix/donghyeon/ga_event
ehdgus8077 May 25, 2020
fc970e2
fix: fix ga event
ehdgus8077 May 28, 2020
10d37d0
Merge pull request #43 from ainize-team2/fix/donghyeon/fix_ga
ehdgus8077 May 28, 2020
c1eda19
fix: add option for titleCase
ehdgus8077 May 28, 2020
b4528f2
Merge pull request #45 from ainize-team2/fix/donghyeon/titlecase
ehdgus8077 May 28, 2020
98a29f9
Add stack overflow button.
liayoo Jun 20, 2020
ef5ba42
Merge pull request #47 from ainize-team2/feature/lia/add-stack-overfl…
liayoo Jun 22, 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
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/client
/dist
*.js
32 changes: 32 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = {
'env': {
'es6': true,
'node': true
},
'extends': [
'airbnb-base',
'plugin:@typescript-eslint/eslint-recommended'
],
'parser': '@typescript-eslint/parser',
'plugins': [
'@typescript-eslint'
],
'settings': {
'import/resolver': {
'node': {
'extensions': ['.ts'],
'moduleDirectory': ['node_modules', 'src/']
}
}
},
'rules': {
'no-restricted-syntax': 0,
'import/no-unresolved': 0,
'use-isnan': 0,
'max-classes-per-file': 0,
'no-unused-vars': 0,
'guard-for-in': 0,
'prefer-destructuring': 0,
'import/extensions': [0, 'ignorePackages'],
}
};
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
/dist
.env
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
[![Run on Ainize](https://www.ainize.ai/static/images/run_on_ainize_button.svg)](https://ainize.web.app/redirect?git_repo=github.com/ainize-team2/crowdy)


#BuildforCOVID19 Global Online Hackathon
https://devpost.com/software/crowdy-8w1pvu
https://devpost.com/software/crowdy-8w1pvu


# How to build
1. npm run heroku-postbuild
2. npm start

# How to build dockerfile
```
sudo docker build -t {Docker Path}:{Tag} .
sudo docker push {Docker Path}:{Tag}
```
- Install docker (https://blog.cosmosfarm.com/archives/248/%EC%9A%B0%EB%B6%84%ED%88%AC-18-04-%EB%8F%84%EC%BB%A4-docker-%EC%84%A4%EC%B9%98-%EB%B0%A9%EB%B2%95/)
4,402 changes: 3,237 additions & 1,165 deletions client/package-lock.json

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,22 @@
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"proxy": "http://localhost:5000",
"proxy": "http://localhost:80",
"dependencies": {
"@material-ui/core": "latest",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.47",
"@material-ui/styles": "^4.9.10",
"@turf/turf": "^5.1.6",
"clsx": "latest",
"lodash": "^4.17.15",
"mapbox-gl": "^1.9.1",
"react": "latest",
"react-dom": "latest",
"react-ga": "^2.7.0",
"react-router-dom": "^5.1.2",
"react-scripts": "latest",
"react-text-loop": "^2.3.0",
"socket.io-client": "^2.3.0",
"use-position": "0.0.6"
},
Expand All @@ -32,5 +38,6 @@
"last 1 firefox version",
"last 1 safari version"
]
}
},
"devDependencies": {}
}
Binary file modified client/public/android-chrome-96x96.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/apple-touch-icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/favicon-16x16.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/favicon-32x32.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions client/public/icon-search-map.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="title" content="Crowdy" />
<meta name="description" content="Find places near you that are not crowded!" />
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
<meta name="theme-color" content="#000000" />
<!--
Expand All @@ -27,9 +29,27 @@
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<!-- Twitter card metadata -->
<meta name="twitter:title" content="Crowdy" />
<meta name="twitter:description" content="Find places near you that are not crowded!" />
<meta name="twitter:image" content="%PUBLIC_URL%/og-img.png" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:image:width" content="1200" />
<meta name="twitter:image:height" content="630" />
<!-- Open Graph metadata -->
<meta property="og:title" content="Crowdy" />
<meta property="og:type" content="website" />
<meta property="og:description" content="Find places near you that are not crowded!" />
<meta property="og:image" content="%PUBLIC_URL%/og-img.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:image:alt" content="Crowdy" />
<title>Crowdy</title>
<!-- Fonts to support Material Design -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
<link href='https://api.mapbox.com/mapbox-gl-js/v1.8.1/mapbox-gl.css' rel='stylesheet' />
</head>

<body>
Expand Down
17 changes: 17 additions & 0 deletions client/public/marker_no_time_data.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions client/public/marker_not_busy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions client/public/marker_not_too_busy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading