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

Stampy redesign #735

Merged
merged 196 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
e51d890
3 columns instead of 4
buddy-web3 Mar 17, 2024
53f13c1
feedback form not showing
buddy-web3 Mar 17, 2024
28a716d
Merge pull request #557 from StampyAI/stampy-redesign-feedbackForm
melissasamworth Mar 18, 2024
3288b25
Merge pull request #556 from StampyAI/stampy-redesign-459-3Cols
melissasamworth Mar 18, 2024
380a14e
Initial chatbot integration
mruwnik Mar 23, 2024
369e397
minor styling ChatBot
buddy-web3 Mar 28, 2024
ab15416
Merge branch 'master' into stampy-redesign
mruwnik Apr 3, 2024
6c76396
Merge remote-tracking branch 'origin/stampy-redesign' into stampy-red…
buddy-web3 Apr 8, 2024
4e99e44
human answers
mruwnik Apr 8, 2024
6cb2044
Merge pull request #583 from StampyAI/chat-css
mruwnik Apr 9, 2024
3307060
better glossary parsing
mruwnik Apr 23, 2024
88ded6f
use human answers when available
mruwnik Apr 29, 2024
48eb46f
Merge pull request #601 from StampyAI/chat-fixes
melissasamworth Apr 30, 2024
964979c
Merge remote-tracking branch 'origin/stampy-redesign' into stampy-red…
buddy-web3 Apr 30, 2024
38ee3e5
tickets: #591 #590
buddy-web3 Apr 30, 2024
c55d731
Merge branch 'master' into stampy-redesign
mruwnik Apr 30, 2024
686213f
weird lint error
buddy-web3 Apr 30, 2024
50aadba
weird lint error
buddy-web3 Apr 30, 2024
7a92553
weird lint error
buddy-web3 Apr 30, 2024
08e02dc
Chat settings
mruwnik Apr 30, 2024
97ab76b
various fixes
mruwnik Apr 30, 2024
37d404d
Merge pull request #603 from StampyAI/chat-fixes
melissasamworth Apr 30, 2024
eb60ebe
hide chat settings
mruwnik Apr 30, 2024
1710287
CSS changes for settings
melissasamworth May 1, 2024
956c50b
Merge branch 'stampy-redesign' into stampy-redesign-591
buddy-web3 May 1, 2024
fbe0604
lint fix
mruwnik May 1, 2024
96ecc18
Merge pull request #607 from StampyAI/Melissa
mruwnik May 1, 2024
36ff70c
switch to gtp3
mruwnik May 1, 2024
5f3ee7c
Merge pull request #602 from StampyAI/stampy-redesign-591
melissasamworth May 1, 2024
8ab9fee
CSS
melissasamworth May 1, 2024
38a4517
Merge branch 'stampy-redesign' into Melissa
melissasamworth May 1, 2024
8ab9774
fix lint
mruwnik May 1, 2024
66bd874
Merge pull request #609 from StampyAI/Melissa
mruwnik May 1, 2024
2f217b0
css fixes
mruwnik May 1, 2024
b5a73e9
use proper endpoint
mruwnik May 2, 2024
2eb462d
feedback buttons
mruwnik May 1, 2024
c65bf70
pool questions when less than 3 generated by bot
buddy-web3 May 2, 2024
ef44a89
new input component, CSS
melissasamworth May 2, 2024
36a5481
new input component, CSS
melissasamworth May 2, 2024
7ed2195
Merge branch 'stampy-redesign' into Melissa
melissasamworth May 2, 2024
ed8d2ef
feedback form
mruwnik May 2, 2024
ba02292
a couple old CSS changes
melissasamworth May 2, 2024
eb5af5c
proper page ids
buddy-web3 May 2, 2024
8fff3dc
general CSS changes for chatbot
melissasamworth May 3, 2024
3408199
Merge pull request #616 from StampyAI/Melissa
melissasamworth May 3, 2024
39d6042
Merge pull request #608 from StampyAI/chat-fixes
melissasamworth May 3, 2024
66fde9a
Merge pull request #617 from StampyAI/Melissa-2
mruwnik May 3, 2024
0f21664
10 predefined poolQuestions, randomized
buddy-web3 May 3, 2024
6fc2348
lint
buddy-web3 May 3, 2024
e2816f1
Merge branch 'stampy-redesign' into stampy-redesign-594
buddy-web3 May 3, 2024
b297fc8
Merge pull request #614 from StampyAI/stampy-redesign-594
buddy-web3 May 3, 2024
c2e6c1b
Merge branch 'stampy-redesign' into melissa-3
mruwnik May 3, 2024
26325d0
Merge branch 'stampy-redesign' into melissa-3
mruwnik May 3, 2024
d9d5eb0
Merge pull request #618 from StampyAI/melissa-3
mruwnik May 3, 2024
e7219c0
suggestions in chatbot
mruwnik May 3, 2024
0cc1782
search fixes
mruwnik May 3, 2024
dced17c
Merge pull request #619 from StampyAI/chat-fixes
mruwnik May 3, 2024
cacd43a
proper link to chat
mruwnik May 3, 2024
c872b8e
Merge branch 'master into stampy-redesign
mruwnik May 3, 2024
f5d79ea
set 20 default followups
mruwnik May 3, 2024
235ff71
set model via url param
mruwnik May 3, 2024
b68589b
Connect chat feedback
mruwnik May 3, 2024
f6bc965
Merge pull request #622 from StampyAI/chat-fixes
mruwnik May 4, 2024
f7889ba
fix discord logging env vars
mruwnik May 4, 2024
6c6dccb
correct chat url
mruwnik May 4, 2024
9a25fb8
CSS
melissasamworth May 7, 2024
693e589
Merge branch 'stampy-redesign' into Melissa
melissasamworth May 7, 2024
90edfd1
delete thing
melissasamworth May 7, 2024
2a51ef8
lint fix
melissasamworth May 7, 2024
75cb5bb
lint fix
melissasamworth May 7, 2024
b4c9f27
linter fixes
mruwnik May 7, 2024
662a277
Merge pull request #626 from StampyAI/Melissa
melissasamworth May 8, 2024
4ab71e9
Chatbot: question-matching on questions input #592
melissasamworth May 9, 2024
5e16b4b
Lint
melissasamworth May 9, 2024
aeb41b2
matomo tracking
mruwnik May 22, 2024
102db37
show banners
mruwnik May 22, 2024
5123318
Merge pull request #635 from StampyAI/sundry-fixes
mruwnik May 24, 2024
3338bf5
Feedback updated, ButtonSecondary added
zarSou9 May 25, 2024
d211cf2
Fixed reference errors by switching to npm
zarSou9 May 25, 2024
6224504
Fixed linting error
zarSou9 May 25, 2024
bc3bb58
added node/types
zarSou9 May 25, 2024
9ce820c
Hopefully fixed test err
zarSou9 May 25, 2024
0a3dca9
Fixed type errors
zarSou9 May 25, 2024
534abab
Merge pull request #629 from StampyAI/🍄
melissasamworth May 26, 2024
f38104c
save feedback to local storage
zarSou9 May 26, 2024
9b394ea
fixed js css interaction
zarSou9 May 26, 2024
488843b
linting issue fix
zarSou9 May 26, 2024
3510b72
prettier is acting weird
zarSou9 May 26, 2024
02a4246
clean up fcol-x lefovers from merge
Aprillion May 26, 2024
e8cc39b
correct prettier file
zarSou9 May 26, 2024
90c0f4c
prettier is not pretty
zarSou9 May 26, 2024
a96a9eb
prettier needs to die
zarSou9 May 26, 2024
519ac26
idk anymore
zarSou9 May 26, 2024
33d0f2c
fix linter error
mruwnik May 26, 2024
bd231aa
Merge remote-tracking branch 'upstream/stampy-redesign' into 598-updated
zarSou9 May 26, 2024
f1adb8f
update favicons
mruwnik May 27, 2024
6da8373
Merge pull request #631 from StampyAI/col
melissasamworth May 27, 2024
95b377f
Filter out empty banners
mruwnik May 28, 2024
1c52886
removed tailwind
zarSou9 May 29, 2024
efc5302
form styling
zarSou9 May 29, 2024
932b918
Merge branch 'stampy-redesign' into 598-updated
zarSou9 May 29, 2024
282a58b
Incorporated feedback, Deleted ButtonSecondary
zarSou9 Jun 1, 2024
07e37bd
Merge branch '598-updated' of https://github.com/zarSou9/stampy-ui in…
zarSou9 Jun 1, 2024
3f7bdbe
color vars added
zarSou9 Jun 1, 2024
755242a
testing permissions
zarSou9 Jun 3, 2024
a571c1b
vars added, position form absolutely
zarSou9 Jun 4, 2024
f8ee121
linting
zarSou9 Jun 4, 2024
bf8b9fc
White space for chat input, fixed positioning
zarSou9 Jun 4, 2024
dffb835
added shadow
zarSou9 Jun 4, 2024
ac4882e
chat initialisation
mruwnik Jun 4, 2024
3321e81
positioning fixed
zarSou9 Jun 4, 2024
5f3ca19
various fixes
mruwnik Jun 4, 2024
22fff91
slightly better popups
mruwnik Jun 4, 2024
20f6823
make sure there are always chat conitnuations
mruwnik Jun 4, 2024
23d78c4
Merge pull request #684 from StampyAI/sundry-fixes
melissasamworth Jun 4, 2024
423eb8c
var added
zarSou9 Jun 4, 2024
bcd5fdd
Merge branch 'stampy-redesign' into Ticket-#591
zarSou9 Jun 4, 2024
01e52fd
adjustments in part of clamp value for grid
melissasamworth Jun 4, 2024
dc6a47c
Merge pull request #639 from zarSou9/598-updated
melissasamworth Jun 4, 2024
4d95106
typo
zarSou9 Jun 5, 2024
5c25327
linting error
zarSou9 Jun 5, 2024
e29ec52
references on mobile
mruwnik Jun 5, 2024
886cbe1
add full stop
mruwnik Jun 5, 2024
929486b
Replaced shadowed class
zarSou9 Jun 5, 2024
5aba6f8
Merge pull request #683 from StampyAI/Ticket-#591
melissasamworth Jun 5, 2024
d12dd98
Merge pull request #687 from StampyAI/sundry-fixes
melissasamworth Jun 5, 2024
195edbd
Updated grid
melissasamworth Jun 5, 2024
498e06d
linted
melissasamworth Jun 5, 2024
1123420
formatting chat messages, typo fix
zarSou9 Jun 5, 2024
deb1b56
Update root.css
melissasamworth Jun 5, 2024
b977ec5
Merge pull request #689 from StampyAI/🦄
zarSou9 Jun 5, 2024
1bf1f28
Merge pull request #691 from StampyAI/spacing
zarSou9 Jun 5, 2024
8e6e557
in progress
zarSou9 Jun 6, 2024
2b83ed0
styling fixes for reference hover (WIP)
melissasamworth Jun 6, 2024
acce4ba
lint
melissasamworth Jun 6, 2024
d7bb60e
vars for days, melissa feedback incorporated
zarSou9 Jun 6, 2024
424f650
Merge branch 'stampy-redesign' into Ticket-#653-&-#598-Updates
zarSou9 Jun 6, 2024
3858780
lint
zarSou9 Jun 6, 2024
1a6b91b
Made hint look very nice
zarSou9 Jun 6, 2024
e42d18b
article spacing fixed
zarSou9 Jun 6, 2024
4c7c229
Merge pull request #690 from StampyAI/Ticket-#653-&-#598-Updates
melissasamworth Jun 6, 2024
a8ed49d
Merge pull request #694 from StampyAI/Ticket-#673
melissasamworth Jun 6, 2024
baddfe1
Merge pull request #693 from StampyAI/🦄
melissasamworth Jun 6, 2024
e5cb567
ignore feedback
zarSou9 Jun 7, 2024
4f9e2d9
reference hover bellow
zarSou9 Jun 7, 2024
53c28ee
updated height
zarSou9 Jun 7, 2024
fa47b90
Merge pull request #701 from StampyAI/Ticket-#597
melissasamworth Jun 7, 2024
61d84db
Revert "Updated grid"
zarSou9 Jun 7, 2024
29d65e0
Merge pull request #703 from StampyAI/mobile-fixed
melissasamworth Jun 7, 2024
69b30e5
self-explanatory
melissasamworth Jun 7, 2024
d90f67f
lint
melissasamworth Jun 7, 2024
9c7a335
Merge pull request #708 from StampyAI/misc-CSS
melissasamworth Jun 7, 2024
d2d6310
search by pageid instead of question
zarSou9 Jun 8, 2024
a60d441
rename symbol
zarSou9 Jun 8, 2024
8502d4d
fix mobile footer space #705
Aprillion Jun 8, 2024
d3215b9
Merge pull request #709 from StampyAI/Ticket-#668
mruwnik Jun 8, 2024
b10dcdf
clean up mobile nav
mruwnik Jun 7, 2024
7e92c56
mobile chatbot referencs
mruwnik Jun 7, 2024
ad6a1c8
resolve conflicts
mruwnik Jun 8, 2024
04a5ecf
Merge pull request #707 from StampyAI/sundry-fixes
mruwnik Jun 8, 2024
2d19858
logging thumb feedback fixed
zarSou9 Jun 8, 2024
cda9f15
Merge pull request #712 from StampyAI/Ticket-#695
zarSou9 Jun 9, 2024
5f9a161
miscellaneous mobile fixes
zarSou9 Jun 9, 2024
fb922e7
small
zarSou9 Jun 9, 2024
6105867
Merge pull request #714 from StampyAI/Ticket-#680
zarSou9 Jun 10, 2024
2901be3
Merge pull request #710 from StampyAI/mobile-footer
zarSou9 Jun 10, 2024
348ac61
properly display popup content
mruwnik Jun 8, 2024
6adbda6
Use sample of preselected articles
mruwnik Jun 8, 2024
a01aa26
fix bug
mruwnik Jun 10, 2024
6593238
Merge pull request #711 from StampyAI/sundry-fixes
zarSou9 Jun 10, 2024
d7cdd87
mobile fixes
zarSou9 Jun 11, 2024
d691337
Merge pull request #716 from StampyAI/Ticket-#677
zarSou9 Jun 11, 2024
24b6e7e
Improved column spacing, Mobile feedback, & sundry fixes
zarSou9 Jun 11, 2024
32f9cb2
typo
zarSou9 Jun 11, 2024
f575ae2
apostrophe
zarSou9 Jun 11, 2024
6283093
cheeky spacing
zarSou9 Jun 11, 2024
e6bef50
Merge pull request #718 from StampyAI/moondry-fixes
bryceerobertson Jun 11, 2024
809b783
misc fixes
zarSou9 Jun 12, 2024
5e6f13a
rename
zarSou9 Jun 12, 2024
af73627
Merge pull request #721 from StampyAI/mobile-fixes
mruwnik Jun 12, 2024
138e301
misc fixes
zarSou9 Jun 13, 2024
95ca082
Merge pull request #724 from StampyAI/mobile-footnotes
zarSou9 Jun 13, 2024
d62b1f2
fixed setting squish
zarSou9 Jun 13, 2024
df33976
Merge pull request #725 from StampyAI/settings
mruwnik Jun 15, 2024
8f1d784
Mobile issues fixed, bugs fixed, improved search
zarSou9 Jun 16, 2024
063236a
flashy settings
zarSou9 Jun 17, 2024
5eae04b
incorperated feedback
zarSou9 Jun 17, 2024
08d235c
Merge pull request #733 from StampyAI/bug-fixes
zarSou9 Jun 17, 2024
e89c4e5
No more youtube authors, and autocomplete for search off.
zarSou9 Jun 17, 2024
0f04d88
Merge pull request #734 from StampyAI/small
mruwnik Jun 18, 2024
4bdacac
Merge branch 'master' into stampy-redesign
mruwnik Jun 18, 2024
49a698f
fix linter
mruwnik Jun 18, 2024
3efd857
fix references
mruwnik Jun 19, 2024
8ae392e
Merge pull request #737 from StampyAI/sundry-fixes
mruwnik Jun 19, 2024
343f4dd
fix chrome bug
mruwnik Jun 19, 2024
ebe2746
Merge pull request #739 from StampyAI/sundry-fixes
bryceerobertson Jun 19, 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
2 changes: 2 additions & 0 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
| sed s/{CODA_INCOMING_TOKEN}/${{ secrets.CODA_INCOMING_TOKEN }}/ \
| sed s/{CODA_WRITES_TOKEN}/${{ secrets.CODA_WRITES_TOKEN }}/ \
| sed s/{MATOMO_DOMAIN}/${{ secrets.MATOMO_DOMAIN }}/ \
| sed s/{DISCORD_LOGGING_CHANNEL_ID}/${{ secrets.DISCORD_LOGGING_CHANNEL_ID }}/ \
| sed s/{DISCORD_LOGGING_TOKEN}/${{ secrets.DISCORD_LOGGING_TOKEN }}/ \
> wrangler.toml
npm ci
npm run deploy
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
| sed s/{CODA_INCOMING_TOKEN}/${{ secrets.CODA_INCOMING_TOKEN }}/ \
| sed s/{CODA_WRITES_TOKEN}/${{ secrets.CODA_WRITES_TOKEN }}/ \
| sed s/{MATOMO_DOMAIN}/${{ secrets.MATOMO_DOMAIN }}/ \
| sed s/{DISCORD_LOGGING_CHANNEL_ID}/${{ secrets.DISCORD_LOGGING_CHANNEL_ID }}/ \
| sed s/{DISCORD_LOGGING_TOKEN}/${{ secrets.DISCORD_LOGGING_TOKEN }}/ \
> wrangler.toml
npm ci
npm run deploy
Expand Down
12 changes: 7 additions & 5 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
semi: false
singleQuote: true
bracketSpacing: false
printWidth: 100
trailingComma: es5
{
"semi": false,
"singleQuote": true,
"bracketSpacing": false,
"printWidth": 100,
"trailingComma": "es5"
}
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const decorators = [
])
return (
<CachedObjectsProvider>
<RemixStub />
<RemixStub />
</CachedObjectsProvider>
)
},
Expand Down
21 changes: 21 additions & 0 deletions app/assets/icons/StampyLarge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading