Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
801192c
Initial Commit: Got CSV to load and read
markcwy-ra Mar 30, 2023
5cf89cc
Working prototype with no styling
markcwy-ra Apr 4, 2023
e238fcd
Added location button, haven't added location mapping
markcwy-ra Apr 6, 2023
f5d779e
Added getting location to button while loading
markcwy-ra Apr 6, 2023
1b4f388
Added some styling
markcwy-ra Apr 6, 2023
1e46f5d
Location based proximity search works
markcwy-ra Apr 6, 2023
14169da
Updated package.json
markcwy-ra Apr 6, 2023
15f5414
Fixed rogue while loop at final screen
markcwy-ra Apr 6, 2023
12bf15a
Updated buttons
markcwy-ra Apr 6, 2023
13b3141
More styling
markcwy-ra Apr 6, 2023
3c07ac5
V 0.1.0
markcwy-ra Apr 6, 2023
4d7bee6
More styling, flex-box things
markcwy-ra Apr 7, 2023
07ded62
Fixed flexbox issues
markcwy-ra Apr 7, 2023
a4c705a
edited fail screen
markcwy-ra Apr 7, 2023
edb39d3
Tweaked designs, added more food to list
markcwy-ra Apr 8, 2023
9c045b5
Linked database to Google Sheets
markcwy-ra Apr 8, 2023
d57d749
Fixed bug where skipping location will error
markcwy-ra Apr 8, 2023
d130f04
Fixed no search results bug
markcwy-ra Apr 8, 2023
e7c8fc2
Fixed issue of double loading images
markcwy-ra Apr 10, 2023
ca09c37
animation tests
markcwy-ra Apr 10, 2023
83f278f
Update App.css
markcwy-ra Apr 10, 2023
750fa0e
Update QuestionScreen.js
markcwy-ra Apr 10, 2023
2cea912
Update HomeScreen.js
markcwy-ra Apr 10, 2023
c7187d9
Merge pull request #1 from markcwy-ra/animation
markcwy-ra Apr 10, 2023
43f4640
Updated README
markcwy-ra Apr 10, 2023
7a9df74
Restructured QuestionScreen.js to use lists/keys
markcwy-ra Apr 10, 2023
11edbf1
Added Animation
markcwy-ra Apr 10, 2023
869f05e
Merge pull request #2 from markcwy-ra/animation
markcwy-ra Apr 10, 2023
9d920ab
Added desktop version
markcwy-ra Apr 10, 2023
ff09cb2
Fixed issue with food display image going too wide
markcwy-ra Apr 10, 2023
b6a9344
Added notes to recommendations
markcwy-ra Apr 10, 2023
2adab4d
Made 'skip' more obvious, added back button
markcwy-ra Apr 10, 2023
bc5f9cc
Added instructions screen on first visit
markcwy-ra Apr 11, 2023
d3e77a5
Pulled out question display component from question screen
markcwy-ra Apr 11, 2023
20724ad
Added halal and vegatarian filters to a 'settings' section, fixed all…
markcwy-ra Apr 11, 2023
1f0809b
Added adjustable search radius slider to settings
markcwy-ra Apr 12, 2023
6f41229
Added new 'takeaway only' option, added icon to filter list and added…
markcwy-ra Apr 12, 2023
9046b77
Added red note for food i haven't tried
markcwy-ra Apr 12, 2023
c487f84
Tweaked search parameter for food i've heard but not tried
markcwy-ra Apr 12, 2023
cae211b
Cleaned up code (utils.js & Fade.js)
markcwy-ra Apr 13, 2023
0c75e19
Updating to function components + deploying to firebase
markcwy-ra Apr 27, 2023
04bf795
Switched more components to function components
markcwy-ra Apr 27, 2023
b6ff88e
Removed router
markcwy-ra Apr 27, 2023
673628a
Splitting up css files
markcwy-ra May 11, 2023
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
26 changes: 26 additions & 0 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
asset-manifest.json,1683791116857,6eb134c96134da3fbe9eeae52617c3b55635e89fca98c4b96b7185c85b83b0db
index.html,1683791116857,84a002df460ea1b67eed581e15230756274823169e310809d8a341fb15be9ef1
favicon.ico,1683791080842,41b6bdb6164ca309be0b4f953a0146299823bd70ed0d7dbae9133899e3fa1c43
manifest.json,1683791080873,8a52b2056a920670efed97e8438c2e2719e781bf7d3d1d3d6fe3f94341877c5f
icons/filter.svg,1683791080856,1152f8b25752467e67885443b0273622b43826c18c5fde4006ecec52350e0157
icons/location.svg,1683791080857,62d5ce23bbc1c5a5418f919815ebadf64cf54acc39be7839bd865aa7ff99c0e8
logos/icon-fail.svg,1683791080863,f651279aa076dd93924442062a13b1532db31c2d24d465d64c342ae917e97741
logos/icon-blue.svg,1683791080862,61c9c5a1f5f1da1f176bc14cdd5253ed950fbe368b2a95f8ddf473cb53d508d1
logos/icon-white.svg,1683791080865,8cde4aedecd49248dbff0a3326db72a0a2957ae6fddbfc6937fbde005f8f3691
logos/logo-home.svg,1683791080867,22f34923d22812c008f923a17ede1a78bc80de78b8ff9d29137e47b74f98d190
logos/logo-black-wide.svg,1683791080866,71513b726d72b6da31da5596d22d0c16c24ddc79c336ec97b92b012c9fefa4c8
logos/logo-white-wide.svg,1683791080869,eaafb2eb52aec1424575a8f98e43ca676011f13db95e7c580362e86416c85102
static/css/main.e6b87447.css,1683791116876,450c3435403389a7ed1e5a56b12152937f9c27f156dc7c26e4a30f919fb1d112
static/js/main.18302841.js.LICENSE.txt,1683791116876,bbda607af6d4fcdfb72c785d7c5c6ff40ec87dff5a23c6c7db76a43d56cd2ead
logos/logo192.png,1683791080870,1d108d2885e7098d4850ecb339f6e3189265feb7fc38aee2127930c9a7822dd9
static/css/main.e6b87447.css.map,1683791116876,352ae90c4162019e3957f1ccfbf95f6fbedfdb8012e53c02310c231a4184ed26
logos/logo512.png,1683791080872,8d33f703e8de9a6bc36b5d30543614ad771534073497a76346c80dfb0613be48
static/media/Satoshi-Bold.a0e6d25529eab537426c.woff2,1683791116877,0322da84a6df2b206c14be485db038e0235c2e3cb8900aeec91e6715370217c9
static/media/Satoshi-Bold.a875ff682ee232938607.woff,1683791116876,669b77becddb880ad6eea8afaa0284f5cd30205e3774249b4c925b3b4357e33c
static/media/Satoshi-Medium.1ffe968245568e8ba1e7.woff2,1683791116874,1a9856d068e4a9398ebb559091c26b7152d50b77aceef2d192adefd234580577
static/media/Satoshi-Medium.2419b46c96ed15331ba2.woff,1683791116874,c9f69fbb1b54f1651c08a59d599875751d87462d69bb8a4ea75b781b12f2fb0a
static/media/Satoshi-Bold.137a52d9f47dd71c6247.ttf,1683791116874,193cdc00db3a07259a85711d51aac391ed19600a2fabe5a9ae2fb841c241a5d8
static/media/Satoshi-Medium.759562088ba19068aef8.ttf,1683791116874,b88be54c30614e53c240020cd528854faf72bdbbcc6d0703e8e1dd8009e1778b
static/media/Oakes-Grotesk-Bold.a6b9f0fbd8198bd97c6d.ttf,1683791116876,027e39f5f236c6df4f3cf2ecef6b2855e217a3640bc15ecf8db800de406d0fcd
static/js/main.18302841.js,1683791116875,6e7717affdeac6e7b2724bcbbbb01c23b6375721c6f569a7c3f56a23cb32e096
static/js/main.18302841.js.map,1683791116875,c52b7d2d75bf575f5ebadf6a91e41d60769781d495589fd49bbd6354bdc2a4c9
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "markan-where"
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

/src/database
18 changes: 6 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
# Rocket Academy Coding Bootcamp: Project 1: Frontend App
# Makan Where: Makan Recommendation Generator by @markan.sg!

https://bc.rocketacademy.co/1-frontend/1.p-frontend-app
Not sure what to eat? With this app, you can find curated food recommendations around you by Mark!
You can explore the app here: https://markcwy-ra.github.io/markan-where/

## Available Scripts
## Current Version Notes

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.
Currently has limited number of food places, list will be updated soon!
Images and location takes a while to load, so please be patient!
16 changes: 16 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosting": {
"public": "build",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
Loading