Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #143

Merged
merged 331 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
331 commits
Select commit Hold shift + click to select a range
327f20a
chore: 🤖 Integrate markdown with dalle implementation
Nov 7, 2023
e264957
Merge branch 'development' into web/chore/dalle
Nov 7, 2023
1de2c47
Merge remote-tracking branch 'origin/web/chore/frontend/user-card-and…
davidmartinezhi Nov 7, 2023
4524807
refactor: 💡 Integrate development into branch
Nov 7, 2023
16cb60f
style: 💄 Restyled message item
davidmartinezhi Nov 7, 2023
cbc190e
Merge pull request #65 from wizelineacademy/web/chore/frontend/user-c…
davidmartinezhi Nov 7, 2023
ab083fa
fix: 🐛 messages can be saved and retrieved
davidmartinezhi Nov 7, 2023
26afcb0
style: 💄 Added style
davidmartinezhi Nov 7, 2023
ab7315f
fix: 🐛 modelName is passed to api route
davidmartinezhi Nov 7, 2023
d2c24d9
feat: 🎸 Auth needed to use the user routes
A01384318 Nov 7, 2023
b096d5d
chore: 🤖 Change conv title editing and reposition the user card
emiof Nov 8, 2023
700b051
Merge pull request #66 from wizelineacademy/web/chore/frontend/conver…
emiof Nov 8, 2023
2abd6e3
style: 💄 Reposition user card within the conversation sidebar
emiof Nov 8, 2023
8518abd
Merge pull request #67 from wizelineacademy/web/chore/frontend/conver…
emiof Nov 8, 2023
1642e26
fix: 🐛 Remove unwanted resetting of conversation titles
emiof Nov 8, 2023
73df0f2
Merge pull request #68 from wizelineacademy/web/chore/frontend/conver…
emiof Nov 8, 2023
eab82af
fix: 🐛 Fixes lack of synchronicity between tag menus in the app
emiof Nov 8, 2023
3972d03
Merge pull request #69 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 8, 2023
79c4b5c
chore: 🤖 Add cancel and save buttons to the tag editor popover
emiof Nov 9, 2023
e6de833
Merge pull request #70 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 9, 2023
193daf7
fix: 🐛 Fix non-functional clear button in SearchBar
emiof Nov 9, 2023
849540a
Merge pull request #71 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 9, 2023
88cafab
chore: 🤖 Implemented image storage in a S3 bucket
Nov 9, 2023
dffee6d
Merge branch 'development' into web/chore/dalle
Nov 9, 2023
6ef9a5a
Merge branch 'web/chore/dalle' into development
Nov 9, 2023
b342988
Merge pull request #72 from wizelineacademy/web/chore/dalle
Maria-Ontiveros Nov 9, 2023
9216aec
Merge branch 'development' of https://github.com/wizelineacademy/ites…
Nov 9, 2023
ab49497
docs: ✏️ content for the proyect documentation
A01384318 Nov 9, 2023
222bd78
feat: 🎸 Added a spinner while a response is being generated
Nov 10, 2023
fe8c716
Merge pull request #73 from wizelineacademy/web/chore/dalle
Maria-Ontiveros Nov 10, 2023
9f68511
chore: 🤖 Created Model Selector component
davidmartinezhi Nov 10, 2023
e6c8184
style: 💄 Added background color to provider images
davidmartinezhi Nov 10, 2023
061e2a9
style: 💄 Added style
davidmartinezhi Nov 10, 2023
5278425
refactor: 💡 Fix to show a selected default size
Nov 10, 2023
7018e06
Merge pull request #74 from wizelineacademy/web/chore/dalle
Maria-Ontiveros Nov 10, 2023
48514e5
fix: 🐛 messages are always returned from oldes to newest
davidmartinezhi Nov 10, 2023
7de8844
Merge branch 'development' into web/chore/frontend/create-new-convers…
davidmartinezhi Nov 10, 2023
ae17fab
Merge pull request #75 from wizelineacademy/web/chore/frontend/create…
davidmartinezhi Nov 10, 2023
6036ddd
Merge pull request #76 from wizelineacademy/development
davidmartinezhi Nov 10, 2023
12fc956
docs: ✏️ Add documentation to helper and type files
emiof Nov 10, 2023
67eddb1
Merge pull request #77 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 10, 2023
56a435a
fix: 🐛 Fix failure to update conversation tags after editing
emiof Nov 10, 2023
2740575
Merge pull request #78 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 10, 2023
adf3884
chore: 🤖 Implemented auth0 login and updated conversation ctx
william-monroy Nov 10, 2023
e83f292
chore: 🤖 Url routes defined
davidmartinezhi Nov 10, 2023
dfd7187
Merge branch 'development' into web/chore/frontend/auth
william-monroy Nov 10, 2023
78ac136
Merge branch 'web/chore/frontend/auth' into development
william-monroy Nov 10, 2023
2fd116f
chore: 🤖 Created basic functionality of group component
davidmartinezhi Nov 10, 2023
63ce791
chore: 🤖 Created dynamic table
davidmartinezhi Nov 11, 2023
dd05111
chore: 🤖 Implement new conversation modal window
emiof Nov 13, 2023
5be8bff
Merge pull request #80 from wizelineacademy/web/chore/frontend/new-co…
emiof Nov 13, 2023
e1104d3
style: 💄 Add line dividers above tag grids
emiof Nov 13, 2023
36adbde
Merge pull request #81 from wizelineacademy/web/chore/frontend/new-co…
emiof Nov 13, 2023
1165f08
style: 💄 Stylize grid of tags
emiof Nov 13, 2023
a12bc95
Merge pull request #82 from wizelineacademy/web/chore/frontend/new-co…
emiof Nov 13, 2023
60e1fec
chore: 🤖 Implemented image deletion
Nov 13, 2023
157816b
Merge pull request #83 from wizelineacademy/web/chore/dalle
Maria-Ontiveros Nov 13, 2023
5a2fe6b
style: 💄 Defined style in group header
davidmartinezhi Nov 13, 2023
e9e4511
style: 💄 Removed description from group header
davidmartinezhi Nov 13, 2023
182bf54
style: 💄 Agregado estilo estandar a sección de admin
davidmartinezhi Nov 13, 2023
efa2247
style: 💄 Defined style for table component
davidmartinezhi Nov 13, 2023
b205f35
style: 💄 Reposition the edit button of the tag menu modal
emiof Nov 13, 2023
8941d2f
Merge pull request #84 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 13, 2023
a735765
style: 💄 Styled groups top content
davidmartinezhi Nov 13, 2023
7913a6e
style: 💄 Styled group table text
davidmartinezhi Nov 13, 2023
199ed93
Merge branch 'development' into web/chore/admin/group-body
davidmartinezhi Nov 13, 2023
1b983bd
Merge pull request #85 from wizelineacademy/web/chore/admin/group-body
davidmartinezhi Nov 13, 2023
058f63c
Merge branch 'development' into web/chore/dalle
Nov 13, 2023
207b998
chore: 🤖 created method to get user based on auth0 id
davidmartinezhi Nov 13, 2023
681081e
style: 💄 Changed spinner location
Nov 13, 2023
c327457
Merge pull request #86 from wizelineacademy/web/chore/dalle
Maria-Ontiveros Nov 13, 2023
0d72f10
chore: 🤖 creation of user after login with auth0
davidmartinezhi Nov 13, 2023
2f25f47
refactor: 💡 Followed coding standards on variables declarations
davidmartinezhi Nov 13, 2023
b90ace1
chore: 🤖 My wizeprompt settungs ui component
william-monroy Nov 14, 2023
7b3f920
refactor: 💡 change from using sid to using sub
davidmartinezhi Nov 14, 2023
3e53233
feat: 🎸 Adds newly created user to all wizeliners group
davidmartinezhi Nov 14, 2023
7ae1bd2
feat: 🎸 Created handle to get user id
davidmartinezhi Nov 14, 2023
df652fa
feat: 🎸 Created methods for conversation withuser auth0 id
davidmartinezhi Nov 14, 2023
a6431c6
chore: 🤖 Created method based on auth0 id of user
davidmartinezhi Nov 14, 2023
0aa4948
chore: 🤖 created methods based on auth0 user id
davidmartinezhi Nov 14, 2023
e7c8c68
chore: 🤖 Added functinalities based on user auth0 id
davidmartinezhi Nov 14, 2023
0b8f49e
chore: 🤖 get user conversations based on auth0 id
davidmartinezhi Nov 14, 2023
0b3cf72
chore: 🤖 Redirected to login if no session
davidmartinezhi Nov 15, 2023
3831599
fix: 🐛 Removed userId passed value from conversation sidebar
davidmartinezhi Nov 15, 2023
19b15c2
fix: 🐛 Disabled create button after being pressed
Nov 15, 2023
1b6bc7a
Merge pull request #87 from wizelineacademy/web/fix/conversation-crea…
Maria-Ontiveros Nov 15, 2023
9edb2de
refactor: 💡 Fix a few linter warnings
Nov 15, 2023
9d02546
Merge pull request #88 from wizelineacademy/web/fix/conversation-crea…
Maria-Ontiveros Nov 15, 2023
67be20c
chore: 🤖 Begin development of the group sidebar
emiof Nov 15, 2023
70da7aa
Merge pull request #89 from wizelineacademy/web/chore/frontend/group-…
emiof Nov 15, 2023
76b6808
fix: 🐛 Disabled buttons when creating or editing tag
Nov 15, 2023
9a703ca
Merge pull request #90 from wizelineacademy/web/fix/tag-edit-buttons
Maria-Ontiveros Nov 15, 2023
4d90986
style: 💄 Styled integration of sidebar and dashboard
davidmartinezhi Nov 15, 2023
520d79d
chore: 🤖 Redirect to newest conversation after conv deletion
emiof Nov 15, 2023
46b15a9
Merge pull request #91 from wizelineacademy/web/chore/frontend/group-…
emiof Nov 15, 2023
4181f18
refactor: 💡 Removed columns ID and jobPosition
davidmartinezhi Nov 15, 2023
6fc9c3e
refactor: 💡 Removed console logs
davidmartinezhi Nov 15, 2023
4bc5459
Merge branch 'development'
william-monroy Nov 15, 2023
62ccf67
Merge pull request #92 from wizelineacademy/web/chore/ui/settings
william-monroy Nov 15, 2023
69a0aec
Merge remote-tracking branch 'origin/development' into web/fix/routes
A01384318 Nov 15, 2023
02b1727
chore: 🤖 Created add user modal
davidmartinezhi Nov 15, 2023
741ce3f
chore: 🤖 Connected add user modal and user list box
davidmartinezhi Nov 15, 2023
54e1735
chore: 🤖 Added search bar to modal
davidmartinezhi Nov 15, 2023
dd0ba33
chore: 🤖 Create and provide user context to the user interface
emiof Nov 15, 2023
0b6e0a0
style: 💄 Remove empty tag list label when editing tags
emiof Nov 15, 2023
6512f2b
Merge pull request #93 from wizelineacademy/web/chore/frontend/tag-menu
emiof Nov 15, 2023
488ca87
style: 💄 Stylize group card, group sidebar, and new group modal
emiof Nov 16, 2023
83290b1
Merge pull request #94 from wizelineacademy/web/chore/frontend/group-…
emiof Nov 16, 2023
c0d3029
chore: 🤖 Perform fetching of groups from the server side
emiof Nov 16, 2023
1b4d09c
Merge pull request #95 from wizelineacademy/web/chore/frontend/group-…
emiof Nov 16, 2023
aa53ca3
chore: 🤖 Created generic modal to confirm delete action
Nov 16, 2023
d2919b2
Merge pull request #96 from wizelineacademy/web/chore/conversation-de…
Maria-Ontiveros Nov 16, 2023
d1f24eb
style: 💄 Changed padding in the modal
Nov 16, 2023
8ede593
Merge pull request #97 from wizelineacademy/web/chore/conversation-de…
Maria-Ontiveros Nov 16, 2023
0796a03
docs: ✏️ documentation of gith code to local system
JackelineConant Nov 16, 2023
945f3a9
docs: ✏️ Build Enviroment documentation
JackelineConant Nov 16, 2023
e17cbdb
chore: 🤖 Created mthod to add users to group
davidmartinezhi Nov 16, 2023
24370e5
chore: 🤖 created route to add users to a group
davidmartinezhi Nov 16, 2023
10d2737
chore: 🤖 created handle to add users to a group
davidmartinezhi Nov 16, 2023
7edd440
style: 💄 Implemented UI loading skeleton
william-monroy Nov 16, 2023
6415080
Merge branch 'development' into web/style/ui/loading
william-monroy Nov 16, 2023
6dfa656
Merge pull request #98 from wizelineacademy/web/style/ui/loading
william-monroy Nov 16, 2023
7093313
chore: 🤖 Implemented group update after users modification
davidmartinezhi Nov 16, 2023
e8d8754
feat: 🎸 Created and applied method to get users not in group
davidmartinezhi Nov 16, 2023
b65542c
Merge remote-tracking branch 'origin/development' into web/fix/routes
A01384318 Nov 16, 2023
992fc34
Merge pull request #99 from wizelineacademy/web/fix/routes
A01384318 Nov 16, 2023
29c9747
docs: ✏️ simple changes to build documentation
JackelineConant Nov 16, 2023
a97b9cd
style: 💄 Make minor style changes to the conversation sidebar
emiof Nov 16, 2023
42586a3
Merge pull request #100 from wizelineacademy/web/chore/frontend/conve…
emiof Nov 16, 2023
bb75bd8
style: 💄 Added style to group table
davidmartinezhi Nov 16, 2023
0f015aa
style: 💄 Added style
davidmartinezhi Nov 16, 2023
b91006f
fix: 🐛 Fixed ESLint errors, types, and dependencies to prebuild
william-monroy Nov 16, 2023
8b4cbc8
Merge branch 'development' into web/fix/pre-build
william-monroy Nov 16, 2023
e5cfcff
Merge pull request #101 from wizelineacademy/web/fix/pre-build
william-monroy Nov 16, 2023
e30b1a1
chore: 🤖 Created method to remove users from group
davidmartinezhi Nov 16, 2023
3062cbb
chore: 🤖 Created route for removing users from a group
davidmartinezhi Nov 16, 2023
cefaec7
chore: 🤖 Created method to handle users removal from the table
davidmartinezhi Nov 16, 2023
3726fd9
refactor: 💡 Redo layout user protection routes
william-monroy Nov 16, 2023
d6d72f0
chore: 🤖 Update user credits when removed from a group
davidmartinezhi Nov 17, 2023
ec4834b
docs: ✏️ Add documentation to helper and context related files
emiof Nov 17, 2023
05dfcc6
Merge pull request #102 from wizelineacademy/web/chore/frontend/group…
emiof Nov 17, 2023
2c0f575
Merge branch 'development' into web/chore/admin/group-body
davidmartinezhi Nov 17, 2023
8505ab4
Merge pull request #103 from wizelineacademy/web/chore/admin/group-body
davidmartinezhi Nov 17, 2023
8eee17f
chore: 🤖 Integrated user-creation and user context branches
davidmartinezhi Nov 17, 2023
6bb27d7
refactor: 💡 Converted to server component
davidmartinezhi Nov 17, 2023
270989c
chore: 🤖 Merge development with user context
davidmartinezhi Nov 17, 2023
0bd904f
Merge pull request #104 from wizelineacademy/web/chore/frontend/user-…
davidmartinezhi Nov 17, 2023
b45c5b3
refactor: 💡 Merge user context with development
davidmartinezhi Nov 17, 2023
4252348
Merge pull request #105 from wizelineacademy/web/chore/frontend/user-…
davidmartinezhi Nov 17, 2023
595e425
chore: 🤖 Created Welcome page
davidmartinezhi Nov 17, 2023
8e9ad98
chore: 🤖 Created Welcome page
davidmartinezhi Nov 17, 2023
0c956da
Merge pull request #106 from wizelineacademy/web/chore/frontend/conve…
davidmartinezhi Nov 17, 2023
283961c
style: 💄 Added style to settings
davidmartinezhi Nov 18, 2023
9323cf0
chore: 🤖 Created button for navigation to admin dashboard
davidmartinezhi Nov 18, 2023
58351a1
chore: 🤖 Implement group editing modal
emiof Nov 19, 2023
ca0978e
Merge pull request #107 from wizelineacademy/web/chore/frontend/group…
emiof Nov 19, 2023
b298e2e
chore: 🤖 Sort groups and redirect after group deletion
emiof Nov 19, 2023
4a8c841
Merge pull request #108 from wizelineacademy/web/chore/frontend/group…
emiof Nov 19, 2023
2d3d36a
chore: 🤖 Update conversation’s createdAt when message is saved
emiof Nov 19, 2023
2638580
Merge pull request #109 from wizelineacademy/web/chore/frontend/group…
emiof Nov 19, 2023
23b3df4
style: 💄 Use Divider to distinguish all users group
emiof Nov 20, 2023
dd3774a
Merge pull request #110 from wizelineacademy/web/chore/frontend/group…
emiof Nov 20, 2023
3f94872
chore: 🤖 Reorder conversation list after interaction with conv
emiof Nov 21, 2023
c535843
Merge pull request #111 from wizelineacademy/web/chore/frontend/conve…
emiof Nov 21, 2023
1c5a802
chore: 🤖 Add user card to the group sidebar
emiof Nov 21, 2023
fc0a079
Merge pull request #112 from wizelineacademy/web/chore/frontend/group…
emiof Nov 21, 2023
6033b0d
style: 💄 Add loading spinner to the add button, add user modal
emiof Nov 21, 2023
2fcb644
Merge pull request #113 from wizelineacademy/web/chore/frontend/group…
emiof Nov 21, 2023
934d696
chore: 🤖 Immplement logic for altering a group's curr credits
emiof Nov 21, 2023
57f9476
Merge pull request #114 from wizelineacademy/web/chore/frontend/group…
emiof Nov 21, 2023
e7e0566
chore: 🤖 Make minor changes to credit altering functions
emiof Nov 21, 2023
6f6fa48
Merge pull request #115 from wizelineacademy/web/chore/frontend/group…
emiof Nov 21, 2023
913d222
chore: 🤖 Created modal to modify current amount of credits
Nov 21, 2023
30aeed2
chore: 🤖 Created modal to modify current amount of credits
Nov 21, 2023
453e484
Merge branch 'development' into web/chore/credits-modal
Nov 21, 2023
ef83271
refactor: 💡 Implemented changes from development
Nov 21, 2023
2f33d5f
fix: 🐛 fixed style
davidmartinezhi Nov 21, 2023
f4a33bb
chore: 🤖 Add settings to group sidebar's user card dropdown
emiof Nov 21, 2023
d9a0862
Merge pull request #116 from wizelineacademy/web/chore/frontend/group…
emiof Nov 21, 2023
d18c831
style: 💄 Styled group sidebar for consistency in design
davidmartinezhi Nov 21, 2023
57f0731
chore: 🤖 Styled group sidebar
davidmartinezhi Nov 21, 2023
641c76c
chore: 🤖 Added functionality to modify group's users credits
Nov 21, 2023
5c9e6f5
Merge branch 'development' into web/chore/credits-modal
Nov 21, 2023
d13d018
Merge pull request #117 from wizelineacademy/web/chore/credits-modal
Maria-Ontiveros Nov 21, 2023
18f9c95
style: 💄 Styled group sidebar
davidmartinezhi Nov 21, 2023
e9021f6
Merge pull request #118 from wizelineacademy/web/style/group-sidebar
davidmartinezhi Nov 21, 2023
fcf2539
fix: 🐛 Fixed button text
davidmartinezhi Nov 21, 2023
80eae17
Merge pull request #119 from wizelineacademy/web/style/group-sidebar
davidmartinezhi Nov 21, 2023
c6c33e0
style: 💄 Styled settings menu
davidmartinezhi Nov 21, 2023
bd9f6d7
Merge pull request #120 from wizelineacademy/web/style/group-sidebar
davidmartinezhi Nov 21, 2023
c14621a
style: 💄 Style group body
davidmartinezhi Nov 21, 2023
638dc78
Merge pull request #122 from wizelineacademy/web/style/group-sidebar
davidmartinezhi Nov 21, 2023
d711f9f
chore: 🤖 Created functionality to change users role
davidmartinezhi Nov 21, 2023
2aa8cc6
chore: 🤖 Created functionality to change users role
davidmartinezhi Nov 21, 2023
38887b7
Merge pull request #123 from wizelineacademy/web/chore/add-user-to-gr…
davidmartinezhi Nov 22, 2023
a2e39bf
chore: 🤖 Update user's credits after interactions with models
emiof Nov 22, 2023
1bc4e77
Merge pull request #124 from wizelineacademy/web/chore/frontend/user-…
emiof Nov 22, 2023
bc5f6cd
docs: ✏️ Setup installation advance
JackelineConant Nov 22, 2023
67158bf
Merge branch 'development' into web/doc/app
JackelineConant Nov 22, 2023
d826971
Merge pull request #125 from wizelineacademy/web/doc/app
JackelineConant Nov 22, 2023
a59d460
style: 💄 Make minor stylistic changes to the tag editor
emiof Nov 22, 2023
98408f8
Merge pull request #126 from wizelineacademy/web/chore/frontend/tag-e…
emiof Nov 22, 2023
d624cb1
chore: 🤖 Created functionality for global parameters
davidmartinezhi Nov 22, 2023
ee94fa3
chore: 🤖 Created functionality to inyecto global user params
davidmartinezhi Nov 22, 2023
432f63c
Auto stash before merge of "development" and "origin/development"
william-monroy Nov 23, 2023
0848d58
Merge branch 'development' of https://github.com/wizelineacademy/ites…
william-monroy Nov 23, 2023
6b10bae
fix: 🐛 Fixed TS and ESLint errors
william-monroy Nov 23, 2023
37085d8
Merge pull request #127 from wizelineacademy/web/fix/pre-stage
william-monroy Nov 23, 2023
e5160d1
chore: 🤖 Prevent negative credit values after credit reduction
emiof Nov 23, 2023
cdf464e
Merge pull request #128 from wizelineacademy/web/chore/frontend/user-…
emiof Nov 23, 2023
7dfa38d
fix: 🐛 Prevent double reduction of credits in same operation
emiof Nov 23, 2023
b07f54f
Merge pull request #129 from wizelineacademy/web/chore/frontend/user-…
emiof Nov 23, 2023
a10d0d6
chore: 🤖 Created function to calculate tokens from credits
Nov 23, 2023
fb34428
Merge pull request #130 from wizelineacademy/web/chore/credits-modal
Maria-Ontiveros Nov 23, 2023
82ad90a
chore: 🤖 Implemented function to calculate credits to tokens
Nov 23, 2023
6f2b7f1
chore: 🤖 Implemented credits to tokens with user's credits
Nov 23, 2023
a98440f
fix: 🐛 Fix error occurring when the num of creds is 0
emiof Nov 23, 2023
1bf3015
Merge pull request #131 from wizelineacademy/web/chore/frontend/user-…
emiof Nov 23, 2023
2af39be
chore: 🤖 Created injection of global params functionality
davidmartinezhi Nov 23, 2023
35fe28d
docs: ✏️ Creation of divided pages in the doc menu
JackelineConant Nov 23, 2023
f0746a3
chore: 🤖 Merge user global context
davidmartinezhi Nov 23, 2023
97e094d
Merge pull request #132 from wizelineacademy/web/chore/global-context
davidmartinezhi Nov 23, 2023
a0e8680
docs: ✏️ Add descriptions to various function definitions
emiof Nov 24, 2023
7be9619
Merge pull request #133 from wizelineacademy/web/chore/frontend/user-…
emiof Nov 24, 2023
a7041b2
docs: ✏️ Creation of new build and setup pages
JackelineConant Nov 24, 2023
337d6a5
chore: 🤖 Add settings modal to the admin interface
emiof Nov 24, 2023
aa4320e
Merge pull request #134 from wizelineacademy/web/chore/frontend/setti…
emiof Nov 24, 2023
4bc09b7
chore: 🤖 Incorporate single selection list into conv sidebar
emiof Nov 24, 2023
820ca20
Merge pull request #135 from wizelineacademy/web/chore/frontend/setti…
emiof Nov 24, 2023
d3642e7
docs: ✏️ Changes to document
JackelineConant Nov 24, 2023
46de60f
Merge branch 'web/doc/app' into development
JackelineConant Nov 24, 2023
d153405
refactor: 💡 fix lint warning
Nov 24, 2023
76633a7
refactor: 💡 fix lint warnings
Nov 24, 2023
d0aa9d6
chore: 🤖 Implement credit input component
emiof Nov 24, 2023
a1922e2
Merge pull request #136 from wizelineacademy/web/chore/frontend/credi…
emiof Nov 24, 2023
53beec6
chore: 🤖 Update curr user's credits after group modifications
emiof Nov 24, 2023
eaffcc7
Merge pull request #137 from wizelineacademy/web/chore/frontend/group…
emiof Nov 24, 2023
5c6eb33
refactor: 💡 Refactores functionality to paste global params
davidmartinezhi Nov 24, 2023
e0e727c
Merge branch 'development' into web/chore/global-context
davidmartinezhi Nov 24, 2023
25ffaf5
Merge pull request #138 from wizelineacademy/web/chore/global-context
davidmartinezhi Nov 24, 2023
035d6d8
style: 💄 Added icons
davidmartinezhi Nov 24, 2023
cc3a29a
style: 💄 Implemented tokens convertion and display
davidmartinezhi Nov 24, 2023
4deefe7
chore: 🤖 Implement the TextDescriptionModal component
emiof Nov 26, 2023
5d651bd
Merge pull request #139 from wizelineacademy/web/chore/frontend/text-…
emiof Nov 26, 2023
0de2568
chore: 🤖 Add documentation to string and group helper functions
emiof Nov 26, 2023
54218f9
Merge pull request #140 from wizelineacademy/web/chore/frontend/text-…
emiof Nov 26, 2023
6a3d153
chore: 🤖 Add confirmation dialog to the deletion of groups
emiof Nov 27, 2023
81b2fb0
Merge pull request #141 from wizelineacademy/web/chore/frontend/group…
emiof Nov 27, 2023
e19e385
ci: 🎡 Prepare to release
william-monroy Nov 27, 2023
f14b059
Merge pull request #142 from wizelineacademy/app/ci/release
william-monroy Nov 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 213 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
name: CICD

