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

chore: mb november 1st release #323

Merged
merged 118 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
9a08482
devops: force deploy
gaboesquivel Apr 9, 2024
6758e45
devops: trigger automated build
gaboesquivel Apr 11, 2024
b1f3a0c
devops: trigger automated build
gaboesquivel Apr 11, 2024
34aa4a0
devops: trigger automated build
gaboesquivel Apr 11, 2024
78b49e6
devops: trigger automated build
gaboesquivel Apr 11, 2024
c5334b5
devops: trigger automated build
gaboesquivel Apr 11, 2024
cb71ca4
devops: trigger automated build
gaboesquivel Apr 11, 2024
d735ab2
devops: trigger automated build
gaboesquivel Apr 11, 2024
2d77927
impr(masterbots.ai): add return to browse on bot thread page view (#204)
sheriffjimoh May 6, 2024
db62b93
feat: ai gen 404 image for custom 404 error page (#210)
sheriffjimoh May 6, 2024
fbf1ba8
Merge branch 'develop' of github.com:bitcashorg/masterbots into develop
AndlerRL May 7, 2024
5ccb735
fix(masterbots.ai): terms page visibility and access
AndlerRL May 7, 2024
954c3fd
feat(masterbots.ai): consistent og image style design and dynamic met…
sheriffjimoh May 20, 2024
13fb902
fix(masterbots.ai): OG not redering (#224)
sheriffjimoh May 24, 2024
f422aa5
fix(masterbots.ai): share function (#225)
TopETH May 28, 2024
5ace035
feat(hasura): update user db schema for pro users (#227)
TopETH May 29, 2024
b38d1b0
feat(hasura): add Ai Model Tracker To Threads (#229)
TopETH Jun 20, 2024
234e779
[masterbots.ai] feat: multi AI models integration (#228)
Bran18 Jun 20, 2024
fd2c050
docs: site map diagram
AndlerRL Jun 21, 2024
576e49a
[masterbots.ai] fix: multi AI models guard (#235)
Bran18 Jun 26, 2024
4732d2f
chore(masterbots.ai): update payment terms & conditions (#233)
sheriffjimoh Jun 27, 2024
b43433e
feat(masterbots.ai): pro subscription payment + wizard (#226)
sheriffjimoh Jun 28, 2024
c48ef72
[masterbots.ai] fix: llama3 models (#236)
Bran18 Jun 28, 2024
a38d894
[masterbots.ai] impr(fix): ui tweaks (#237)
AnoukRImola Jul 1, 2024
dce0371
fix(masterbots.ai): payment feedbacks (#240)
sheriffjimoh Jul 11, 2024
bef3b8c
fix(masterbots.ai): update env variable (#244)
sheriffjimoh Jul 11, 2024
5d3cc8a
feat: sitemap (#238)
TopETH Jul 12, 2024
bc35b62
fix(masterbots.ai): show first question & answer in thread list (#246)
TopETH Aug 1, 2024
0073cd1
fix: subscription mobile responsive tweaks (#245)
sheriffjimoh Aug 1, 2024
a9ef61a
fix(impr): models enum table migrations (#247)
AndlerRL Aug 6, 2024
e31f8c2
fix(hasura): models_enum pk
AndlerRL Aug 12, 2024
244e278
fix(hasura): ci/cd default regional log bucket
AndlerRL Aug 12, 2024
888e08d
docs: bun to requirements (#250)
Nemunas Aug 14, 2024
b699518
feat: next auth, email/pw strategy (#249)
Bran18 Aug 14, 2024
1fd3f00
docs: mb sytem diagram v1.0a
AndlerRL Aug 15, 2024
ed6cfa6
feat(impr): next auth environment helper function (#251)
Bran18 Aug 15, 2024
0ff85c5
impr(masterbots.ai): sign up form + sign in session data
AndlerRL Aug 16, 2024
41a1218
docs: claude3 project knowledge docs
AndlerRL Aug 16, 2024
70b69d8
fix(masterbots.ai): devMode conditional
AndlerRL Aug 16, 2024
d43bb36
chore(masterbots.ai): rm console.log
AndlerRL Aug 16, 2024
5bab96c
Merge branch 'main' into develop
AndlerRL Aug 16, 2024
6f6d987
chore: upt default hardcoded gpt model
AndlerRL Aug 16, 2024
f2ff85a
fix: toSlug imports
AndlerRL Aug 17, 2024
4e05831
fix: typo
AndlerRL Aug 17, 2024
69f11d2
Merge branch 'main' into develop
AndlerRL Aug 17, 2024
50774a9
fix(hasura): seeds
AndlerRL Aug 19, 2024
eeabe20
chore(impr): MB seeds update and upgrade (#253)
AndlerRL Aug 22, 2024
bc786a7
fix: prompt row typo
AndlerRL Aug 22, 2024
e911dc1
chore(hasura): seeds update default thread publicity
AndlerRL Aug 24, 2024
09a8cb3
fix(masterbots.ai): adjust arrow direction in thread list (#255)
TopETH Sep 2, 2024
4447b2b
feat(impr): Vercel AI SDK Update (#256)
Bran18 Sep 5, 2024
70dbedf
Leandro/develop (#257)
leandrogavidia Sep 7, 2024
41b6aec
impr(masterbots): components folder structur (#259)
Bran18 Sep 9, 2024
834b102
fix(masterbots): google signIn (#260)
AndlerRL Sep 9, 2024
ad83c1d
fix(masterbots.ai): fix thread-component loop (#261)
Bran18 Sep 10, 2024
9a6333b
fix:(masterbots.ai) add useScroll hook (#263)
Bran18 Sep 12, 2024
abec687
feat(masterbots.ai): chat sidebar filtering (#264)
AndlerRL Sep 12, 2024
42c33fc
fix(masterbots.ai): bot button redirect change (#265)
AnoukRImola Sep 15, 2024
973fa71
wip(masterbots.ai): seo data impr (#267)
AndlerRL Sep 15, 2024
20c7a3b
feat: add chat publicity trigger (#258)
sheriffjimoh Sep 15, 2024
b86a2d1
feat(masterbots.ai): user messages ai refactor (#266)
Bran18 Sep 15, 2024
42d829e
wip: browse sidebar
AndlerRL Sep 15, 2024
b9aa09e
impr(masterbots.ai): browse sidebar (#270)
AndlerRL Sep 15, 2024
4940a30
chore: upt signup default profile pic
AndlerRL Sep 15, 2024
83642b2
chore: seeds upt (#269)
AndlerRL Sep 15, 2024
1f64926
Merge branch 'main' into develop
AndlerRL Sep 15, 2024
198af13
fix(hasura): thread param permission
AndlerRL Sep 15, 2024
9cc628f
fix(masterbots.ai): typo
AndlerRL Sep 15, 2024
b32e59d
fix(masterbots.ai): allow svg content-type
AndlerRL Sep 16, 2024
69ac378
fix: chat + browse layout
AndlerRL Sep 16, 2024
9bb504f
style: clean up
AndlerRL Sep 16, 2024
0d5ac44
Merge branch 'main' into develop
AndlerRL Sep 16, 2024
96e76f6
Seo data (#273)
luighis Sep 16, 2024
d86292f
impr(masterbots.ai): title impr prompt
AndlerRL Sep 23, 2024
469bb0b
impr(masterbots.ai): improve current features v2 (#274)
Bran18 Sep 25, 2024
14ee814
Masterbots/fix redirects (#275)
AnoukRImola Sep 27, 2024
2eb35f9
[masterbots.ai] feat: wordware api (#276)
Bran18 Oct 3, 2024
ab2a2a3
doc: mb system diagram upt
AndlerRL Oct 4, 2024
d4b5274
wip: icl calls integrations
AndlerRL Oct 5, 2024
9463de8
impr(masterbots.ai): permission for thread & user action mode (#281)
sheriffjimoh Oct 8, 2024
af10a55
feat(masterbots.ai): create password recovery (#282)
Bran18 Oct 10, 2024
1ed9365
[masterbots.ai] impr: WW API sanitize and keep alive (#284)
Bran18 Oct 14, 2024
544e598
wip(masterbots.ai): impr createImprovementPrompt
AndlerRL Oct 15, 2024
31a0d9c
style(masterbots.ai): chat loading states comments
AndlerRL Oct 15, 2024
07826f5
feat(masterbots.ai): add admin mode to approve thread (#283)
sheriffjimoh Oct 15, 2024
9d45428
impr(masterbots.ai): alpha metadata chatbot labels (#288)
AndlerRL Oct 23, 2024
1a67709
style(impr): cleanPrompt + followingQuestionsPrompt relocation & cleanup
AndlerRL Oct 24, 2024
d1da839
doc: map system (simplified)
AndlerRL Oct 24, 2024
0affecc
fix(masterbots.ai): sideBar updating URL (#286)
AnoukRImola Oct 24, 2024
8ac19ef
feat: thread options (#287)
sheriffjimoh Oct 28, 2024
01b623a
[masterbots.ai] feat: email verification (#289)
Bran18 Oct 28, 2024
3b4957f
feat(hasura): create social following table. (#292)
mledezma Oct 28, 2024
5cf5bef
chore(masterbots.ai): guard WordWare for prod routing
AndlerRL Oct 28, 2024
af490d7
Merge branch 'main' into develop
AndlerRL Oct 28, 2024
a290dbc
[masterbots.ai] fix: public/private tag bg on dark mode (#294)
sheriffjimoh Oct 29, 2024
72b1a89
fix(hasura): upt user permissions (#296)
sheriffjimoh Oct 30, 2024
99c1bdf
fix(hasura): build error (#297)
sheriffjimoh Oct 30, 2024
4100858
[masterbots.ai] feat: thread list display + components comments for a…
Bran18 Nov 6, 2024
c845fc9
[masterbots.ai] feat: chatbot search tool v0.1a (#295)
AndlerRL Nov 7, 2024
b753122
[masterbots.ai] feat: reorganize navigation menu for mobile view (#298)
AnoukRImola Nov 9, 2024
f808b94
[masterbots.ai] feat: UI + Logic Improvements (#301)
Bran18 Nov 9, 2024
4058ca9
[masterbots.ai] fix: restore desktop navigation link - browse section…
Bran18 Nov 12, 2024
19e906b
[masterbots.ai] fix(impr): browse and chat content search (#304)
Bran18 Nov 13, 2024
cf7fd91
[masterbots.ai] impr: seo sitemap (#306)
luighis Nov 13, 2024
9d5fa3d
[masterbots.ai] impr: ai tools (#302)
AndlerRL Nov 14, 2024
02adc39
[masterbots.ai] wip(impr): web search (#309)
AndlerRL Nov 22, 2024
c4a500c
feat: profile page (#300)
sheriffjimoh Nov 23, 2024
a0ca3b8
[masterbots.ai] fix: shallow routing for category & chatbots for cha…
sheriffjimoh Nov 28, 2024
8219716
[masterbots.ai] feat: update ChatChatbotDetails (#314)
Bran18 Nov 28, 2024
7deaff3
[masterbots.ai] feat: include custom settings options (#317)
Bran18 Nov 30, 2024
4f4143a
[masterbots.ai] feat: integrate drizzle ORM (#320)
Bran18 Dec 6, 2024
56b2eaf
Merge branch 'main' into develop
AndlerRL Dec 6, 2024
8af1880
chore: webSearch feature flag + use cloudinary upload preset
AndlerRL Dec 6, 2024
a000740
fix: responsive sidebar fix
AndlerRL Dec 6, 2024
04bc55f
fix: ts chk build
AndlerRL Dec 6, 2024
76ddeeb
fix: sidebar async call
AndlerRL Dec 6, 2024
b2c7f67
fix: ts build
AndlerRL Dec 6, 2024
ac3631a
chore: typo
AndlerRL Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ node_modules
.DS_Store
_dev
.vercel
__dev
__dev
.vercel
75 changes: 56 additions & 19 deletions apps/hasura/metadata/databases/masterbots/tables/public_user.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,105 +17,125 @@ array_relationships:
table:
name: social_following
schema: public

- name: following
using:
foreign_key_constraint_on:
column: follower_id
table:
name: social_following
schema: public

- name: preferences
using:
foreign_key_constraint_on:
column: user_id
table:
name: preference
schema: public

- name: prompts
using:
foreign_key_constraint_on:
column: user_id
table:
name: prompt_user
schema: public

- name: referrals
using:
foreign_key_constraint_on:
column: referrer_id
table:
name: referral
schema: public

- name: referralsByUserId
using:
foreign_key_constraint_on:
column: user_id
table:
name: referral
schema: public

- name: threads
using:
foreign_key_constraint_on:
column: user_id
table:
name: thread
schema: public

- name: userTokens
using:
foreign_key_constraint_on:
column: user_id
table:
name: user_token
schema: public

insert_permissions:
- role: moderator
permission:
check: {}
columns:
- bio
- date_joined
- email
- favourite_topic
- get_free_month
- is_blocked
- email
- last_login
- password
- profile_picture
- pro_user_subscription_id
- slug
- username
- date_joined
- last_login
- profile_picture
- role
- slug
- user_id
- username
comment: ""

- role: user
permission:
check: {}
columns:
- bio
- email
- favourite_topic
- get_free_month
- is_blocked
- last_login
- password
- pro_user_subscription_id
- profile_picture
- role
- slug
- username
comment: ""
select_permissions:
- role: anonymous
permission:
columns:
- bio
- date_joined
- email
- favourite_topic
- last_login
- pro_user_subscription_id
- profile_picture
- role
- slug
- user_id
- username
filter: {}
comment: ""
- role: moderator
permission:
columns:
- date_joined
- email
- get_free_month
- is_blocked
- is_verified
- last_login
- pro_user_subscription_id
- profile_picture
- role
- slug
- user_id
- username
Expand All @@ -141,8 +161,10 @@ select_permissions:
- role: user
permission:
columns:
- bio
- date_joined
- email
- favourite_topic
- get_free_month
- is_blocked
- is_verified
Expand All @@ -156,26 +178,41 @@ select_permissions:
filter:
user_id:
_eq: X-Hasura-User-Id
comment: ""
comment: ""
update_permissions:
- role: moderator
permission:
columns:
- bio
- date_joined
- favourite_topic
- get_free_month
- is_blocked
- last_login
- password
- pro_user_subscription_id
- profile_picture
- role
- slug
- username
filter: {}
check: null
comment: "Allows moderators to block any user"

comment: Allows moderators to block any user
- role: user
permission:
columns:
- bio
- favourite_topic
- get_free_month
- last_login
- password
- pro_user_subscription_id
- profile_picture
- role
- slug
- username
filter:
user_id:
_eq: X-Hasura-User-Id
check: null
comment: ""
comment: ""
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
alter table "public"."user" add column "bio" text
null;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alter table "public"."user" add column "bio" text
null;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."user" add column "favourite_topic" text
-- null;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alter table "public"."user" add column "favourite_topic" text
null;
3 changes: 3 additions & 0 deletions apps/masterbots.ai/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ yarn-error.log*
.vercel
.vscode
.env*.local

.vercel
.env*.local
54 changes: 0 additions & 54 deletions apps/masterbots.ai/actions.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
const threads = await getThreadsWithoutJWT()

return threads.map(thread => ({
url: `${process.env.VERCEL_URL}/${toSlug(thread.chatbot.categories[0].category.name)}/${thread.threadId}`,
lastModified: thread.updatedAt
url: `${process.env.VERCEL_URL}/${toSlug(thread?.chatbot?.categories?.[0]?.category?.name)}/${thread?.threadId}`,
lastModified: thread?.updatedAt ?? new Date().toISOString()
}))
}
9 changes: 4 additions & 5 deletions apps/masterbots.ai/app/(browse)/[category]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import BrowseList from '@/components/routes/browse/browse-list'
import { BrowseCategoryTabs } from '@/components/routes/browse/browse-category-tabs'
import BrowseList from '@/components/routes/browse/browse-list'
import { BrowseSearchInput } from '@/components/routes/browse/browse-search-input'
import { generateMetadataFromSEO } from '@/lib/metadata'
import { getCategories } from '@/services/hasura'
import { toSlug } from 'mb-lib'
import { Metadata } from 'next'
import { generateMetadataFromSEO } from '@/lib/metadata'
import type { Metadata } from 'next'

export default async function BrowseCategoryPage({
params
Expand Down Expand Up @@ -37,8 +37,7 @@ export async function generateMetadata({

const seoData = {
title: category?.name || '',
description:
'Browse our collection of chatbots and find the one that suits your needs.',
description: `Browse the threads and find the one that suits your needs, from the ${category?.name} category`,
ogType: 'website',
ogImageUrl: '',
twitterCard: 'summary'
Expand Down
10 changes: 5 additions & 5 deletions apps/masterbots.ai/app/(browse)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ interface BrowseLayoutProps {
export default async function BrowseLayout({ children }: BrowseLayoutProps) {
return (
<BrowseProvider>
<main className="flex flex-col w-full h-[calc(100vh-theme(spacing.16))]">
<section className="flex flex-col w-full h-[calc(100vh-theme(spacing.16))]">
<NextTopLoader color="#1ED761" initialPosition={0.2} />
<ResponsiveSidebar />
<ChatLayoutSection>{children}</ChatLayoutSection>
<div className="group w-full overflow-auto animate-in duration-300 ease-in-out relative lg:w-[calc(100%-250px)] xl:w-[calc(100%-300px)] px-4 md:px-10 lg:ml-[250px] xl:ml-[300px] ">
<ChatLayoutSection>
{children}
</ChatLayoutSection>
<FooterCT />
</div>
</main>
</section>
</BrowseProvider>
)
}
13 changes: 12 additions & 1 deletion apps/masterbots.ai/app/(browse)/sitemap.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
import { MetadataRoute } from 'next'

export default function sitemap(): MetadataRoute.Sitemap {
return [
{
url: `${process.env.VERCEL_URL}`,
lastModified: new Date(),
changeFrequency: 'yearly',
priority: 1
},
{
url: `${process.env.VERCEL_URL}/c`,
lastModified: new Date(),
changeFrequency: 'yearly',
priority: 0.8
},
{
url: `${process.env.VERCEL_URL}/wordware`,
lastModified: new Date(),
changeFrequency: 'yearly',
priority: 0.5
}
]
}
Loading