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.

Sign up for GitHub

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

WIP Chat 2 #389

Open
wants to merge 29 commits into
base: next
Choose a base branch
from
Open

WIP Chat 2 #389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
32651eb
Chat component
pomber Jun 20, 2023
de0530b
Add style to chat
pomber Jun 20, 2023
59e0486
Remove other workspaces
pomber Jun 20, 2023
7af2f76
Move styles
pomber Jun 21, 2023
4846d6b
Add memo to sticker
pomber Jun 21, 2023
b44bc08
Remove non-browser lighter
pomber Jun 21, 2023
032060b
New chat
pomber Jun 23, 2023
60b8fc5
Fix active file
pomber Jun 23, 2023
9bfb5c0
Fix first line
pomber Jun 23, 2023
cdde354
Improve file order
pomber Jun 24, 2023
3d0158f
Add current step viewer
pomber Jun 24, 2023
f458bd2
Fix streaming open codeblock
pomber Jun 24, 2023
8526cc0
Fix diff focus
pomber Jun 24, 2023
20d927b
Better first load
pomber Jun 25, 2023
b3489cc
Add focus rows
pomber Jun 25, 2023
e5a5181
Fix tests
pomber Jun 25, 2023
cf3e1b6
Export useConversation
pomber Jun 25, 2023
e5a7b0d
Export useConversation
pomber Jun 25, 2023
83a6bb1
Use getThemeColorsSync
pomber Jun 25, 2023
0b1094b
Add assistant fake message
pomber Jun 25, 2023
0920ffc
Hide replies
pomber Jun 25, 2023
d3fa5fe
Fix streaming code
pomber Jun 25, 2023
c8e8545
Fix new messages
pomber Jun 25, 2023
2bce015
Add no-code class
pomber Jun 25, 2023
dd80b67
Fix styles
pomber Jun 26, 2023
78b8078
Handle metadata
pomber Jun 26, 2023
40f305a
Export metadata functions
pomber Jun 26, 2023
f1da105
Fix replies separator
pomber Jun 26, 2023
b62037f
Avoid mutations in list
pomber Jun 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
Prev Previous commit
Next Next commit
Use getThemeColorsSync
  • Loading branch information
@pomber
pomber committed Jun 25, 2023
commit 83a6bb130f90d054edbb8adb065536d366b1dc1c
2 changes: 1 addition & 1 deletion packages/mdx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"coverage": "vitest run --coverage"
},
"dependencies": {
"@code-hike/lighter": "0.7.0",
"@code-hike/lighter": "0.7.1",
"node-fetch": "^2.0.0",
"react-markdown": "^8.0.7"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/mdx/pages/chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ console.log("this 5oo")


That is bar.

---

- foo
- bar bax
`,
},
{
Expand Down
24 changes: 12 additions & 12 deletions packages/mdx/src/chat/chat.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@
gap: 10px;
}

.ch-scrollycoding-content p {
margin: 1.5rem 0;
}

.ch-scrollycoding-content p:last-child {
margin-bottom: 0;
}

.ch-scrollycoding-content p:first-child {
margin-top: 0;
}

.ch-scrollycoding-step-content {
border-radius: 18px !important;
padding: 0px !important;
Expand Down Expand Up @@ -93,6 +81,18 @@
line-height: 1.5;
}

.ch-chat-message p {
margin: 1.5rem 0;
}

.ch-chat-message p:last-child {
margin-bottom: 0;
}

.ch-chat-message p:first-child {
margin-top: 0;
}

.ch-chat-question {
background-color: #0084ff;
border-bottom-right-radius: 3px;
Expand Down
43 changes: 3 additions & 40 deletions packages/mdx/src/utils/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
Theme,
RawTheme,
getThemeColors,
getThemeColorsSync,
} from "@code-hike/lighter/dist/browser.esm.mjs"

const styleCache = new Map<string, string>()
Expand Down Expand Up @@ -49,8 +50,8 @@ async function getCSSVariables(theme: Theme) {
return rules
}

export async function getCSSVariablesObject(theme: Theme) {
const themeColors = await getThemeColors(theme)
export function getCSSVariablesObjectSync(theme: RawTheme) {
const themeColors = getThemeColorsSync(theme)
const rules: Record<string, string> = {}
if (!themeColors || typeof themeColors !== "object") {
throw new Error(
Expand All @@ -76,43 +77,5 @@ export async function getCSSVariablesObject(theme: Theme) {
}
}
}
console.log(rules)
return rules
}

export function getCSSVariablesObjectSync(theme: RawTheme) {
// TODO create sync function in lighter
return {
"--ch-t-colorScheme": "dark",
"--ch-t-foreground": "#c9d1d9",
"--ch-t-background": "#0d1117",
"--ch-t-lighter-inlineBackground": "#0d1117e6",
"--ch-t-editor-background": "#0d1117",
"--ch-t-editor-foreground": "#c9d1d9",
"--ch-t-editor-lineHighlightBackground": "#6e76811a",
"--ch-t-editor-rangeHighlightBackground": "#ffffff0b",
"--ch-t-editor-infoForeground": "#3794FF",
"--ch-t-editor-selectionBackground": "#264F78",
"--ch-t-focusBorder": "#1f6feb",
"--ch-t-tab-activeBackground": "#0d1117",
"--ch-t-tab-activeForeground": "#c9d1d9",
"--ch-t-tab-inactiveBackground": "#010409",
"--ch-t-tab-inactiveForeground": "#8b949e",
"--ch-t-tab-border": "#30363d",
"--ch-t-tab-activeBorder": "#0d1117",
"--ch-t-editorGroup-border": "#30363d",
"--ch-t-editorGroupHeader-tabsBackground": "#010409",
"--ch-t-editorLineNumber-foreground": "#6e7681",
"--ch-t-input-background": "#0d1117",
"--ch-t-input-foreground": "#c9d1d9",
"--ch-t-input-border": "#30363d",
"--ch-t-icon-foreground": "#8b949e",
"--ch-t-sideBar-background": "#010409",
"--ch-t-sideBar-foreground": "#c9d1d9",
"--ch-t-sideBar-border": "#30363d",
"--ch-t-list-activeSelectionBackground": "#6e768166",
"--ch-t-list-activeSelectionForeground": "#c9d1d9",
"--ch-t-list-hoverBackground": "#6e76811a",
"--ch-t-list-hoverForeground": "#c9d1d9",
}
}
Loading