on:
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:

jobs:
Build:
name: Build
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Install Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: "18.x"

- name: Install dependencies
run: |
npm install -g pnpm && pnpm install --no-frozen-lockfile

- name: Setup environment variables
run: echo "${{ secrets.APPS_WEB_ENV }}" >> apps/web/.env

- name: Check environment variables
run: |
cat apps/web/.env

- name: Build
run: |
pnpm build

- name: Check build
run: |
ls

# - name: Test
# run: |
# pnpm test:ci --if-present

Release:
name: Release
needs: [Build, DeployStagingWeb, DeployStagingDocs]
permissions:
contents: write
issues: write
pull-requests: write
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: ./.github/workflows/release.yml

Check:
name: Check PR
permissions:
contents: write
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Install Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: "18.x"

- name: Install dependencies
run: |
npm install -g pnpm && pnpm install --no-frozen-lockfile

- name: Setup environment variables
run: echo "${{ secrets.APPS_WEB_ENV }}" >> apps/web/.env

- name: Check environment variables
run: |
cat apps/web/.env

# - name: Test
# run: |
# pnpm test --if-present

DeployStagingWeb:
name: Deploy to Staging Web
permissions:
contents: write
if: github.event.ref == 'refs/heads/main'
needs: [Build]
runs-on: ubuntu-latest
environment:
name: Production Web
url: "http://52.54.237.87:3000"
steps:
- uses: actions/checkout@v2

