diff --git a/.eslintrc.json b/.eslintrc.json index b3a4079..c708a1f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,33 +1,33 @@ -{ - "env": { - "browser": true, - "es2021": true, - "node": true - }, - "extends": "eslint:recommended", - "overrides": [ - ], - "parserOptions": { - "ecmaVersion": "latest", - "sourceType": "module" - }, - "rules": { - "indent": [ - "error", - "tab" - ], - "linebreak-style": [ - "error", - "unix" - ], - "quotes": [ - "error", - "double" - ], - "semi": [ - "error", - "always" - ], - "no-global-assign": 0 - } -} +{ + "env": { + "browser": true, + "es2021": true, + "node": true + }, + "extends": "eslint:recommended", + "overrides": [ + ], + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "rules": { + "indent": [ + "error", + "tab" + ], + "linebreak-style": [ + "error", + "unix" + ], + "quotes": [ + "error", + "double" + ], + "semi": [ + "error", + "always" + ], + "no-global-assign": 0 + } +} diff --git a/.github/workflows/css-linting.yml b/.github/workflows/css-linting.yml new file mode 100644 index 0000000..fae3b66 --- /dev/null +++ b/.github/workflows/css-linting.yml @@ -0,0 +1,23 @@ +name: CSS Linting + +on: + pull_request: + branches: + - main + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + # Single deploy job since we're just deploying + test: + runs-on: ubuntu-latest + steps: + - name: Install apt updates + run: sudo apt -y update; sudo apt -y upgrade; + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies + run: sudo npm install + - name: Run tests + run: sudo npm run lintCSS \ No newline at end of file diff --git a/.github/workflows/deploy-githubpages.yml b/.github/workflows/deploy-githubpages.yml index 83b8b93..4909524 100644 --- a/.github/workflows/deploy-githubpages.yml +++ b/.github/workflows/deploy-githubpages.yml @@ -1,43 +1,43 @@ -# Simple workflow for deploying static content to GitHub Pages -name: Deploy GitHub Pages - -on: - # Runs on pushes targeting the default branch - push: - branches: - - main - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow one concurrent deployment -concurrency: - group: "pages" - cancel-in-progress: true - -jobs: - # Single deploy job since we're just deploying - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Pages - uses: actions/configure-pages@v2 - - name: Upload artifact - uses: actions/upload-pages-artifact@v1 - with: - # Upload only the src repository - path: './source/' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v1 +# Simple workflow for deploying static content to GitHub Pages +name: Deploy GitHub Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: + - main + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow one concurrent deployment +concurrency: + group: "pages" + cancel-in-progress: true + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Pages + uses: actions/configure-pages@v2 + - name: Upload artifact + uses: actions/upload-pages-artifact@v1 + with: + # Upload only the src repository + path: './source/' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1 diff --git a/.github/workflows/html-linting.yml b/.github/workflows/html-linting.yml new file mode 100644 index 0000000..ab68590 --- /dev/null +++ b/.github/workflows/html-linting.yml @@ -0,0 +1,23 @@ +name: HTML Linting + +on: + pull_request: + branches: + - main + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + # Single deploy job since we're just deploying + test: + runs-on: ubuntu-latest + steps: + - name: Install apt updates + run: sudo apt -y update; sudo apt -y upgrade; + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies + run: sudo npm install + - name: Run tests + run: sudo npm run lintHTML diff --git a/.github/workflows/js-linting.yml b/.github/workflows/js-linting.yml index 10afcd7..f3aafaf 100644 --- a/.github/workflows/js-linting.yml +++ b/.github/workflows/js-linting.yml @@ -1,25 +1,25 @@ -name: JS Linting - -on: - pull_request: - branches: - - main - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -jobs: - # Single deploy job since we're just deploying - test: - runs-on: ubuntu-latest - steps: - - name: Install apt updates - run: sudo apt -y update; sudo apt -y upgrade; - - name: Install prerequisites - run: sudo apt install -y nodejs npm; - - name: Checkout - uses: actions/checkout@v3 - - name: Install dependencies - run: sudo npm install - - name: Run tests +name: JS Linting + +on: + pull_request: + branches: + - main + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + # Single deploy job since we're just deploying + test: + runs-on: ubuntu-latest + steps: + - name: Install apt updates + run: sudo apt -y update; sudo apt -y upgrade; + - name: Install prerequisites + run: sudo apt install -y nodejs npm; + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies + run: sudo npm install + - name: Run tests run: sudo npm run lint \ No newline at end of file diff --git a/.github/workflows/js-unittest.yml b/.github/workflows/js-unittest.yml index d4fc26d..4cb1359 100644 --- a/.github/workflows/js-unittest.yml +++ b/.github/workflows/js-unittest.yml @@ -16,7 +16,9 @@ jobs: - name: Install apt updates run: sudo apt -y update; sudo apt -y upgrade; - name: Install prerequisites - run: sudo apt install -y nodejs npm; + uses: actions/setup-node@v3 + with: + node-version: 18 - name: Checkout uses: actions/checkout@v3 - name: Install dependencies diff --git a/.gitignore b/.gitignore index 4f2c69d..508f672 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -**/.devcontainer/* -**/node_modules/* +**/.devcontainer/* +**/node_modules/* **/package-lock.json \ No newline at end of file diff --git a/.htmlhintrc b/.htmlhintrc new file mode 100644 index 0000000..edd263f --- /dev/null +++ b/.htmlhintrc @@ -0,0 +1,3 @@ +{ + "attr-value-not-empty": false +} diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 0000000..2f1eeda --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "stylelint-config-standard" +} \ No newline at end of file diff --git a/README.md b/README.md index 84748ab..4d9849e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# cse110-fa22-group29 +# cse110-fa22-group29 [Team Page Link](https://github.com/cse110-fa22-group29/cse110-fa22-group29/blob/main/admin/team.md) \ No newline at end of file diff --git a/admin/meetings/101122-kickoff.md b/admin/meetings/101122-kickoff.md index fdddd16..c77c288 100644 --- a/admin/meetings/101122-kickoff.md +++ b/admin/meetings/101122-kickoff.md @@ -1,47 +1,47 @@ -# Meeting Minutes (10/12/2022) -## Team 29: Hackers1995 -## Meeting Topic: Kickoff Meeting -This meeting is being held to kickoff the start of many meetings to come during the quarter. -## Attendance -1. Rhea Bhutada -2. George Dubinin -3. Gavyn Ezell -4. Henry Feng -5. Kara Hoagland -6. Marc Reta -7. Sanjit Joseph -8. Isaac Otero -9. Daniel Hernandez - -## Absentees -1. Arthur Lu - -## Meeting Details -- When: 10/12/2022 at 3:30PM -- Where: Zoom - -## Agenda: -- ### Old/Unresolved Business - - N/A -- ### New Business - - go over github organization - - review assignments - - go through rules - - start branding/team name -- ### Next Meeting's Business - - figure out roles - - decide weekly meeting times - - figure out team bonding events - - brainstorm CRUD applications - - complete any remaining assignments - -## Decisions Made -- went over github organizations and reviewed the assignments -- went through the rules and agreed on the contract -- figured out the brand name - -## End Time -- 10/12/2022 at 4:30PM - - - +# Meeting Minutes (10/12/2022) +## Team 29: Hackers1995 +## Meeting Topic: Kickoff Meeting +This meeting is being held to kickoff the start of many meetings to come during the quarter. +## Attendance +1. Rhea Bhutada +2. George Dubinin +3. Gavyn Ezell +4. Henry Feng +5. Kara Hoagland +6. Marc Reta +7. Sanjit Joseph +8. Isaac Otero +9. Daniel Hernandez + +## Absentees +1. Arthur Lu + +## Meeting Details +- When: 10/12/2022 at 3:30PM +- Where: Zoom + +## Agenda: +- ### Old/Unresolved Business + - N/A +- ### New Business + - go over github organization + - review assignments + - go through rules + - start branding/team name +- ### Next Meeting's Business + - figure out roles + - decide weekly meeting times + - figure out team bonding events + - brainstorm CRUD applications + - complete any remaining assignments + +## Decisions Made +- went over github organizations and reviewed the assignments +- went through the rules and agreed on the contract +- figured out the brand name + +## End Time +- 10/12/2022 at 4:30PM + + + diff --git a/admin/meetings/101222-checkin1.md b/admin/meetings/101222-checkin1.md index f9472dd..d31c903 100644 --- a/admin/meetings/101222-checkin1.md +++ b/admin/meetings/101222-checkin1.md @@ -1,32 +1,32 @@ -# Meeting Minutes (10/12/2022) -## Team 29: Hackers1995 -## Meeting Topic: Weekly Check-In Meeting -This meeting is the first weekly meeting with TA -## Attendance -1. Gagan Gopalaiah -2. Rhea Bhutada -3. Kara Hoagland -4. Marc Reta -5. Arthur - -## Meeting Details -- When: 10/12/2022 at 8:00PM -- Where: Zoom - -## Agenda: -- ### Reviewed Project Details - - building CRUD app - - utilizing HTML, CSS, JavaScript - - general domain is better than specific domain -- ### Get Started early - - brainstorm CRUD apps - - review assignments - - figure out unit test code - - familiarize yourself with GitHub Actions - -## Important Information -- Gagan OH (6:30PM-7:30PM on Wednesday) in CSE Basement -- Reserved the room if any of us want to meet there. TA not going to present unless required. - -## End Time +# Meeting Minutes (10/12/2022) +## Team 29: Hackers1995 +## Meeting Topic: Weekly Check-In Meeting +This meeting is the first weekly meeting with TA +## Attendance +1. Gagan Gopalaiah +2. Rhea Bhutada +3. Kara Hoagland +4. Marc Reta +5. Arthur + +## Meeting Details +- When: 10/12/2022 at 8:00PM +- Where: Zoom + +## Agenda: +- ### Reviewed Project Details + - building CRUD app + - utilizing HTML, CSS, JavaScript + - general domain is better than specific domain +- ### Get Started early + - brainstorm CRUD apps + - review assignments + - figure out unit test code + - familiarize yourself with GitHub Actions + +## Important Information +- Gagan OH (6:30PM-7:30PM on Wednesday) in CSE Basement +- Reserved the room if any of us want to meet there. TA not going to present unless required. + +## End Time - 10/12/2022 at 8:30PM \ No newline at end of file diff --git a/admin/meetings/101922-checkin2.md b/admin/meetings/101922-checkin2.md index dba60a5..5286bc1 100644 --- a/admin/meetings/101922-checkin2.md +++ b/admin/meetings/101922-checkin2.md @@ -1,50 +1,50 @@ -# Meeting Minutes (10/19/2022) -## Team 29: Hackers1995 -## Meeting Topic: Weekly Check-In Meeting -This meeting is the second weekly meeting with TA. - -## Attendance -1. Gagan Gopalaiah -2. Rhea Bhutada -3. George Dubinin -4. Kara Hoagland -5. Marc Reta -6. Arthur Lu -7. Gavyn Ezell -8. Isaac Otero - -## Meeting Details -- When: 10/19/2022 at 8:00PM -- Where: Zoom - -## Agenda: -- ### Recap of last week - - went over assignments - - discussed feelings on the midterm - -- ### New Potential Meeting Time - - without TA unless necessary - - before lecture on Monday in CSE Basement - -- ### Upcoming Assignments - - two coming up - - brainstorm activity (due 10/23) - - continue brainstorming throughout the week - - due sunday - - pitch (11/1) - - initial draft by 10/25 - 10/26 - -- ### Tips on Designing - - user center design - - define the problem first, then the tools/techniques - - finalize on the product and its features, then decide on how to build it - -- ### Standup - - not expected everyday - - once every two days is ideal - - doesn't have to be too descriptive - -- ### Review of Recent Brainstorming Session - -## End Time +# Meeting Minutes (10/19/2022) +## Team 29: Hackers1995 +## Meeting Topic: Weekly Check-In Meeting +This meeting is the second weekly meeting with TA. + +## Attendance +1. Gagan Gopalaiah +2. Rhea Bhutada +3. George Dubinin +4. Kara Hoagland +5. Marc Reta +6. Arthur Lu +7. Gavyn Ezell +8. Isaac Otero + +## Meeting Details +- When: 10/19/2022 at 8:00PM +- Where: Zoom + +## Agenda: +- ### Recap of last week + - went over assignments + - discussed feelings on the midterm + +- ### New Potential Meeting Time + - without TA unless necessary + - before lecture on Monday in CSE Basement + +- ### Upcoming Assignments + - two coming up + - brainstorm activity (due 10/23) + - continue brainstorming throughout the week + - due sunday + - pitch (11/1) + - initial draft by 10/25 - 10/26 + +- ### Tips on Designing + - user center design + - define the problem first, then the tools/techniques + - finalize on the product and its features, then decide on how to build it + +- ### Standup + - not expected everyday + - once every two days is ideal + - doesn't have to be too descriptive + +- ### Review of Recent Brainstorming Session + +## End Time - 10/19/2022 at 3:50PM \ No newline at end of file diff --git a/admin/meetings/102322-decision.md b/admin/meetings/102322-decision.md index ea828e5..bc64f86 100644 --- a/admin/meetings/102322-decision.md +++ b/admin/meetings/102322-decision.md @@ -1,40 +1,40 @@ -# Meeting Minutes (10/23/2022) -## Team 29: Hackers1995 -## Meeting Topic: Application Final Decision -This meeting is held to help the group decide on which kind of app to build. -## Attendance -1. George Dubinin -2. Henry Feng -3. Arthur Lu -4. Marc Reta -5. Kara Hoagland -6. Rhea Bhutada -7. Isaac Otero - -## Absentees -1. Sanjit Joseph -2. Gavyn Ezell -3. Daniel Hernandez - -## Meeting Details -- When: - - 10/23/2022 at 1:00PM -- Where: Zoom (Rhea's Meeting Room) - -## Agenda: -- ### Old/Unresolved Business - - N/A -- ### New Business - - Decide on a final app idea -- ### Next Meeting's Business - - Discuss design features for the chosen app - -## Decisions Made -- Maybe for the food reviewer app. Presenting possible writeup to Gagan -- Maybe for the resume builder. Presenting possible writeup to Gagan https://docs.google.com/document/d/1zdvVxd47Ivdz-D0rZGNJqc3D9GiQj0n_xMJKapOV39A/edit?usp=sharing -- Maybe for Social Media Local Archive. Presenting possible writeup to Gagan https://docs.google.com/document/d/1upNr6lneB2uzCoQ12_aa1CMg1W8p2NBFb6xmP7i4-z4/edit?usp=sharing -- No to the copy/paste app (not local first) - -## End Time -- When: - - 10/23/2022 at 2:00PM +# Meeting Minutes (10/23/2022) +## Team 29: Hackers1995 +## Meeting Topic: Application Final Decision +This meeting is held to help the group decide on which kind of app to build. +## Attendance +1. George Dubinin +2. Henry Feng +3. Arthur Lu +4. Marc Reta +5. Kara Hoagland +6. Rhea Bhutada +7. Isaac Otero + +## Absentees +1. Sanjit Joseph +2. Gavyn Ezell +3. Daniel Hernandez + +## Meeting Details +- When: + - 10/23/2022 at 1:00PM +- Where: Zoom (Rhea's Meeting Room) + +## Agenda: +- ### Old/Unresolved Business + - N/A +- ### New Business + - Decide on a final app idea +- ### Next Meeting's Business + - Discuss design features for the chosen app + +## Decisions Made +- Maybe for the food reviewer app. Presenting possible writeup to Gagan +- Maybe for the resume builder. Presenting possible writeup to Gagan https://docs.google.com/document/d/1zdvVxd47Ivdz-D0rZGNJqc3D9GiQj0n_xMJKapOV39A/edit?usp=sharing +- Maybe for Social Media Local Archive. Presenting possible writeup to Gagan https://docs.google.com/document/d/1upNr6lneB2uzCoQ12_aa1CMg1W8p2NBFb6xmP7i4-z4/edit?usp=sharing +- No to the copy/paste app (not local first) + +## End Time +- When: + - 10/23/2022 at 2:00PM diff --git a/admin/meetings/102622-checkin3.md b/admin/meetings/102622-checkin3.md index 7ca56ef..ae63c62 100644 --- a/admin/meetings/102622-checkin3.md +++ b/admin/meetings/102622-checkin3.md @@ -1,44 +1,44 @@ -# Meeting Minutes (10/26/2022) -## Team 29: Hackers1995 -## Meeting Topic: Weekly Check-In Meeting -This is our third weekly meeting with Gagan. - -## Attendance -TA. Gagan Gopalaiah -1. Rhea Bhutada -2. George Dubinin -3. Sanjit Joseph -4. Arthur Lu -5. Gavyn Ezell - -## Meeting Details -- When: 10/26/2022 at 3:00 PM -- Where: Zoom (Gagan's Zoom room: https://ucsd.zoom.us/j/5177090642) - -## Agenda: -- ### Present our ideas to Gagan - - All ideas seem to be doable - - Consider a few tweaks to "CRUDify" apps - - Gagan is partial to food review app idea, but any of them can work - - -- ### Tips for projects - - SOCIAL MEDIA ORGANIZER: avoid API integration if possible/only make it a small part, not a main feature - - RESUME BUILDER: try to "CRUDify" it more if we're going for this - -- ### Standups - - Once per 2 days, 3 in worst case - - Perhaps make a separate slack channel for these to avoid clutter - -## Moving forward: -- ### BY FRIDAY: - - Try and meet tomorrow (10/27) to make a final decision - - Let Gagan know what we've decided on - - Complete project pitch assignment - need to present to Gagan tomorrow 10/27, due on canvas 11/1 - -- ### OVER WEEKEND: - - (If possible) Start on CI/CD pipeline (basic js app/unit tests, use Github actions to set up) - - -## End Time -- 10/26/2022 at 4:00 PM +# Meeting Minutes (10/26/2022) +## Team 29: Hackers1995 +## Meeting Topic: Weekly Check-In Meeting +This is our third weekly meeting with Gagan. + +## Attendance +TA. Gagan Gopalaiah +1. Rhea Bhutada +2. George Dubinin +3. Sanjit Joseph +4. Arthur Lu +5. Gavyn Ezell + +## Meeting Details +- When: 10/26/2022 at 3:00 PM +- Where: Zoom (Gagan's Zoom room: https://ucsd.zoom.us/j/5177090642) + +## Agenda: +- ### Present our ideas to Gagan + - All ideas seem to be doable + - Consider a few tweaks to "CRUDify" apps + - Gagan is partial to food review app idea, but any of them can work + + +- ### Tips for projects + - SOCIAL MEDIA ORGANIZER: avoid API integration if possible/only make it a small part, not a main feature + - RESUME BUILDER: try to "CRUDify" it more if we're going for this + +- ### Standups + - Once per 2 days, 3 in worst case + - Perhaps make a separate slack channel for these to avoid clutter + +## Moving forward: +- ### BY FRIDAY: + - Try and meet tomorrow (10/27) to make a final decision + - Let Gagan know what we've decided on + - Complete project pitch assignment - need to present to Gagan tomorrow 10/27, due on canvas 11/1 + +- ### OVER WEEKEND: + - (If possible) Start on CI/CD pipeline (basic js app/unit tests, use Github actions to set up) + + +## End Time +- 10/26/2022 at 4:00 PM diff --git a/admin/meetings/102722-final_decision.md b/admin/meetings/102722-final_decision.md index 081fe08..cf9ec04 100644 --- a/admin/meetings/102722-final_decision.md +++ b/admin/meetings/102722-final_decision.md @@ -1,60 +1,60 @@ -# Meeting Minutes (10/27/2022) -## Team 29: Hackers1995 -## Meeting Topic: Final Project Decision -We're figuring out what project we're going to do, and figure out what we need for the starting pitch. - -## Attendance -1. Rhea Bhutada -2. Sanjit Joseph -3. Arthur Lu -4. Henry Feng -5. Marc Reta -6. Kara Hoagland -7. Daniel Hernandez -8. Gavyn Ezell -9. Isaac Otero - -## Meeting Details -- When: 10/27/2022 at 5:00 PM -- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) - -## Agenda: -- ### Decide which project we're doing - - Gagan seemed to like the food review app idea best in their current states - - We all seem to agree that the food review app is acceptable - - Made a couple clarifications, no major changes or objections to the app - -- ### Start project pitch - - Created google slides: **https://docs.google.com/presentation/d/1_XWihJGVChFtYS38RnYJtQUuFKsgvewOCOkdeMHFRg4/edit?usp=sharing** - - Prof recommends skimming the book: **https://basecamp.com/shapeup** (esp. ch.5 on risks and rabbit holes) - - Finishing Risks + Rabbit holes here in the meeting - - Kara posted a design prototype in Slack: https://cse110fall2022.slack.com/archives/C04598WA7P1/p1666918573779859 - -- ### App Description - - Renaming it to a "Food Diary" app, not limited to UCSD - - Allows users to store info about recent foods, restaurant name, location, price, your rating etc. - - Probably provides food suggestions based on where you've eaten (and liked) before - - We're not going to try anything with external data atm. - - -## Moving forward: -- ### BY TOMORROW: - - FINISH PITCH SLIDES - - MUST CHANGE DIAGRAM TO ALL RESTAURANTS (Isaac will change this) - - Daniel will update the pitch slides by adding images/graphics. - - Daniel + Sanjit are doing visual representation. - - Gayvn is doing potential competitors - - Henry, Sanjit, Kara are doing user personas - - Rhea is doing statement + purpose - - Arthur + Marc are doing "why it's a CRUD app" - - - See if we can have a short meeting tomorrow before meeting Gagan just to review our pitch. - - Put all components in specs folder before pitch - - Meet at 2:30? Meeting with Gagan is probably at 3:30 - -- ### LATER: - - Have some people split off and work on the basic UI design. Technically Sanjit had the 'art role' according to the TA but not sure what that entails. More ppl would def be helpful. TBD who else is helping - - -## End Time -- 10/27/2022 at 6:15 PM +# Meeting Minutes (10/27/2022) +## Team 29: Hackers1995 +## Meeting Topic: Final Project Decision +We're figuring out what project we're going to do, and figure out what we need for the starting pitch. + +## Attendance +1. Rhea Bhutada +2. Sanjit Joseph +3. Arthur Lu +4. Henry Feng +5. Marc Reta +6. Kara Hoagland +7. Daniel Hernandez +8. Gavyn Ezell +9. Isaac Otero + +## Meeting Details +- When: 10/27/2022 at 5:00 PM +- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) + +## Agenda: +- ### Decide which project we're doing + - Gagan seemed to like the food review app idea best in their current states + - We all seem to agree that the food review app is acceptable + - Made a couple clarifications, no major changes or objections to the app + +- ### Start project pitch + - Created google slides: **https://docs.google.com/presentation/d/1_XWihJGVChFtYS38RnYJtQUuFKsgvewOCOkdeMHFRg4/edit?usp=sharing** + - Prof recommends skimming the book: **https://basecamp.com/shapeup** (esp. ch.5 on risks and rabbit holes) + - Finishing Risks + Rabbit holes here in the meeting + - Kara posted a design prototype in Slack: https://cse110fall2022.slack.com/archives/C04598WA7P1/p1666918573779859 + +- ### App Description + - Renaming it to a "Food Diary" app, not limited to UCSD + - Allows users to store info about recent foods, restaurant name, location, price, your rating etc. + - Probably provides food suggestions based on where you've eaten (and liked) before + - We're not going to try anything with external data atm. + + +## Moving forward: +- ### BY TOMORROW: + - FINISH PITCH SLIDES + - MUST CHANGE DIAGRAM TO ALL RESTAURANTS (Isaac will change this) + - Daniel will update the pitch slides by adding images/graphics. + - Daniel + Sanjit are doing visual representation. + - Gayvn is doing potential competitors + - Henry, Sanjit, Kara are doing user personas + - Rhea is doing statement + purpose + - Arthur + Marc are doing "why it's a CRUD app" + + - See if we can have a short meeting tomorrow before meeting Gagan just to review our pitch. + - Put all components in specs folder before pitch + - Meet at 2:30? Meeting with Gagan is probably at 3:30 + +- ### LATER: + - Have some people split off and work on the basic UI design. Technically Sanjit had the 'art role' according to the TA but not sure what that entails. More ppl would def be helpful. TBD who else is helping + + +## End Time +- 10/27/2022 at 6:15 PM diff --git a/admin/meetings/102822-project_pitch.md b/admin/meetings/102822-project_pitch.md index f75e893..d67e1ae 100644 --- a/admin/meetings/102822-project_pitch.md +++ b/admin/meetings/102822-project_pitch.md @@ -1,24 +1,24 @@ -# Meeting Minutes (10/28/2022) -## Team 29: Hackers1995 -## Meeting Topic: Project Pitch -We finished up the project pitch docs and presenting them to Gagan. - -Google slides: **https://docs.google.com/presentation/d/1_XWihJGVChFtYS38RnYJtQUuFKsgvewOCOkdeMHFRg4/edit?usp=sharing** - -## Meeting Details -- When: 10/28/2022 at 2:30 PM -- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) - -## Agenda: -- ### Finish Project Pitch documents - - Finished user stories/diagrams and uploaded to github - - Went over presentation before showing TA - - Presented project to Gagan - - **Overall reaction - he liked our app! More feedback to come, but we can feel free to start some basic work.** - -## Moving forward: -- I think we need to upload our project pitch to canvas by 11/1 -- Start on the really basic stuff as discussed in lecture (hello world for CI/CD setup, etc) - -## End Time -- 10/28/2022 at 4:00 PM +# Meeting Minutes (10/28/2022) +## Team 29: Hackers1995 +## Meeting Topic: Project Pitch +We finished up the project pitch docs and presenting them to Gagan. + +Google slides: **https://docs.google.com/presentation/d/1_XWihJGVChFtYS38RnYJtQUuFKsgvewOCOkdeMHFRg4/edit?usp=sharing** + +## Meeting Details +- When: 10/28/2022 at 2:30 PM +- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) + +## Agenda: +- ### Finish Project Pitch documents + - Finished user stories/diagrams and uploaded to github + - Went over presentation before showing TA + - Presented project to Gagan + - **Overall reaction - he liked our app! More feedback to come, but we can feel free to start some basic work.** + +## Moving forward: +- I think we need to upload our project pitch to canvas by 11/1 +- Start on the really basic stuff as discussed in lecture (hello world for CI/CD setup, etc) + +## End Time +- 10/28/2022 at 4:00 PM diff --git a/admin/meetings/110122-meeting.md b/admin/meetings/110122-meeting.md index 888e365..92e5186 100644 --- a/admin/meetings/110122-meeting.md +++ b/admin/meetings/110122-meeting.md @@ -1,41 +1,41 @@ -# Meeting Minutes (11/01/2022) -## Team 29: Hackers1995 -## Meeting Topic: Work going forward -We're trying to figure out what our goals are for the project and how to get started. - -## Meeting Details -- When: 11/01/2022 at 7:00 PM -- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) - -## Attendance - 1. Rhea - 2. Gavyn - 3. Isaac - 4. Kara - 5. Marc - 6. Henry - 7. Daniel - 8. Sanjit - -## Notes: - - Gagan suggests we have a feature backlog and pull stuff from that - - Using Github Issues for our feature backlog - - - Perhaps integrate TTS from Lab5 into something (pick a random restaurant while driving, etc) - - - Created figma sketch for app design, uploaded to github and google slides - -## Moving forward: -- ### BY TONIGHT: - - We'll submit our pitch files -- ### LATER: - - Sanjit will upload a basic hello world program in order to test deployment/github actions - - Arthur will start figuring out how to configure github actions - -- ### PREFERENCES: - - BACKEND: Henry, Gavyn, Kara - - FRONTEND: Isaac - - NO PREFERENCE: Daniel, Marc, Rhea, Sanjit - -## End Time -- 11/01/2022 at 9:00 PM +# Meeting Minutes (11/01/2022) +## Team 29: Hackers1995 +## Meeting Topic: Work going forward +We're trying to figure out what our goals are for the project and how to get started. + +## Meeting Details +- When: 11/01/2022 at 7:00 PM +- Where: Zoom (Rhea's Zoom room: https://ucsd.zoom.us/j/8054288343) + +## Attendance + 1. Rhea + 2. Gavyn + 3. Isaac + 4. Kara + 5. Marc + 6. Henry + 7. Daniel + 8. Sanjit + +## Notes: + - Gagan suggests we have a feature backlog and pull stuff from that + - Using Github Issues for our feature backlog + + - Perhaps integrate TTS from Lab5 into something (pick a random restaurant while driving, etc) + + - Created figma sketch for app design, uploaded to github and google slides + +## Moving forward: +- ### BY TONIGHT: + - We'll submit our pitch files +- ### LATER: + - Sanjit will upload a basic hello world program in order to test deployment/github actions + - Arthur will start figuring out how to configure github actions + +- ### PREFERENCES: + - BACKEND: Henry, Gavyn, Kara + - FRONTEND: Isaac + - NO PREFERENCE: Daniel, Marc, Rhea, Sanjit + +## End Time +- 11/01/2022 at 9:00 PM diff --git a/admin/meetings/110222-checkin4.md b/admin/meetings/110222-checkin4.md index c8a820c..ab7b1c0 100644 --- a/admin/meetings/110222-checkin4.md +++ b/admin/meetings/110222-checkin4.md @@ -1,34 +1,34 @@ -# Meeting Minutes (11/02/2022) -## Team 29: Hackers1995 -## Meeting Topic: Weekly TA Catchup with Gagan -We are meeting with Gagan to discuss early phase design concepts and decisions we need to think about as we start the early coding phase. - -## Attendance -1. Rhea Bhutada -2. George Dubinin -3. Gagan Gopalaiah - -## Meeting Details -- When: 11/02/2022 at 3:30PM -- Where: Zoom - -## Agenda: - -## Discussion Points by Gagan - - Now that we finished designs stage there are 2 approaches - - The first is to just start coding without thinking about design (cowboy coding). It works but can get bumpy down the road - - The second is to look at the project from a birds eye view and break it down into milestones and tasks. First break it down into weeks and then decide on what to do each day of the week. This will make it easier to keep things organized. - - Jira and GitHub issues will be super helpful. Jira is a more expensive option so instead prof recommends creating issues. - - Start thinking about storage options. Think local first and decide on options like: - - locally stored json files - - browser local storage - - "real" database like IndexDB - - Think about different models to keep track of changes and versions. Consider the branching model (one central repository and everyone has a branch or one breanch per feature) and the forking model (the central repository is copied and developers work in these copies and push changes to their own copies before syncing to the central repo). Useful info here: https://www.flagship.io/git-branching-strategies/ - - Think about how pull requests will be approved and create a system for PR review and suggests. - - Break down the project and decide on which tasks to be completed. Then decide on how long sprints will last and how tasks will be assigned. - - We need to create the ADR and place it in the brainstorming section of the repo. This will contain details about specific project decisions that we made like database decisions (for example). - -## End Time -- 11/02/2022 at 4:00PM - - +# Meeting Minutes (11/02/2022) +## Team 29: Hackers1995 +## Meeting Topic: Weekly TA Catchup with Gagan +We are meeting with Gagan to discuss early phase design concepts and decisions we need to think about as we start the early coding phase. + +## Attendance +1. Rhea Bhutada +2. George Dubinin +3. Gagan Gopalaiah + +## Meeting Details +- When: 11/02/2022 at 3:30PM +- Where: Zoom + +## Agenda: + +## Discussion Points by Gagan + - Now that we finished designs stage there are 2 approaches + - The first is to just start coding without thinking about design (cowboy coding). It works but can get bumpy down the road + - The second is to look at the project from a birds eye view and break it down into milestones and tasks. First break it down into weeks and then decide on what to do each day of the week. This will make it easier to keep things organized. + - Jira and GitHub issues will be super helpful. Jira is a more expensive option so instead prof recommends creating issues. + - Start thinking about storage options. Think local first and decide on options like: + - locally stored json files + - browser local storage + - "real" database like IndexDB + - Think about different models to keep track of changes and versions. Consider the branching model (one central repository and everyone has a branch or one breanch per feature) and the forking model (the central repository is copied and developers work in these copies and push changes to their own copies before syncing to the central repo). Useful info here: https://www.flagship.io/git-branching-strategies/ + - Think about how pull requests will be approved and create a system for PR review and suggests. + - Break down the project and decide on which tasks to be completed. Then decide on how long sprints will last and how tasks will be assigned. + - We need to create the ADR and place it in the brainstorming section of the repo. This will contain details about specific project decisions that we made like database decisions (for example). + +## End Time +- 11/02/2022 at 4:00PM + + diff --git a/admin/meetings/110722-sprint1.md b/admin/meetings/110722-sprint1.md index 264f428..93e96fc 100644 --- a/admin/meetings/110722-sprint1.md +++ b/admin/meetings/110722-sprint1.md @@ -1,41 +1,41 @@ -# Meeting Minutes (11/07/2022) -## Team 29: Hackers1995 -## Meeting Topic: First Sprint -Meeting notes for the first sprint - -## Attendance -1. Rhea Bhutada -2. George Dubinin -3. Gavyn Ezell -4. Henry Feng -5. Kara Hoagland -6. Marc Reta -7. Sanjit Joseph -8. Daniel Hernandez -9. Arthur Lu - -## Absentees -1. Isaac Otero - -## Meeting Details -- When: 11/07/2022 at 6:00PM -- Where: CSE Building Second Floor - -## Agenda: -- ### Old/Unresolved Business - - N/A -- ### New Business - - The first sprint: - - Create more Gitflows and automation. Verify current workflows and actions - - Determine interface details for the app (user experience) - - Start on the backend -- ### Next Meeting's Business - -## Decisions Made -- Linting details decided (TABS NOT SPACES) - -## End Time -- 11/07/2022 at 8:00PM - - - +# Meeting Minutes (11/07/2022) +## Team 29: Hackers1995 +## Meeting Topic: First Sprint +Meeting notes for the first sprint + +## Attendance +1. Rhea Bhutada +2. George Dubinin +3. Gavyn Ezell +4. Henry Feng +5. Kara Hoagland +6. Marc Reta +7. Sanjit Joseph +8. Daniel Hernandez +9. Arthur Lu + +## Absentees +1. Isaac Otero + +## Meeting Details +- When: 11/07/2022 at 6:00PM +- Where: CSE Building Second Floor + +## Agenda: +- ### Old/Unresolved Business + - N/A +- ### New Business + - The first sprint: + - Create more Gitflows and automation. Verify current workflows and actions + - Determine interface details for the app (user experience) + - Start on the backend +- ### Next Meeting's Business + +## Decisions Made +- Linting details decided (TABS NOT SPACES) + +## End Time +- 11/07/2022 at 8:00PM + + + diff --git a/admin/meetings/110922-checkin5.md b/admin/meetings/110922-checkin5.md index 59077bc..764192c 100644 --- a/admin/meetings/110922-checkin5.md +++ b/admin/meetings/110922-checkin5.md @@ -1,36 +1,36 @@ -# Meeting Minutes (11/09/2022) -## Team 29: Hackers1995 -## Meeting Topic: Weekly TA Catchup with Gagan -We are meeting with Gagan to discuss progress made on Sprint 1 and testing strategies that we need to keep in mind as we continue developing. - -## Attendance -1. Rhea Bhutada -2. George Dubinin -3. Gagan Gopalaiah -4. Sanjit Joseph - -## Meeting Details -- When: 11/09/2022 at 3:30PM -- Where: Zoom - -## Agenda: - -## Discussion Points by Gagan -- Provided updates on first sprint -- Testing Tips - - functionality testing - - test one feature - - test individual functions - - static testing - - checking if its meeting the conventions and standards for specific programming language - - linting - - specific to programming language - - overall - - if tested properly, we reduce problems end-to-end testing -- Documentation - - What the code does? - - What the file is for? - - JS Docs - -## End Time -- 11/09/2022 at 4:00PM +# Meeting Minutes (11/09/2022) +## Team 29: Hackers1995 +## Meeting Topic: Weekly TA Catchup with Gagan +We are meeting with Gagan to discuss progress made on Sprint 1 and testing strategies that we need to keep in mind as we continue developing. + +## Attendance +1. Rhea Bhutada +2. George Dubinin +3. Gagan Gopalaiah +4. Sanjit Joseph + +## Meeting Details +- When: 11/09/2022 at 3:30PM +- Where: Zoom + +## Agenda: + +## Discussion Points by Gagan +- Provided updates on first sprint +- Testing Tips + - functionality testing + - test one feature + - test individual functions + - static testing + - checking if its meeting the conventions and standards for specific programming language + - linting + - specific to programming language + - overall + - if tested properly, we reduce problems end-to-end testing +- Documentation + - What the code does? + - What the file is for? + - JS Docs + +## End Time +- 11/09/2022 at 4:00PM diff --git a/admin/meetings/111322-sprint-1-review.md b/admin/meetings/111322-sprint-1-review.md index 018a026..b1823b6 100644 --- a/admin/meetings/111322-sprint-1-review.md +++ b/admin/meetings/111322-sprint-1-review.md @@ -1,6 +1,7 @@ # Sprint 1 Review Meeting Minutes (11/13/2022) ## Team 29: Hackers1995 ## Meeting Topic: Sprint 1 Review +We are meeting with Gagan to discuss progress made on Sprint 1 and testing strategies that we need to keep in mind as we continue developing. ## Attendance 1. Rhea Bhutada diff --git a/admin/meetings/11822-sprint1day2.md b/admin/meetings/11822-sprint1day2.md new file mode 100644 index 0000000..d620fb3 --- /dev/null +++ b/admin/meetings/11822-sprint1day2.md @@ -0,0 +1,39 @@ +# Meeting Minutes (11/08/2022) +## Team 29: Hackers1995 +## Meeting Topic: In-Person First Sprint Day 2 +Meeting notes for the first sprint + +## Attendance +1. Rhea Bhutada +2. George Dubinin +3. Gavyn Ezell +4. Kara Hoagland +5. Sanjit Joseph +6. Daniel Hernandez + +## Meeting Details +- When: 11/08/2022 at 2:00PM +- Where: Mike's Red Tacos + +## Agenda: +- ### Old/Unresolved Business + - N/A +- ### New Business + - Isaac now knows what Wolftown is + - Pair programming setup with VSCode +- ### Next Meeting's Business + +## App Progress +- The landing page is closer +- Review card css file entered +- Review Card javascript logic implemented (thanks Gavin) +- + +## Decisions Made +- Linting details decided (TABS NOT SPACES) + +## End Time +- 11/07/2022 at 8:00PM + + + diff --git a/admin/misc/rules.md b/admin/misc/rules.md index 4bdb7c9..204bacd 100644 --- a/admin/misc/rules.md +++ b/admin/misc/rules.md @@ -1,57 +1,57 @@ -# Team Working Agreement -## Term: Fall 2022 -## Creation: 10/12/2022; Revised: N/A -## Group Identification - - Team 29 - - TA: Gagan Gopalaiah - - Instructor: Professor Thomas Powell - - Team Name: Hackers1995 - -## Team member info (name/email) - 1. Rhea Bhutada, rbhutada@ucsd.edu - 2. George Dubinin, gdubinin@ucsd.edu - 3. Gavyn Ezell, gezell@ucsd.edu - 4. Henry Feng, hefeng@ucsd.edu - 5. Kara Hoagland, khoaglan@ucsd.edu - 6. Marc Reta, mreta@ucsd.edu - 7. Sanjit Joseph, smjoseph@ucsd.edu - 8. Isaac Otero, irotero@ucsd.edu - 9. Arthur Lu, a8lu@ucsd.edu - 10. Daniel Hernandez, d7hernan@ucsd.edu - -## RULES: -#### 1) Primary Means of Communication and Expectations -- All members will communicate via Slack. -- All members will be expected to read messages from group chats and direct messages, and respond in no more than 4 hours and no later than 10PM. -- All pull requests require 3 people to review the code being pushed to main. - -#### 2) Scheduling Meetings (Schedule at least one meeting as part of constructing your team agreement.) -- Members are expected to meet at least once a week with the group either in-person or on Zoom. Future meeting details will be determined within a 24 hours window. -- Team members hosting the meeting will send out a reminder of the meeting with an agenda 2 hours before the meeting. - -#### 3) General Responsibilities for All Team Members - -- Respect the contributions of others. -- Work on assignments early to allow others to review and debug any issues. -- Communicate any issues or problems as early as possible. -- Be open to criticism. - -#### 4) Specific Team Member Responsibilities/Deadlines (Optional) - -- A daily standup is required every day from every team member. A daily standup includes what you've completed, what you want to work on, and what issues you encountered for the day. If you haven't done anything for that day, write down what you will be contributing. - -#### 5) Conflict Resolution - -- Conflicts between individuals will first try to be resolved amongst the people involved. -- Group conflicts will be voted on. -- Ongoing conflicts will be reported to the TA. -- Unprofessionalism of any kind will not be tolerated. Conflicts involving this will immediately be brought up with the TA - -#### 6) Expectations of Faculty and GTA’s - -- If a team member fails to live up to this agreement, the situation may be reported to the staff, but the team will still be responsible for submitting a completed assignment. Staff will be available to meet with teams to resolve issues. - -## Team Signatures - -#### Print Name: -#### Signature: +# Team Working Agreement +## Term: Fall 2022 +## Creation: 10/12/2022; Revised: N/A +## Group Identification + - Team 29 + - TA: Gagan Gopalaiah + - Instructor: Professor Thomas Powell + - Team Name: Hackers1995 + +## Team member info (name/email) + 1. Rhea Bhutada, rbhutada@ucsd.edu + 2. George Dubinin, gdubinin@ucsd.edu + 3. Gavyn Ezell, gezell@ucsd.edu + 4. Henry Feng, hefeng@ucsd.edu + 5. Kara Hoagland, khoaglan@ucsd.edu + 6. Marc Reta, mreta@ucsd.edu + 7. Sanjit Joseph, smjoseph@ucsd.edu + 8. Isaac Otero, irotero@ucsd.edu + 9. Arthur Lu, a8lu@ucsd.edu + 10. Daniel Hernandez, d7hernan@ucsd.edu + +## RULES: +#### 1) Primary Means of Communication and Expectations +- All members will communicate via Slack. +- All members will be expected to read messages from group chats and direct messages, and respond in no more than 4 hours and no later than 10PM. +- All pull requests require 3 people to review the code being pushed to main. + +#### 2) Scheduling Meetings (Schedule at least one meeting as part of constructing your team agreement.) +- Members are expected to meet at least once a week with the group either in-person or on Zoom. Future meeting details will be determined within a 24 hours window. +- Team members hosting the meeting will send out a reminder of the meeting with an agenda 2 hours before the meeting. + +#### 3) General Responsibilities for All Team Members + +- Respect the contributions of others. +- Work on assignments early to allow others to review and debug any issues. +- Communicate any issues or problems as early as possible. +- Be open to criticism. + +#### 4) Specific Team Member Responsibilities/Deadlines (Optional) + +- A daily standup is required every day from every team member. A daily standup includes what you've completed, what you want to work on, and what issues you encountered for the day. If you haven't done anything for that day, write down what you will be contributing. + +#### 5) Conflict Resolution + +- Conflicts between individuals will first try to be resolved amongst the people involved. +- Group conflicts will be voted on. +- Ongoing conflicts will be reported to the TA. +- Unprofessionalism of any kind will not be tolerated. Conflicts involving this will immediately be brought up with the TA + +#### 6) Expectations of Faculty and GTA’s + +- If a team member fails to live up to this agreement, the situation may be reported to the staff, but the team will still be responsible for submitting a completed assignment. Staff will be available to meet with teams to resolve issues. + +## Team Signatures + +#### Print Name: +#### Signature: diff --git a/admin/team.md b/admin/team.md index 239164e..de75ace 100644 --- a/admin/team.md +++ b/admin/team.md @@ -1,73 +1,73 @@ -# **Hackers1995** - -## **Brand** -![poster](./branding/teamposter.jpg) - -## **Values** -- Openness -- Honesty -- Respect -- Integrity -- Diversity/Inclusion - -## **Roster** -### **TA: Gagan Gopalaiah** - - -### **Team Lead: Rhea Bhutada** -- #### About Me: - - My name is Rhea Bhutada and I am currently a CS major and CogSci minor at ERC. The intersection between neuroscience and computer science really fascinates me and I generally try to apply myself to projects that deal with the overlap of both of these fields. This year I'm working as an undergraduate researcher at the Swartz Center for Computational Neuroscience, which has been an extremely cool experience. Other than that I love to stay active. I used to play basketball in high school and was in an NCAA commercial with Shaq. But lately, I’ve been really into running. Overall, I'm excited to contribute to this project! Although I haven't had too much industry experience, I am interested to see how I can apply my previous course work to backend or frontend design. -- #### Link to Github: https://github.com/rheabhutada02 - - -### **Team Lead: George Dubinin** -- #### About Me: - - Hello World! I'm a fifth year (3rd year transfer) computer science major from the North Bay Area. Web development has been a big focus of mine since taking Prof Powell's 134B last winter and I'm stoked to be back in the "full stack" developer seat for 110. I am the second the team lead and in addition to my love for leading and working on team projects I am also fascinated by web development technologies including containerization, infrastructure as code (IaC), software as a service (SAAS), and web-based encryption (security). I am also an avid DJ and the traininer manmager for the DJ club on campus. This quarter is shaping up to be a memorable one! -- #### Link to Github: https://github.com/look-its-ashton - - -### **Gavyn Ezell** -- #### About Me: - - My name is Gavyn Ezell and I’m from Hawaii. Currently a 3rd year CS Major at Muir. I love video games, playing piano, and going to the gym. For SWE, backend interests me most (I am not good with design and visuals), and I’m hoping to learn a lot more backend from this project! -- #### Link to Github: https://github.com/gavyn-ezell - - -### **Daniel Hernandez** -- #### About Me: - - My name is Daniel Hernandez and I am a 3rd year Computer Science major and music minor. Some of my interests in the CS field are ML, AI, and Cybersecurity. Outside of school, I play drums for a local band. For SE, the backend aspect appeals to me the most since I am able to utilize more of what I learned from my past classes. However, I would want to try frontend since I do enjoy design to some extent. -- #### Link to Github: https://github.com/d7hernan - - -### **Henry Feng** -- #### About Me: - - My name is Henry, and I am a 3rd year CS major. I was born in China and grew up in New Zealand. I wrote my first line of code, in Python during my second year of high school. My favourite foods are ramen, steak and pasta. Some of my hobbies include playing guitar, hiking, cooking, video games, and music (from the Persona series). I am excited to start this project and hope to contribute to both frontend and backend. -- #### Link to Github: https://github.com/dusk-moon - - -### **Kara Hoagland** -- #### About Me: - - My name is Kara Hoagland and I am a 3rd year Computer Engineering major. CS-wise, I'm interested in topics such as computer vision and RFID, but it's hard to limit oneself because there's so many interesting topics out there. Outside of CS, I enjoy D&D, biking, and reading. I got some industry experience over summer and love getting to see how that experience and my previous classes all apply to this project. I'm interested in full stack but more so the backend of things. -- #### Link to Github: https://github.com/KH-Cl - - -### **Marc Reta** -- #### About Me: My name is Marc Reta and I am a 3rd year Computer Engineering major in Warren College. I love exploring San Diego and going on adventures. I have a huge interest in Public Transportation. I'm looking foward to working with everyone in my group and learn how to create an application. -- #### Link to Github: https://github.com/Graydogminer - - -### **Sanjit Joseph** -- #### About Me: - - Hi! My name is Sanjit Joseph and I'm a 3rd year CE major at Sixth. I'm from the Bay Area, so I've been surrounded by technology most of my life. I'm into building computers and I waste a lot of time (and money) messing with my PC and playing video games on it. I enjoy things outside of tech, though--as an Eagle Scout, I've done tons of backpacking throughout California and the US. I also hold a black belt in Shotokan Karate. As for this class, I'm pretty excited about all the different aspects of software engineering; frontend and backend both appeal to me, but I'm really just excited to work on a long class project in a team setting. -- #### Link to Github: https://github.com/sm-joseph - - -### **Isaac Otero** -- #### About Me: - - My name is Isaac Otero, I am a 5th year Cog Sci major. I am interested in front end development. I want to implement what I’ve learned from my design classes into my projects for front end development. -- #### Link to Github: https://github.com/Isaac-Otero - - -### **Arthur Lu** -- #### About Me: - - My name is Arthur Lu and I am a 3rd year CE major. I am primarily interested in low level systems design, hardware development and optimization, and HPC architecture. I work as an undergraduate research assistant for Prof. Turakhia developing hardware accelerators for long length genome alignment. When I’m not busy, I like to relax with some retro video games. -- #### Link to Github: https://github.com/ltcptgeneral +# **Hackers1995** + +## **Brand** +![poster](./branding/teamposter.jpg) + +## **Values** +- Openness +- Honesty +- Respect +- Integrity +- Diversity/Inclusion + +## **Roster** +### **TA: Gagan Gopalaiah** + + +### **Team Lead: Rhea Bhutada** +- #### About Me: + - My name is Rhea Bhutada and I am currently a CS major and CogSci minor at ERC. The intersection between neuroscience and computer science really fascinates me and I generally try to apply myself to projects that deal with the overlap of both of these fields. This year I'm working as an undergraduate researcher at the Swartz Center for Computational Neuroscience, which has been an extremely cool experience. Other than that I love to stay active. I used to play basketball in high school and was in an NCAA commercial with Shaq. But lately, I’ve been really into running. Overall, I'm excited to contribute to this project! Although I haven't had too much industry experience, I am interested to see how I can apply my previous course work to backend or frontend design. +- #### Link to Github: https://github.com/rheabhutada02 + + +### **Team Lead: George Dubinin** +- #### About Me: + - Hello World! I'm a fifth year (3rd year transfer) computer science major from the North Bay Area. Web development has been a big focus of mine since taking Prof Powell's 134B last winter and I'm stoked to be back in the "full stack" developer seat for 110. I am the second the team lead and in addition to my love for leading and working on team projects I am also fascinated by web development technologies including containerization, infrastructure as code (IaC), software as a service (SAAS), and web-based encryption (security). I am also an avid DJ and the traininer manmager for the DJ club on campus. This quarter is shaping up to be a memorable one! +- #### Link to Github: https://github.com/look-its-ashton + + +### **Gavyn Ezell** +- #### About Me: + - My name is Gavyn Ezell and I’m from Hawaii. Currently a 3rd year CS Major at Muir. I love video games, playing piano, and going to the gym. For SWE, backend interests me most (I am not good with design and visuals), and I’m hoping to learn a lot more backend from this project! +- #### Link to Github: https://github.com/gavyn-ezell + + +### **Daniel Hernandez** +- #### About Me: + - My name is Daniel Hernandez and I am a 3rd year Computer Science major and music minor. Some of my interests in the CS field are ML, AI, and Cybersecurity. Outside of school, I play drums for a local band. For SE, the backend aspect appeals to me the most since I am able to utilize more of what I learned from my past classes. However, I would want to try frontend since I do enjoy design to some extent. +- #### Link to Github: https://github.com/d7hernan + + +### **Henry Feng** +- #### About Me: + - My name is Henry, and I am a 3rd year CS major. I was born in China and grew up in New Zealand. I wrote my first line of code, in Python during my second year of high school. My favourite foods are ramen, steak and pasta. Some of my hobbies include playing guitar, hiking, cooking, video games, and music (from the Persona series). I am excited to start this project and hope to contribute to both frontend and backend. +- #### Link to Github: https://github.com/dusk-moon + + +### **Kara Hoagland** +- #### About Me: + - My name is Kara Hoagland and I am a 3rd year Computer Engineering major. CS-wise, I'm interested in topics such as computer vision and RFID, but it's hard to limit oneself because there's so many interesting topics out there. Outside of CS, I enjoy D&D, biking, and reading. I got some industry experience over summer and love getting to see how that experience and my previous classes all apply to this project. I'm interested in full stack but more so the backend of things. +- #### Link to Github: https://github.com/KH-Cl + + +### **Marc Reta** +- #### About Me: My name is Marc Reta and I am a 3rd year Computer Engineering major in Warren College. I love exploring San Diego and going on adventures. I have a huge interest in Public Transportation. I'm looking foward to working with everyone in my group and learn how to create an application. +- #### Link to Github: https://github.com/Graydogminer + + +### **Sanjit Joseph** +- #### About Me: + - Hi! My name is Sanjit Joseph and I'm a 3rd year CE major at Sixth. I'm from the Bay Area, so I've been surrounded by technology most of my life. I'm into building computers and I waste a lot of time (and money) messing with my PC and playing video games on it. I enjoy things outside of tech, though--as an Eagle Scout, I've done tons of backpacking throughout California and the US. I also hold a black belt in Shotokan Karate. As for this class, I'm pretty excited about all the different aspects of software engineering; frontend and backend both appeal to me, but I'm really just excited to work on a long class project in a team setting. +- #### Link to Github: https://github.com/sm-joseph + + +### **Isaac Otero** +- #### About Me: + - My name is Isaac Otero, I am a 5th year Cog Sci major. I am interested in front end development. I want to implement what I’ve learned from my design classes into my projects for front end development. +- #### Link to Github: https://github.com/Isaac-Otero + + +### **Arthur Lu** +- #### About Me: + - My name is Arthur Lu and I am a 3rd year CE major. I am primarily interested in low level systems design, hardware development and optimization, and HPC architecture. I work as an undergraduate research assistant for Prof. Turakhia developing hardware accelerators for long length genome alignment. When I’m not busy, I like to relax with some retro video games. +- #### Link to Github: https://github.com/ltcptgeneral diff --git a/package.json b/package.json index 35eb5a3..bd8a69c 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,20 @@ { "name": "food-journal", "version": "1.0.0", + "type": "module", "scripts": { - "test": "mocha --recursive './{,!(node_modules)/**}/*.test.js'", + "test": "mocha --recursive --require mock-local-storage './{,!(node_modules)/**}/*.test.js'", "lint": "eslint '**/*.js'", - "fix-style": "eslint --fix **/*.js" + "fix-style": "eslint --fix **/*.js", + "lintHTML": "htmlhint '**/*.html'", + "lintCSS": "stylelint '**/*.css'" }, "devDependencies": { "eslint": "^8.27.0", - "mocha": "10" + "htmlhint": "1.1.4", + "mocha": "10", + "mock-local-storage": "^1.1.23", + "stylelint": "14.14.1", + "stylelint-config-standard": "^29.0.0" } } diff --git a/source/CreatePage.html b/source/CreatePage.html new file mode 100644 index 0000000..64dfe78 --- /dev/null +++ b/source/CreatePage.html @@ -0,0 +1,77 @@ + + + + + + + + Food Journal + + + + + + + + + + + + + + +
+
+ Pic: + + +
+
+ + Meal: + + +
+ +
+ Rating: + + + + + +
+ +
+ Other Info: + + + +
+ + +
+ + + \ No newline at end of file diff --git a/source/ReviewDetails.html b/source/ReviewDetails.html new file mode 100644 index 0000000..6c1080b --- /dev/null +++ b/source/ReviewDetails.html @@ -0,0 +1,77 @@ + + + + + + + Food Journal + + + + + + + + + + + + + +
+ + +
+ + + diff --git a/source/assets/images/1_spooky-ghost-cookies.jpeg b/source/assets/images/1_spooky-ghost-cookies.jpeg new file mode 100644 index 0000000..aa5a1ed Binary files /dev/null and b/source/assets/images/1_spooky-ghost-cookies.jpeg differ diff --git a/source/assets/images/2_frightfully-easy-ghost-cookies.jpeg b/source/assets/images/2_frightfully-easy-ghost-cookies.jpeg new file mode 100644 index 0000000..38b34e8 Binary files /dev/null and b/source/assets/images/2_frightfully-easy-ghost-cookies.jpeg differ diff --git a/source/assets/images/3_ingredient-ghost-halloween-cookies.jpeg b/source/assets/images/3_ingredient-ghost-halloween-cookies.jpeg new file mode 100644 index 0000000..2bca5e0 Binary files /dev/null and b/source/assets/images/3_ingredient-ghost-halloween-cookies.jpeg differ diff --git a/source/assets/images/icons/0-star.svg b/source/assets/images/icons/0-star.svg new file mode 100644 index 0000000..6a62bca --- /dev/null +++ b/source/assets/images/icons/0-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/1-star.svg b/source/assets/images/icons/1-star.svg new file mode 100644 index 0000000..d915bfc --- /dev/null +++ b/source/assets/images/icons/1-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/2-star.svg b/source/assets/images/icons/2-star.svg new file mode 100644 index 0000000..349146a --- /dev/null +++ b/source/assets/images/icons/2-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/3-star.svg b/source/assets/images/icons/3-star.svg new file mode 100644 index 0000000..1e414b3 --- /dev/null +++ b/source/assets/images/icons/3-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/4-star.svg b/source/assets/images/icons/4-star.svg new file mode 100644 index 0000000..c8537c9 --- /dev/null +++ b/source/assets/images/icons/4-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/5-star.svg b/source/assets/images/icons/5-star.svg new file mode 100644 index 0000000..d554b72 --- /dev/null +++ b/source/assets/images/icons/5-star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/assets/images/icons/default_plate.png b/source/assets/images/icons/default_plate.png new file mode 100644 index 0000000..dde984e Binary files /dev/null and b/source/assets/images/icons/default_plate.png differ diff --git a/source/assets/images/icons/plate_with_chopsticks.png b/source/assets/images/icons/plate_with_chopsticks.png new file mode 100644 index 0000000..023e43e Binary files /dev/null and b/source/assets/images/icons/plate_with_chopsticks.png differ diff --git a/source/assets/images/icons/plate_with_cutlery.png b/source/assets/images/icons/plate_with_cutlery.png new file mode 100644 index 0000000..6f7a938 Binary files /dev/null and b/source/assets/images/icons/plate_with_cutlery.png differ diff --git a/source/assets/scripts/ReviewCard.js b/source/assets/scripts/ReviewCard.js new file mode 100644 index 0000000..07df6a6 --- /dev/null +++ b/source/assets/scripts/ReviewCard.js @@ -0,0 +1,270 @@ +// ReviewCard.js + +class ReviewCard extends HTMLElement { + // Called once when document.createElement('review-card') is called, or + // the element is written into the DOM directly as + constructor() { + super(); + + + let shadowEl = this.attachShadow({mode:"open"}); + + let articleEl = document.createElement("article"); + + let styleEl = document.createElement("style"); + styleEl.textContent = ` + * { + font-family: sans-serif; + margin: 0; + padding: 0; + } + + a { + text-decoration: none; + } + + a:hover { + text-decoration: underline; + } + + article { + align-items: center; + border: 1px solid rgb(223, 225, 229); + border-radius: 8px; + display: grid; + grid-template-rows: 118px 56px 14px 18px 15px 36px; + height: auto; + row-gap: 5px; + padding: 0 16px 16px 16px; + width: 178px; + } + + div.rating { + align-items: center; + column-gap: 5px; + display: flex; + } + + div.rating>img { + height: auto; + display: inline-block; + object-fit: scale-down; + width: 78px; + } + + article>img { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + height: 118px; + object-fit: cover; + margin-left: -16px; + width: calc(100% + 32px); + } + + label.restaurant-name { + color: black !important; + } + + label.meal-name { + display: -webkit-box; + font-size: 16px; + height: 36px; + line-height: 18px; + overflow: hidden; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + } + + label:not(.meal-name), + span, + time { + color: #70757A; + font-size: 12px; + } + `; + articleEl.append(styleEl); + shadowEl.append(articleEl); + this.shadowEl = shadowEl; + //attach event listener to each recipe-card + this.addEventListener("click", (event) => { + console.log(event.target); + console.log(event.target.data); + //Option 1: sending current data to second html page using localStorage (could also just store index) + sessionStorage.setItem("current", JSON.stringify(event.target.data)); + window.location.assign("./ReviewDetails.html"); + /* + //Option 2: sending current data to second html page using string query w/ url (currently not storing value) + let reviewFields = window.location.search.slice(1).split("&"); + for(let i = 0; i < reviewFields.length; i++) { + let kv = reviewFields[i].split("="); + let key = kv[0]; + let value = kv[1]; + console.log(key); + console.log(value); + // What you want to do with name and value... + }*/ + }); + } + + /** + * Called when the .data property is set on this element. + * + * For Example: + * let reviewCard = document.createElement('review-card'); + * reviewCard.data = { foo: 'bar' } + * + * @param {Object} data - The data to pass into the , must be of the + * following format: + * { + * "mealImg": "string", + * "imgAlt": "string", + * "mealName": "string", + * "comments": "string", + * "rating": number, + * "restaurant": "string", + * "tags": string array + * } + */ + set data(data) { + // If nothing was passed in, return + if (!data) return; + + // Select the
we added to the Shadow DOM in the constructor + let articleEl = this.shadowEl.querySelector("article"); + + // setting the article elements for the review card + + //image setup + let mealImg = document.createElement("img"); + mealImg.setAttribute("id", "a-mealImg"); + mealImg.setAttribute("src",data["mealImg"]); + mealImg.setAttribute("alt",data["imgAlt"]); + + //meal name setup + let mealLabel = document.createElement("label"); + mealLabel.setAttribute("id", "a-mealName"); + mealLabel.setAttribute("class","meal-name"); + mealLabel.innerHTML = data["mealName"]; + + //restaurant name setup + /* + //review page link + //giving it functionality to save the review card's info to session storage for loading the review page + let reviewLink = document.createElement('a'); + reviewLink.setAttribute('href','./review.html') + reviewLink.innerHTML = 'review page' + reviewLink.addEventListener('click', () => { + sessionStorage.clear(); + let currReview = { + "imgSrc": data['imgSrc'], + "imgAlt": data['imgAlt'], + "mealName": data['mealName'], + "restaurant": data['restaurant'], + "comments": data['comments'], + "rating": data['rating'], + "tags": data['tags'] + } + sessionStorage.setItem('currReview', JSON.stringify(currReview)); + }); +*/ + let restaurantLabel = document.createElement("label"); + restaurantLabel.setAttribute("id", "a-restaurant"); + restaurantLabel.setAttribute("class","restaurant-name"); + restaurantLabel.innerHTML = data["restaurant"]; + + //comment section setup (display set to none) + let comments = document.createElement("p"); + comments.setAttribute("id", "a-comments"); + comments.style.display = "none"; + comments.innerText = data["comments"]; + + //other info: rating + let ratingDiv = document.createElement("div"); + ratingDiv.setAttribute("class", "rating"); + let starsImg = document.createElement("img"); + starsImg.setAttribute("id", "a-rating"); + starsImg.setAttribute("src", "./assets/images/icons/"+data["rating"]+"-star.svg"); + starsImg.setAttribute("alt", data["rating"] +" stars"); + starsImg.setAttribute("num", data["rating"]); + ratingDiv.append(starsImg); + + //added tags + let tagContainer = document.createElement("div"); + tagContainer.setAttribute("class", "tag-container"); + tagContainer.setAttribute("id", "a-tags"); + tagContainer.setAttribute("list", data["tags"]); + if(data["tags"]){ + for (let i = 0; i < data["tags"].length; i++) { + let newTag = document.createElement("label"); + newTag.setAttribute("class","tag"); + newTag.innerHTML = data["tags"][i] + " "; + tagContainer.append(newTag); + } + } + + articleEl.append(mealImg); + articleEl.append(mealLabel); + //articleEl.append(reviewLink) + articleEl.append(restaurantLabel); + articleEl.append(ratingDiv); + articleEl.append(tagContainer); + articleEl.append(comments); + + + } + + /** + * Called when getting the .data property of this element. + * + * For Example: + * let reviewCard = document.createElement('review-card'); + * reviewCard.data = { foo: 'bar' } + * + * @return {Object} data - The data from the , of the + * following format: + * { + * "mealImg": "string", + * "imgAlt": "string", + * "mealName": "string", + * "comments": "string", + * "rating": number, + * "restaurant": "string", + * "tags": string array + * } + */ + get data() { + + let dataContainer = {}; + + // getting the article elements for the review card + + //get image + let mealImg = this.shadowEl.getElementById("a-mealImg"); + dataContainer["mealImg"] = mealImg.getAttribute("src"); + dataContainer["imgAlt"] = mealImg.getAttribute("alt"); + + //get meal name + let mealLabel = this.shadowEl.getElementById("a-mealName"); + dataContainer["mealName"] = mealLabel.innerHTML; + + //get comment section + let comments = this.shadowEl.getElementById("a-comments"); + console.log(comments); + dataContainer["comments"] = comments.innerText; + + //get other info: rating + let starsImg = this.shadowEl.getElementById("a-rating"); + dataContainer["rating"] = starsImg.getAttribute("num"); + + //get restaurant name + let restaurantLabel = this.shadowEl.getElementById("a-restaurant"); + dataContainer["restaurant"] = restaurantLabel.innerHTML; + + //get tags + let tagContainer = this.shadowEl.getElementById("a-tags"); + dataContainer["tags"] = tagContainer.getAttribute("list").split(","); + + return dataContainer; + } +} +customElements.define("review-card", ReviewCard); diff --git a/source/assets/scripts/ReviewDetails.js b/source/assets/scripts/ReviewDetails.js new file mode 100644 index 0000000..6819bb9 --- /dev/null +++ b/source/assets/scripts/ReviewDetails.js @@ -0,0 +1,124 @@ +//reviewDetails.js +import {getReviewsFromStorage, saveReviewsToStorage} from "./localStorage.js"; + +// Run the init() function when the page has loaded +window.addEventListener("DOMContentLoaded", init); + +function init(){ + setupDelete(); + setupUpdate(); +} + +function setupDelete(){ + let deleteBtn = document.getElementById("delete"); + let reviews = getReviewsFromStorage(); + let current = JSON.parse(sessionStorage.getItem("current")); + deleteBtn.addEventListener("click", function(){ + if(window.confirm("Are you sure you want to delete this entry?")){ + //delete function + if(current){ + console.log(current); + for(let i = 0; i < reviews.length; i++){ + console.log(reviews[i]); + if(reviews[i]["mealName"] == current["mealName"] && reviews[i]["restaurant"] == current["restaurant"]){ + console.log("match found"); + reviews.splice(i,1); + saveReviewsToStorage(reviews); + sessionStorage.removeItem("current"); + window.location.assign("./index.html"); + break; + } + } + } + } + }); +} + +function setupUpdate(){ + let updateBtn = document.getElementById("update"); + let reviews = getReviewsFromStorage(); + let current = JSON.parse(sessionStorage.getItem("current")); + let form = document.getElementById("update-food-entry"); + updateBtn.addEventListener("click", function(){ + //update function + if(current){ + console.log(current); + form.style.display = "block"; + let tagContainer = document.getElementById("tag-container-form"); + console.log(document.querySelectorAll("#update-food-entry input")); + + //Set value of each input element to current's values + document.getElementById("mealImg").defaultValue = current["mealImg"]; + document.getElementById("imgAlt").defaultValue = current["imgAlt"]; + document.getElementById("mealName").defaultValue = current["mealName"]; + document.getElementById("comments").textContent = current["comments"]; + document.getElementById("rating-" + `${current["rating"]}`).checked = true; + document.getElementById("restaurant").defaultValue = current["restaurant"]; + + if(current["tags"]){ + for (let i = 0; i < current["tags"].length; i++) { + let newTag = document.createElement("label"); + newTag.setAttribute("class","tag"); + newTag.innerHTML = current["tags"][i] + " "; + newTag.addEventListener("click",()=> { + tagContainer.removeChild(newTag); + }); + tagContainer.append(newTag); + } + } + //Take formdata values as newData when submit + form.addEventListener("submit", function(){ + /* + * User submits the form for their review. + * We create reviewCard and put in storage + */ + let formData = new FormData(form); + let newData = {}; + for (let [key, value] of formData) { + console.log(`${key}`); + console.log(`${value}`); + if (`${key}` !== "tag-form") { + newData[`${key}`] = `${value}`; + } + } + newData["tags"] = []; + + let tags = document.querySelectorAll(".tag"); + for(let i = 0; i < tags.length; i ++) { + newData["tags"].push(tags[i].innerHTML); + tagContainer.removeChild(tags[i]); + } + + for(let i = 0; i < reviews.length; i++){ + console.log(reviews[i]); + if(reviews[i]["mealName"] == current["mealName"] && reviews[i]["restaurant"] == current["restaurant"]){ + console.log("match found"); + reviews.splice(i,1,newData); + saveReviewsToStorage(reviews); + sessionStorage.setItem("current", JSON.stringify(newData)); + break; + } + } + + form.style.display = "none"; + + }); + + let tagAddBtn = document.getElementById("tagAdd"); + tagAddBtn.addEventListener("click", ()=> { + let tagField = document.getElementById("tag-form"); + if (tagField.value.length > 0) { + let tagLabel = document.createElement("label"); + tagLabel.innerHTML = tagField.value; + tagLabel.setAttribute("class","tag"); + tagLabel.addEventListener("click",()=> { + tagContainer.removeChild(tagLabel); + }); + + tagContainer.append(tagLabel); + tagField.value = ""; + } + }); + } + }); +} diff --git a/source/assets/scripts/ReviewPage.js b/source/assets/scripts/ReviewPage.js new file mode 100644 index 0000000..89cd440 --- /dev/null +++ b/source/assets/scripts/ReviewPage.js @@ -0,0 +1,13 @@ +// Run the init() function when the page has loaded +window.addEventListener("DOMContentLoaded", init); + +function init() { + let result = sessionStorage.getItem("currReview"); + + let main = document.querySelector("main"); + + main.innerHTML = result; + let p = document.createElement("p"); + p.innerHTML = JSON.parse(result)["comments"]; + main.append(p); +} diff --git a/source/assets/scripts/localStorage.js b/source/assets/scripts/localStorage.js new file mode 100644 index 0000000..48fc891 --- /dev/null +++ b/source/assets/scripts/localStorage.js @@ -0,0 +1,19 @@ +/** + * @returns {Array} An array of reviews found in localStorage + */ +export function getReviewsFromStorage() { + let result = JSON.parse(localStorage.getItem("reviews")); + if (result) { + return result; + } + return new Array(0); +} + +/** + * Takes in an array of reviews, converts it to a string, and then + * saves that string to 'reviews' in localStorage + * @param {Array} reviews An array of reviews + */ +export function saveReviewsToStorage(reviews) { + localStorage.setItem("reviews", JSON.stringify(reviews)); +} diff --git a/source/assets/scripts/localStorage.test.js b/source/assets/scripts/localStorage.test.js new file mode 100644 index 0000000..65574b8 --- /dev/null +++ b/source/assets/scripts/localStorage.test.js @@ -0,0 +1,48 @@ +import {strict as assert} from "node:assert"; +import {describe, it, beforeEach} from "mocha"; +import {saveReviewsToStorage, getReviewsFromStorage} from "./localStorage.js"; + +beforeEach(() => { + localStorage.clear(); +}); + +describe("test app localStorage interaction", () => { + it("get after init", () => { + assert.deepEqual(getReviewsFromStorage(), []); + }); + it("store one then get", () => { + let reviews = [{ + "imgSrc": "sample src", + "imgAlt": "sample alt", + "mealName": "sample name", + "restaurant": "sample restaurant", + "rating": 5, + "tags": ["tag 1", "tag 2", "tag 3"] + }]; + + saveReviewsToStorage(reviews); + assert.deepEqual(getReviewsFromStorage(), reviews); + }); + it("repeated store one more and get", () => { + let reviews = []; + + assert.deepEqual(getReviewsFromStorage(), reviews); + + for(let i = 0; i < 1000; i++){ + reviews = getReviewsFromStorage(); + + reviews.push( + { + "imgSrc": `sample src ${i}`, + "imgAlt": `sample alt ${i}`, + "mealName": `sample name ${i}`, + "restaurant": `sample restaurant ${i}`, + "rating": i, + "tags": [`tag ${3*i}`, `tag ${3*i + 1}`, `tag ${3*i + 2}`] + } + ); + saveReviewsToStorage(reviews); + assert.deepEqual(getReviewsFromStorage(), reviews); + } + }).timeout(10000); +}); diff --git a/source/assets/scripts/main.js b/source/assets/scripts/main.js new file mode 100644 index 0000000..9d37c44 --- /dev/null +++ b/source/assets/scripts/main.js @@ -0,0 +1,119 @@ +// main.js +import {getReviewsFromStorage, saveReviewsToStorage} from "./localStorage.js"; + +// Run the init() function when the page has loaded +window.addEventListener("DOMContentLoaded", init); + +function init() { + // Get the reviews from localStorage + let reviews = getReviewsFromStorage(); + // Add each reviews to the
element + addReviewsToDocument(reviews); + // Add the event listeners to the form elements + initFormHandler(); +} + +/** + * @param {Array} reviews An array of reviews + */ +function addReviewsToDocument(reviews) { + let mainEl = document.querySelector("main"); + reviews.forEach(review => { + let newReview = document.createElement("review-card"); + newReview.data = review; + //TODO: want to append it to whatever the box is in layout + mainEl.append(newReview); + }); + +} + +/** + * Adds the necessary event handlers to
and the clear storage + * + + + + + +
+ + diff --git a/source/review.html b/source/review.html new file mode 100644 index 0000000..b9894ad --- /dev/null +++ b/source/review.html @@ -0,0 +1,16 @@ + + + + + + + Food Journal + + + + +

