Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Initial release #60

Merged
merged 239 commits into from
Apr 25, 2022
Merged
Changes from 1 commit
Commits
Show all changes
239 commits
Select commit Hold shift + click to select a range
f2bf389
feature: add mui packages
Ericsauce Apr 8, 2022
1a178b1
changes in app.tsx and index.tsx
Ericsauce Apr 8, 2022
6e4df6e
addition of the Window component
Ericsauce Apr 8, 2022
eeb8782
addition of components within Window.tsx
Ericsauce Apr 8, 2022
db6ab5a
hotfix(cms): prod mode error
Apr 9, 2022
091cb3a
feat: created new menu item component
shui-clouds Apr 9, 2022
55208a2
feat: added the menu page to navbar
shui-clouds Apr 9, 2022
3de312c
fix: example cow page function name
shui-clouds Apr 9, 2022
c7e5868
feat(cicd): basic dev build
Apr 9, 2022
7587045
feat(cicd): basic prod build
Apr 9, 2022
6339deb
feat(cicd): automate release publishing
Apr 9, 2022
9577017
Merge pull request #23 from gentleseal/main
aprets Apr 9, 2022
378c513
feat(cicd): check for conventional commits on PR
shui-clouds Apr 9, 2022
5d7d3f7
feat(cicd): runs linting on PR
shui-clouds Apr 9, 2022
74598e0
Merge branch 'dev' of https://github.com/gentleseal/COM3014-CW into f…
shui-clouds Apr 10, 2022
084b2e0
enh(menu-item): updated layout, colors
shui-clouds Apr 10, 2022
91c4f24
fix: increased content-fetching depth for menu
shui-clouds Apr 10, 2022
ddff85d
feat: starter custom theme
shui-clouds Apr 10, 2022
3ff9c0f
feat: generated types for menu sections
shui-clouds Apr 10, 2022
b1c0be7
feat: menu page for displaying the items
shui-clouds Apr 10, 2022
81ab7ae
fix(types): downgraded contentful dependency to version 9
shui-clouds Apr 11, 2022
dba5dc8
feat: starts typecheck on PR
shui-clouds Apr 11, 2022
5ba39e8
feat: added global css
shui-clouds Apr 11, 2022
ed65cab
feat: added dev:published command
shui-clouds Apr 11, 2022
2286d8a
enh(navbar): updated buttons on navbar
shui-clouds Apr 11, 2022
21055b2
feat(menu-item): added tags to item component, removed calories
shui-clouds Apr 11, 2022
e0e7aa2
feat(menu-section): created navbar for menu categories
shui-clouds Apr 11, 2022
96a88c9
feat(menu-section): added div component to allow menu navbar interact…
shui-clouds Apr 11, 2022
3b14cd2
feat(readme): added a description of different commands to readme
shui-clouds Apr 11, 2022
9484b54
refactor(menu): added index.tsx for exporting Menu components
shui-clouds Apr 11, 2022
6c661f2
fix(mantine-navbar): fixed main navbar margins, remove unused imports
shui-clouds Apr 11, 2022
3af376c
fix(menu-page): fixed app crashes when item has no / unpublished picture
shui-clouds Apr 11, 2022
1189886
feat(menu-page): added section navbar to menu page, fetches tags from…
shui-clouds Apr 11, 2022
ed1834e
chore: contentful package version update
shui-clouds Apr 11, 2022
26bd60a
chore: deleted a testing type file
shui-clouds Apr 11, 2022
0ec8c6a
fix(menu-page): commented out json data
shui-clouds Apr 11, 2022
cddfef7
fix(menu-item): renamed the component file to have captial 'I'
shui-clouds Apr 11, 2022
3875686
enh(menu-page): updated margins on menu page
shui-clouds Apr 11, 2022
d1c2a44
enh(cicd): allow more commit types
aprets Apr 11, 2022
7a892e5
Merge branch 'dev' into feature/menu-page
shui-clouds Apr 11, 2022
6daf121
fix(menu): removes 'calories' menu items & contentful types
shui-clouds Apr 11, 2022
45240e5
fix(contentful): corrected menu section type in cms, regenerated types
shui-clouds Apr 11, 2022
19e7717
fix(menu-page): fix cms formatting and empty section display
aprets Apr 11, 2022
250cd50
feat(cicd): updated firebase deployment
aprets Apr 11, 2022
3177cd9
feat: firebase setup
aprets Apr 11, 2022
7cfac50
feat: firebase functions setup
aprets Apr 11, 2022
bbd70cf
feat: menu dataset serverless function
aprets Apr 11, 2022
503a50f
chore: fix linter
aprets Apr 11, 2022
073bc4e
feat: example chatbot menu api usage
aprets Apr 11, 2022
2a1b258
enh(README): add section with deployment links
aprets Apr 11, 2022
fa6502b
Merge pull request #27 from gentleseal/feature/firebase
aprets Apr 12, 2022
4a92590
chore: update types
shui-clouds Apr 12, 2022
d415b5f
chore: renamed app title
shui-clouds Apr 12, 2022
88239c2
chore: updated readme with link to menu json data
shui-clouds Apr 12, 2022
8f1c132
Chatbot-Menu format
arjoogupta25 Apr 12, 2022
853ceb9
feat: chatbot.ipynb
harpreet13419 Apr 12, 2022
d543eb6
feat: Database created while running Flask app
harpreet13419 Apr 12, 2022
b2ec2cf
feat: Adding Styling to Chatbot
harpreet13419 Apr 12, 2022
5d6a57b
feat: HTML file for Chatbot
harpreet13419 Apr 12, 2022
91de0e8
feat: training Data for Chatbot
harpreet13419 Apr 12, 2022
afcec79
feat: Train File for Chatbot
harpreet13419 Apr 12, 2022
5d7b22d
feat: Icon for Chatbot
harpreet13419 Apr 12, 2022
afd18f2
Merge pull request #31 from gentleseal/Chatbot-Arjoo
arjoogupta25 Apr 12, 2022
5609980
Merge pull request #32 from gentleseal/feature/chatbot
arjoogupta25 Apr 12, 2022
09c0fd3
Merge pull request #24 from gentleseal/feature/menu-page
shui-clouds Apr 13, 2022
daac3e3
fix/moved chatbot and its components to Components
Ericsauce Apr 14, 2022
9f4c00e
feature/changed lib to mantine + added new UI
Ericsauce Apr 14, 2022
023d840
feat: zustand store storage to play well with next
aprets Apr 15, 2022
34ea583
chore: ignore next config
aprets Apr 15, 2022
33b2d6a
feat: get next build version as "ENV" variable
aprets Apr 15, 2022
79b2037
feat: add deps for global state
aprets Apr 15, 2022
fa66056
chore: update yarn.lock
aprets Apr 15, 2022
872f26b
chore: add spelling of some words
aprets Apr 15, 2022
35c8f22
refactor: seperate out offsetdiv
aprets Apr 15, 2022
42c18f6
chore: remove offsetdiv from old location
aprets Apr 15, 2022
5be6312
chore: generate types
aprets Apr 15, 2022
c5bc001
feat: implement zustand store for basket, use storage for persistance
aprets Apr 15, 2022
13df98c
fix: rehydrate store in a special way on react init on client
aprets Apr 15, 2022
d38d168
feat: menu cache and abstraction for menu fetching
aprets Apr 15, 2022
bc375ae
refactor: move MenuItem to be CMS friendly
aprets Apr 15, 2022
209505c
feat: basic basket using store
aprets Apr 15, 2022
d2d3585
chore: update menu exports
aprets Apr 15, 2022
43fe145
refactor: abstract away menu sections
aprets Apr 15, 2022
7ca164e
refactor: vastly simplify and abstract menu page
aprets Apr 15, 2022
7cd1ab3
fix: extra group item on total in basket
aprets Apr 15, 2022
ef923cd
Merge branch 'dev' into feature/chatbot-popup
aprets Apr 16, 2022
bc69856
feat: call to action in navbar
aprets Apr 16, 2022
a128fd4
chore: deps cleanup
aprets Apr 16, 2022
57c0810
refactor: streamline chatbot api
aprets Apr 16, 2022
396ac7f
fix: chatbot window
aprets Apr 16, 2022
e9bb7d6
fix: chatbot cta
aprets Apr 16, 2022
82a0236
refactor(chatbot-popup): reorgonize files
aprets Apr 16, 2022
a84cdab
fix: chatbot input
aprets Apr 16, 2022
d74d697
refactor: chatbot popup input for mobile
aprets Apr 16, 2022
14f0726
chore: remove unused dep
aprets Apr 16, 2022
c04c34f
Create chatbot2-checkpoint.ipynb
harpreet13419 Apr 17, 2022
2384b17
fix: production state issue
aprets Apr 17, 2022
5738d7f
fix: cache data size
aprets Apr 17, 2022
b1a3ac8
refactor: change menu page url
aprets Apr 17, 2022
b6e38e7
fix: unique key for sections
aprets Apr 17, 2022
797c2bc
Merge pull request #38 from gentleseal/feature/store-and-basket
aprets Apr 18, 2022
db39fe1
feat : Training HTML File
harpreet13419 Apr 19, 2022
d72494d
feat : Training data HTML file
harpreet13419 Apr 19, 2022
bddd8b9
Delete personal_que.html
harpreet13419 Apr 19, 2022
52fd1c7
Merge pull request #40 from gentleseal/feature/chatbot
harpreet13419 Apr 19, 2022
d07fa5e
feat: chatbot python file
harpreet13419 Apr 19, 2022
28608b6
Merge pull request #41 from gentleseal/feature/chatbot
harpreet13419 Apr 19, 2022
3610615
feat: init.py
arjoogupta25 Apr 19, 2022
04230a3
Merge pull request #42 from gentleseal/Chatbot-Arjoo
arjoogupta25 Apr 19, 2022
807af2c
feat: __init__.cpython-36.pyc
arjoogupta25 Apr 19, 2022
7e44150
feat: actions.cpython-36.pyc
arjoogupta25 Apr 19, 2022
979fc2c
feat:actions.py
arjoogupta25 Apr 19, 2022
be7cb40
feat:config.yml
arjoogupta25 Apr 19, 2022
1b13d33
feat:credentials.yml
arjoogupta25 Apr 19, 2022
579fcc4
feat:nli.yml
arjoogupta25 Apr 19, 2022
a9fe6d4
feat:rules.yml
arjoogupta25 Apr 19, 2022
cf0d3ac
stories.yml
arjoogupta25 Apr 19, 2022
83488a6
feat:domain.yml
arjoogupta25 Apr 19, 2022
cb97f11
feat:endpoints.yml
arjoogupta25 Apr 19, 2022
aa631a0
feat:train1
arjoogupta25 Apr 19, 2022
e0e319b
feat:train2
arjoogupta25 Apr 19, 2022
d82c0f7
feat:train3
arjoogupta25 Apr 19, 2022
8a74640
feat:train4
arjoogupta25 Apr 19, 2022
cbff181
feat:test_stories.yml
arjoogupta25 Apr 19, 2022
cf4dc78
Merge pull request #43 from gentleseal/Chatbot-Arjoo
arjoogupta25 Apr 19, 2022
1919b2a
feat:init.py
arjoogupta25 Apr 19, 2022
f3e942b
feat:init_.cpython.pyc
arjoogupta25 Apr 19, 2022
a2df726
init:actions.pyc
arjoogupta25 Apr 19, 2022
53580a5
feat:actions.py
arjoogupta25 Apr 19, 2022
a150ab5
feat:config.yml
arjoogupta25 Apr 19, 2022
020ec38
feat:credential.yml
arjoogupta25 Apr 19, 2022
e2c212e
feat:nlu.yml
arjoogupta25 Apr 19, 2022
d55cf9d
feat:rules.yml
arjoogupta25 Apr 19, 2022
81528ac
feat:stories.yml
arjoogupta25 Apr 19, 2022
8475d0b
feat:domain.yml
arjoogupta25 Apr 19, 2022
09963fd
feat:endpoints.yml
arjoogupta25 Apr 19, 2022
e01b806
feat:model1
arjoogupta25 Apr 19, 2022
8ce4a0e
feat:model2
arjoogupta25 Apr 19, 2022
a1a9075
feat:model3
arjoogupta25 Apr 19, 2022
87776ce
feat:model4
arjoogupta25 Apr 19, 2022
c5a7100
feat:stories.yml
arjoogupta25 Apr 19, 2022
02fdee6
Merge pull request #46 from gentleseal/Arjoo
arjoogupta25 Apr 19, 2022
2ef8a83
feat: Initial init files for model to initate
arjoogupta25 Apr 19, 2022
ed70651
feat: actions via chatbot
arjoogupta25 Apr 19, 2022
23446b3
feat: different configuration for chatbot
arjoogupta25 Apr 19, 2022
a4f533e
feat: credentials
arjoogupta25 Apr 19, 2022
60cad12
feat: Intent file for chatbot
arjoogupta25 Apr 19, 2022
f6fb9a0
feat: Rules for chatbot to function
arjoogupta25 Apr 19, 2022
785fee4
feat: dialogue flow for chatbot
arjoogupta25 Apr 19, 2022
a8a4196
feat: Response file for chatbot
arjoogupta25 Apr 19, 2022
3b88b47
feat: integration file
arjoogupta25 Apr 19, 2022
2be392d
feat: trained model 1 for reference
arjoogupta25 Apr 19, 2022
d513892
feat: trained models for reference
arjoogupta25 Apr 19, 2022
d02060e
feat: stories of dialogue flow
arjoogupta25 Apr 19, 2022
66282e2
Merge pull request #50 from gentleseal/rasa-bot
arjoogupta25 Apr 19, 2022
6cb82bd
chore: clenup old chatbot files
aprets Apr 22, 2022
1e19708
feat: chatbot, rasa gitignore
aprets Apr 22, 2022
880f4ec
feat: chatbot cicd
aprets Apr 22, 2022
0ccfa0d
fix: github action
aprets Apr 22, 2022
f790ae1
feat: redeploy chatbot on pipeline change
aprets Apr 22, 2022
9df62bb
fix: chatbot cicd path
aprets Apr 22, 2022
3f280d0
fix: chatbot cicd service account
aprets Apr 22, 2022
8b81669
fix: chatbot cicd folder path
aprets Apr 22, 2022
48f593a
feat: commit trained chatbot model in
aprets Apr 22, 2022
be1647b
fix: deploy chatbot container to eu registry
aprets Apr 22, 2022
e072445
chore: only redeploy chatbot when main changes
aprets Apr 22, 2022
534c431
fix: production url names
aprets Apr 22, 2022
747b5c4
feat: add stripe keys to env
aprets Apr 22, 2022
32ab984
feat: add stripe to functions
aprets Apr 22, 2022
25eb6d8
fix: ts output mode
aprets Apr 22, 2022
98c17a0
chore: yarn.lock
aprets Apr 22, 2022
e280f82
Feat: updated intents for chatbot
arjoogupta25 Apr 23, 2022
b0e0bc4
feat: updated stories for updated intents-chatbot
arjoogupta25 Apr 23, 2022
e1cc0be
feat: updated responses for updated intents- chatbot
arjoogupta25 Apr 23, 2022
cb9360e
feat: Final Model for chatbot
arjoogupta25 Apr 23, 2022
b660e99
Merge pull request #52 from gentleseal/rasa-bot
arjoogupta25 Apr 23, 2022
74bb184
Merge pull request #51 from gentleseal/feature/chatbot-cicd
aprets Apr 23, 2022
3b7ffb0
feat: add image + about us section to landing page
Ericsauce Apr 23, 2022
d8a04fb
chore: cleaned up libs
Ericsauce Apr 23, 2022
c299d3d
feat: added seperator image and Menu section
Ericsauce Apr 23, 2022
5c982cc
feat: added image group and cta menu button
Ericsauce Apr 23, 2022
13a6fb5
feat: added seperator and Virtual chef section
Ericsauce Apr 23, 2022
809ba28
feat: added footer with libs
Ericsauce Apr 23, 2022
2effc12
feat: added about us page with small description
Ericsauce Apr 23, 2022
5689cd7
feat: added meet our team section/ image group
Ericsauce Apr 23, 2022
0a5ce07
Merge branch 'dev' into feature/chatbot-popup
aprets Apr 23, 2022
315f2fb
Merge pull request #56 from gentleseal/dev
aprets Apr 23, 2022
dff9d2c
Merge pull request #57 from gentleseal/dev
aprets Apr 23, 2022
f592394
feat: firestore rules to limit access to orders
aprets Apr 23, 2022
eb6c39c
feat: stripe webhook endpoint secret
aprets Apr 23, 2022
64ae0a3
chore: add cors
aprets Apr 23, 2022
6bc27bd
chore: add cors
aprets Apr 23, 2022
bc284a0
feat: add ordering related cloud functions
aprets Apr 23, 2022
b5df213
chore: add firebase and icon deps
aprets Apr 23, 2022
3892039
chore: env vars for checkout
aprets Apr 23, 2022
40577ee
feat: update basket to initiate checkout
aprets Apr 23, 2022
f9a9d54
feat: init firebase
aprets Apr 23, 2022
5ff5867
feat: implement basic order tracking
aprets Apr 23, 2022
f705765
chore: include firebase in _app
aprets Apr 23, 2022
c125eb4
fix: cleanup order tracking
aprets Apr 23, 2022
c2beb96
feat: simple restaurant view
aprets Apr 23, 2022
54193a1
chore: indent for linter
aprets Apr 23, 2022
9f0ad8a
chore: small ts and prop fixes
aprets Apr 23, 2022
613ebda
fix: remove 'page' from page name, fix indent, props
aprets Apr 23, 2022
aa2a23f
chore: transfer changes from unrelated pr
aprets Apr 23, 2022
f321c2b
Merge pull request #55 from gentleseal/feature/chatbot-popup
aprets Apr 23, 2022
6bd32fa
Merge branch 'dev' into feature/checkout
shui-clouds Apr 23, 2022
54faacf
Merge pull request #58 from gentleseal/feature/checkout
shui-clouds Apr 23, 2022
331f9a2
Merge branch 'dev' into feature/about-us-page
shui-clouds Apr 23, 2022
a983a17
Merge branch 'dev' into feature/landing-page
shui-clouds Apr 23, 2022
e65a222
Merge pull request #54 from gentleseal/feature/landing-page
shui-clouds Apr 23, 2022
a969cb6
fix(about-us): fixed syntax error for a Title element
shui-clouds Apr 23, 2022
63460f0
Merge branch 'dev' into feature/about-us-page
shui-clouds Apr 23, 2022
44d491f
Merge pull request #53 from gentleseal/feature/about-us-page
shui-clouds Apr 23, 2022
8ecdd9b
feat: make intents parsable
aprets Apr 24, 2022
f6b9107
chore: upgrade rasa for deploy and cleanup
aprets Apr 24, 2022
f974588
chore: train model
aprets Apr 24, 2022
70a4580
chore: remove example page
aprets Apr 24, 2022
e161bc1
chore: cleanup landing
aprets Apr 24, 2022
a0214da
chore: update navbar with page updates
aprets Apr 24, 2022
28c9c28
chore: yarn.lock
aprets Apr 24, 2022
5557c15
chore: update navbar with logo
aprets Apr 24, 2022
818c4f0
refactor: chat popup to interact with deployed bot
aprets Apr 24, 2022
23093c4
fix: bot checkout
Apr 25, 2022
c23a743
chore: update model
aprets Apr 25, 2022
035366e
Merge branch 'refactor/prepare-release' of https://github.com/gentles…
aprets Apr 25, 2022
a897503
chore: regen model
aprets Apr 25, 2022
3c6ce32
fix: firebase app init bug
Apr 25, 2022
6e4bceb
feat: better menu caching
Apr 25, 2022
0643b7f
chore: bot integration
Apr 25, 2022
05e56b5
feat: move notification provider to work for the whole app
Apr 25, 2022
2716a38
feat: notify if added to basket on other page
Apr 25, 2022
9540cef
feat: chatbot widget store integration
Apr 25, 2022
b9b26ae
chore: small fixes
Apr 25, 2022
2bfb75d
fix: dev cicd
Apr 25, 2022
2de0750
fix: type and lint fixes
Apr 25, 2022
900a702
fix: tracking routing error in prod
Apr 25, 2022
d5d4e95
Merge pull request #59 from gentleseal/refactor/prepare-release
aprets Apr 25, 2022
fe5b45f
fix: dev build url
aprets Apr 25, 2022
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
Prev Previous commit
Next Next commit
feat(cicd): basic prod build
  • Loading branch information
Arthur committed Apr 9, 2022
commit 75870457cb4b4b219923b1de1a464ccc3864436c
38 changes: 38 additions & 0 deletions .github/workflows/build-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: (PROD) Build Website

on:
push:
branches:
- main
paths:
- next/**
workflow_dispatch:

jobs:
job:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./next
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "14"
- uses: actions/cache@v2
with:
path: |
${{ github.workspace }}/next/node_modules
${{ github.workspace }}/next/.next/cache
# Generate a new cache whenever packages or source files change.
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.[jt]sx?') }}
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-
- run: yarn install
- run: yarn export
- name: Upload build
uses: actions/upload-artifact@v3
with:
name: website-build-${{github.sha}}
path: next/out/*