- name: Install Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: "18.x"

- name: Move to docs directory
run: cd apps/web

- name: Check current directory
run: |
pwd

- name: Install dependencies
run: |
npm install -g pnpm
cd apps/web && pnpm install --no-frozen-lockfile

- name: Setup environment variables
run: echo "${{ secrets.APPS_WEB_ENV }}" >> apps/web/.env

- name: Check environment variables
run: |
cat apps/web/.env

- name: Build
run: |
cd apps/web && pnpm build

- name: Stop server
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/web && pm2 stop all"

- name: Clean LightSail directory
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "rm -rf apps/web"

- name: Deploy to Lightsail using scp
run: |
sudo apt-get install -y sshpass
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" scp -o StrictHostKeyChecking=no -r apps/web [email protected]:/home/ubuntu/apps --exclude node_modules

- name: Set custom package.json
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/web && echo ${{secrets.APPS_WEB_PACKAGE}} > package.json"

- name: Start server
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/web && pnpm install && pm2 start pnpm --name "web" -- start"

- name: Create output artifact
uses: actions/upload-artifact@v2
with:
name: web
path: apps/web

DeployStagingDocs:
name: Deploy to Staging Docs
permissions:
contents: write
if: github.event.ref == 'refs/heads/main'
needs: [Build]
runs-on: ubuntu-latest
environment:
name: Production Docs
url: "http://52.54.237.87:3001"
steps:
- uses: actions/checkout@v2