Current Review:

+
+
+ + \ No newline at end of file diff --git a/source/reviews.json b/source/reviews.json new file mode 100644 index 0000000..0f36b32 --- /dev/null +++ b/source/reviews.json @@ -0,0 +1,19 @@ +[ + { + "imgSrc": "https://cdn.vox-cdn.com/thumbor/Cj5J-5WqSCjlC2tWCOXEB536CJY=/0x0:1810x1182/1200x800/filters:focal(761x447:1049x735)/cdn.vox-cdn.com/uploads/chorus_image/image/69422966/Tacos_Lined_Up.0.png", + "imgAlt": "tacos pic", + "mealName": "Birria Tacos", + "restaurant": "Mike's Red Tacos", + "rating": 5, + "tags": ["delicious", "#worthit","omg"] + }, + { + "imgSrc": "https://www.redwormcomposting.com/images/worm-burrito.JPG", + "imgAlt": "wolftown pic", + "mealName": "Carnitas Burrito", + "restaurant": "Wolftown UCSD", + "rating": 0, + "tags": ["gross", "why","no"] + + } +] diff --git a/source/source.txt b/source/source.txt deleted file mode 100644 index e69de29..0000000 diff --git a/source/static/CreatePage.css b/source/static/CreatePage.css new file mode 100644 index 0000000..c347a04 --- /dev/null +++ b/source/static/CreatePage.css @@ -0,0 +1,83 @@ +/* CreatePage.css */ + +* { + font-family: sans-serif; +} + +body { + height: 100%; + width: 100%; +} + +fieldset { + border: 2px solid rgb(214 214 214); + box-sizing: border-box; + display: block; + width: max-content; +} + +form button { + display: block; + margin-top: 5px; +} + +label[for="ingredients"] p { + margin: 0; +} + +label[for="numRatings"] { + margin: 10px 0 0; +} + +label[for^="rating"] { + padding-right: 10px; +} + +label:not([for^="rating"]) { + display: block; + margin-bottom: 5px; +} + +main { + column-gap: 10px; + display: flex; + flex-wrap: wrap; + height: auto; + max-width: 660px; + row-gap: 10px; + width: 100%; +} + +.tag-container { + display: flex; + flex-flow: row wrap; +} + +.tag { + background-color: grey; + border-radius: 7px; + color: white; + padding-right: 7px; + padding-left: 7px; + margin: 3px; +} + +.tag::before { + display: inline-block; + content: "x"; + height: 15px; + width: 15px; + margin-right: 4px; + text-align: center; + color: white; + cursor: pointer; +} + +.tag:hover::before { + color: red; +} + +.danger { + background-color: rgb(254 171 171); + border-color: red; +} diff --git a/source/static/ReviewCard.css b/source/static/ReviewCard.css new file mode 100644 index 0000000..2c69f0b --- /dev/null +++ b/source/static/ReviewCard.css @@ -0,0 +1,83 @@ +/* main.css */ + +* { + font-family: sans-serif; +} + +body { + height: 100%; + width: 100%; +} + +fieldset { + border: 2px solid rgb(214 214 214); + box-sizing: border-box; + display: block; + width: max-content; +} + +form button { + display: block; + margin-top: 5px; +} + +label[for="ingredients"] p { + margin: 0; +} + +label[for="numRatings"] { + margin: 10px 0 0; +} + +label[for^="rating"] { + padding-right: 10px; +} + +label:not([for^="rating"]) { + display: block; + margin-bottom: 5px; +} + +main { + column-gap: 10px; + display: flex; + flex-wrap: wrap; + height: auto; + max-width: 660px; + row-gap: 10px; + width: 100%; +} + +.tag-container { + display: flex; + flex-flow: row wrap; +} + +.tag { + background-color: grey; + border-radius: 7px; + color: white; + padding-right: 7px; + padding-left: 7px; + margin: 3px; +} + +.tag::before { + display: inline-block; + content: "x"; + height: 15px; + width: 15px; + margin-right: 4px; + text-align: center; + color: white; + cursor: pointer; +} + +.tag:hover::before { + color: red; +} + +.danger { + background-color: rgb(254 171 171); + border-color: red; +} diff --git a/source/static/reset.css b/source/static/reset.css new file mode 100644 index 0000000..6677f89 --- /dev/null +++ b/source/static/reset.css @@ -0,0 +1,158 @@ +/* This is a generic CSS file that sets preliminary rules for content that should be the same across pages */ + +html, +body, +div, +span, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +abbr, +address, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +samp, +small, +strong, +sub, +sup, +var, +b, +i, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; + background: transparent; +} + +body { + line-height: 1; +} + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} + +nav ul { + list-style: none; +} + +blockquote, +q { + quotes: none; +} + +blockquote::before, +blockquote::after, +q::before, +q::after { + content: ""; + content: none; +} + +a { + margin: 0; + padding: 0; + font-size: 100%; + vertical-align: baseline; + background: transparent; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +input, +select { + vertical-align: middle; +} + +img, +fieldset, +object { + border: none; +} + +*, +*::after, +*::before { + box-sizing: border-box; +} + +button, +label { + cursor: pointer; +} + +html, +body { + height: 100%; +} + +form { + border: solid; +} diff --git a/specs/adrs/README.md b/specs/adrs/README.md index 1f1962f..acddca4 100644 --- a/specs/adrs/README.md +++ b/specs/adrs/README.md @@ -1,2 +1,2 @@ -# Overarching Decisions -_We will eventually capture these as an ADR in markdown Links to an external site.(/specs/adrs will contain an individual document per major decision. There will be some initial ones that have to do with general project plan and approach, but more may be added as the project goes on. The main point of this capture is to explain why choices are made. As brainstorming may have your team settle on choices quickly capturing them in a document may be better than just mental consensus)_ +# Overarching Decisions +_We will eventually capture these as an ADR in markdown Links to an external site.(/specs/adrs will contain an individual document per major decision. There will be some initial ones that have to do with general project plan and approach, but more may be added as the project goes on. The main point of this capture is to explain why choices are made. As brainstorming may have your team settle on choices quickly capturing them in a document may be better than just mental consensus)_ diff --git a/static/reset.css b/static/reset.css deleted file mode 100644 index 92a7b68..0000000 --- a/static/reset.css +++ /dev/null @@ -1,82 +0,0 @@ -/* This is a generic CSS file that sets preliminary rules for content that should be the same across pages */ - -html, body, div, span, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -abbr, address, cite, code, -del, dfn, em, img, ins, kbd, q, samp, -small, strong, sub, sup, var, -b, i, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, figcaption, figure, -footer, header, hgroup, menu, nav, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; -} - -body { - line-height: 1; -} - -article,aside,details,figcaption,figure, -footer,header,hgroup,menu,nav,section { - display: block; -} - -nav ul { - list-style: none; -} - -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} - -a { - margin: 0; - padding: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -input, select { - vertical-align :middle; -} - -img, fieldset, object { - border:none; -} - -*, *:after, *:before { - box-sizing:border-box; -} - -button, label { - cursor:pointer; -} - -html, body { - height:100%; -} - -form { - border -} \ No newline at end of file diff --git a/testenv/testenv.js b/testenv/testenv.js deleted file mode 100644 index 01b6e4c..0000000 --- a/testenv/testenv.js +++ /dev/null @@ -1,28 +0,0 @@ -module.exports = {environment}; - -function environment () { - const localStorageMock = (function () { - let store = {}; - return { - getItem(key) { - return store[key]; - }, - setItem(key, value) { - store[key] = value; - }, - clear() { - store = {}; - }, - removeItem(key) { - delete store[key]; - }, - getAll() { - return store; - }, - }; - })(); - - let window = {}; - Object.defineProperty(window, "localStorage", { value: localStorageMock }); - return window; -} \ No newline at end of file diff --git a/testenv/testenv.test.js b/testenv/testenv.test.js deleted file mode 100644 index 91bf30b..0000000 --- a/testenv/testenv.test.js +++ /dev/null @@ -1,81 +0,0 @@ -const {environment} = require("./testenv.js"); -var assert = require("assert"); -var {describe, it, beforeEach} = require("mocha"); -var {saveToLocal, getFromLocal, removeFromLocal, clearLocal} = require("./testenv_helpers"); - -beforeEach(() => { - window = environment(); -}); - -describe("test localStorage mock", () => { - it("test save and fetch", () => { - saveToLocal("testkey1", "testvalue1"); - saveToLocal("testkey2", "testvalue2"); - saveToLocal("testkey3", "testvalue3"); - saveToLocal("testkey4", "testvalue4"); - - assert.equal(getFromLocal("testkey1"), "testvalue1"); - assert.equal(getFromLocal("testkey2"), "testvalue2"); - assert.equal(getFromLocal("testkey3"), "testvalue3"); - assert.equal(getFromLocal("testkey4"), "testvalue4"); - - saveToLocal("testkey6", "testvalue5"); - assert.equal(getFromLocal("testkey6"), "testvalue5"); - }); - - it("test window locality", () => { - assert.equal(getFromLocal("testkey1"), null); - assert.equal(getFromLocal("testkey2"), null); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), null); - }); - - it("test delete and fetch", () => { - saveToLocal("testkey1", "testvalue1"); - saveToLocal("testkey2", "testvalue2"); - saveToLocal("testkey3", "testvalue3"); - saveToLocal("testkey4", "testvalue4"); - - removeFromLocal("testkey3"); - - assert.equal(getFromLocal("testkey1"), "testvalue1"); - assert.equal(getFromLocal("testkey2"), "testvalue2"); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), "testvalue4"); - - removeFromLocal("testkey1"); - - assert.equal(getFromLocal("testkey1"), null); - assert.equal(getFromLocal("testkey2"), "testvalue2"); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), "testvalue4"); - - removeFromLocal("testkey4"); - - assert.equal(getFromLocal("testkey1"), null); - assert.equal(getFromLocal("testkey2"), "testvalue2"); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), null); - - removeFromLocal("testkey2"); - - assert.equal(getFromLocal("testkey1"), null); - assert.equal(getFromLocal("testkey2"), null); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), null); - }); - - it("test clear and fetch", () => { - saveToLocal("testkey1", "testvalue1"); - saveToLocal("testkey2", "testvalue2"); - saveToLocal("testkey3", "testvalue3"); - saveToLocal("testkey4", "testvalue4"); - - clearLocal(); - - assert.equal(getFromLocal("testkey1"), null); - assert.equal(getFromLocal("testkey2"), null); - assert.equal(getFromLocal("testkey3"), null); - assert.equal(getFromLocal("testkey4"), null); - }); -}); \ No newline at end of file diff --git a/testenv/testenv_helpers.js b/testenv/testenv_helpers.js deleted file mode 100644 index 469adc5..0000000 --- a/testenv/testenv_helpers.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = {saveToLocal, getFromLocal, removeFromLocal, clearLocal}; - -function saveToLocal (k, v) { - window.localStorage.setItem(k, v); -} - -function getFromLocal (k) { - return window.localStorage.getItem(k); -} - -function removeFromLocal (k) { - window.localStorage.removeItem(k); -} - -function clearLocal () { - window.localStorage.clear(); -} \ No newline at end of file