- name: Install Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: "18.x"

- name: Move to docs directory
run: cd apps/docs

- name: Check current directory
run: |
pwd

- name: Install dependencies
run: |
npm install -g pnpm
cd apps/web && pnpm install --no-frozen-lockfile

- name: Build
run: |
cd apps/docs && pnpm build

- name: Stop server
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/docs && pm2 stop all"

- name: Clean LightSail directory
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "rm -rf apps/docs"

- name: Deploy to Lightsail using scp excluding node_modules
run: |
sudo apt-get install -y sshpass
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" scp -o StrictHostKeyChecking=no -r apps/docs [email protected]:/home/ubuntu/apps --exclude node_modules

- name: Set custom package.json
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/docs && echo ${{secrets.APPS_DOCS_PACKAGE}} > package.json"

- name: Start server
run: |
sshpass -p "${{ secrets.LIGHTSAIL_SSH_PASS }}" ssh -o StrictHostKeyChecking=no [email protected] "cd apps/docs && pnpm install && pm2 start pnpm --name "docs" -- start"

- name: Create output artifact
uses: actions/upload-artifact@v2
with:
name: docs
path: apps/docs
20 changes: 7 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
name: Release

on:
workflow_dispatch:
workflow_call:

jobs:
release:
name: Release
permissions:
contents: write
issues: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: SpicyPizza/[email protected]
with:
envkey_DEBUG: false
envkey_PORT: 3000
envkey_DATABASE_URL: ${{ secrets.DATABASE_URL }}
directory: ./apps/web
file_name: .env
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 18
- run: npm i -g pnpm
- run: pnpm install --no-frozen-lockfile
- run: pnpm build
node-version: "18.x"
- run: npm -g install @semantic-release/git semantic-release && semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: npx semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 5 additions & 3 deletions apps/docs/pages/_meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"index": "Introduction",
"another": "Another Page",
"advanced": "Advanced (A Folder)",
"builds": "Build",
"setup":"Setup",
"about": {
"title": "About",
"type": "page"
Expand All @@ -11,5 +11,7 @@
"type": "page",
"href": "https://twitter.com/shuding_",
"newWindow": true
}
},
"frontend": "Front-End",
"backend": "Back-End"
}
3 changes: 0 additions & 3 deletions apps/docs/pages/advanced.mdx

This file was deleted.

3 changes: 0 additions & 3 deletions apps/docs/pages/advanced/satori.mdx

This file was deleted.

31 changes: 0 additions & 31 deletions apps/docs/pages/another.mdx

This file was deleted.

3 changes: 3 additions & 0 deletions apps/docs/pages/builds/_meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"environment": "Environment Api Keys"
}
8 changes: 8 additions & 0 deletions apps/docs/pages/builds/environment/_meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"database": "Database PostgreSQL",
"openai": "OpenAI Providers Connection",
"auth0": "Accounts Authentication Auth0",
"pricing": "Chat GPT and Dall-E Models Pricing",
"s3bucket": "S3 Bucket for image storage"

}
11 changes: 11 additions & 0 deletions apps/docs/pages/builds/environment/auth0.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# **Accounts Authentication Auth0**
> ```.env filename=".env" copy
> # Providers Connections
> AUTH0_SECRET= ""
> AUTH0_BASE_URL="http://localhost:3000"
> AUTH0_ISSUER_BASE_URL= ""
> AUTH0_CLIENT_ID= ""
> AUTH0_CLIENT_SECRET= ""
> ```
> > To get the secret environment key for Auth0
> >
11 changes: 11 additions & 0 deletions apps/docs/pages/builds/environment/database.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# **Database PostgreSQL**
> The WizePrompt database
> ```.env filename=".env" copy
> # DB PostgreSQL
> DATABASE_URL= " "
> ```
> > To get the environment key for the web database you will need to migrate the **Prisma Squema** of your local repository to your *PostgreSQL* app.
> > ```js
> > npx prisma migrate
> > ```
> > You will need to have **Prisma** already installed
7 changes: 7 additions & 0 deletions apps/docs/pages/builds/environment/openai.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# **OpenAI Providers Connection**
> ```.env filename=".env" copy
> # Providers Connections
> OPENAI_API_KEY= ""
> ```
> > To get the environment key
> >
16 changes: 16 additions & 0 deletions apps/docs/pages/builds/environment/pricing.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# **Chat GPT and Dall-E models pricing**
> > *GPT Pricing*
> > ```.env filename=".env" copy
> > # GPT Model pricing per 1000 tokens
> > NEXT_PUBLIC_GPT_35_INPUT = "0.0015"
> > NEXT_PUBLIC_GPT_35_OUTPUT = "0.0020"
> > NEXT_PUBLIC_GPT_4_INPUT = "0.03"
> > NEXT_PUBLIC_GPT_4_OUTPUT = "0.06"
> > ```
> > *Dall-E Pricing*
> > ```.env filename=".env" copy
> > # DALLE Model pricing per resolution
> > NEXT_PUBLIC_DALLE_256 = "0.016"
> > NEXT_PUBLIC_DALLE_512 = "0.018"
> > NEXT_PUBLIC_DALLE_1024 = "0.02"
> > ```
7 changes: 7 additions & 0 deletions apps/docs/pages/builds/environment/s3bucket.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# **S3 Bucket for image storage**
> ```.env filename=".env" copy
> # S3 Bucket
> S3_SECRET_KEY = ""
> ```
> > To get the environment secret key for the S3 Bucket
> >
11 changes: 11 additions & 0 deletions apps/docs/pages/especifications.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Project requirements and especifications

## Requirements

Tools and Hardware Requirements Declaration

## Specifications

Technical Specifications


Loading
Loading