Skip to content

Commit

Permalink
[paper] new working paper on Digital Health (#45)
Browse files Browse the repository at this point in the history
* package updates

* new working paper

* package update

* npm pcakge fix

* removed non-featured articles

* fixed article

* fix heading

* update pnpm

* update node
  • Loading branch information
meleksomai authored Jul 26, 2024
1 parent 8503038 commit f144cfb
Show file tree
Hide file tree
Showing 15 changed files with 5,317 additions and 4,064 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:

- uses: pnpm/[email protected]
with:
version: 7.5.2
version: 9.6.0

- name: setup node.js environment
uses: actions/setup-node@v2
with:
node-version: 16
node-version: 20
cache: "pnpm"

- name: install dependencies
Expand Down
33 changes: 26 additions & 7 deletions .syncpackrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
{
"dev": true,
"filter": ".",
"indent": " ",
"overrides": false,
"peer": false,
"prod": true,
"resolutions": true,
"dependencyTypes": ["dev", "prod", "resolutions"],
"workspace": false,
"semverGroups": [],
"semverGroups": [
{
"label": "use exact version numbers in production",
"packages": ["**"],
"dependencyTypes": ["prod"],
"dependencies": ["**"],
"range": ""
},
{
"label": "use exact version numbers for development",
"packages": ["**"],
"dependencyTypes": ["dev"],
"dependencies": ["**"],
"range": ""
},
{
"label": "use exact version numbers for resolutions",
"packages": ["**"],
"dependencyTypes": ["resolutions"],
"dependencies": ["**"],
"range": ""
}
],
"semverRange": "",
"sortAz": [
"contributors",
Expand All @@ -26,6 +44,7 @@
"author",
"keywords",
"main",
"files",
"scripts",
"peerDependencies",
"dependencies",
Expand All @@ -35,4 +54,4 @@
],
"source": [],
"versionGroups": []
}
}
2 changes: 1 addition & 1 deletion apps/somai.me/app/section.essays.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Heading, Grid, Box, Text, Link, Stack } from "@thugga/ui";
import { getAllPosts } from "../lib/essays";

export default async function EssaysSection() {
const recentPosts = await getAllPosts();
const recentPosts = (await getAllPosts()).filter((a) => a.meta.featured);

return (
<>
Expand Down
97 changes: 97 additions & 0 deletions apps/somai.me/content/posts/digital_health.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/somai.me/content/posts/universal_healthcare.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: A Case for Universal Healthcare in Tunisia
subtitle: The path towards achieving Universal Healthcare Coverage in Tunisia
featured: true
featured: false
image: /images/posts/universal_healthcare/hero.png
authors:
- melek-somai
Expand Down
4 changes: 2 additions & 2 deletions apps/somai.me/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "next start"
},
"dependencies": {
"@markdoc/markdoc": "0.1.2",
"@markdoc/markdoc": "0.2.2",
"@radix-ui/react-icons": "1.1.1",
"@thugga/markdoc": "workspace:*",
"@thugga/ui": "workspace:*",
Expand All @@ -36,7 +36,7 @@
"@types/node": "17.0.12",
"@types/react": "18.0.28",
"eslint": "8.36.0",
"eslint-config-thugga": "0.0.0",
"eslint-config-thugga": "workspace:*",
"tsconfig": "workspace:*",
"typescript": "4.9.5",
"webpack": "5.88.2"
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"syncpack:fix": "npx syncpack fix-mismatches && npx syncpack set-semver-ranges && npx syncpack format"
},
"devDependencies": {
"eslint-config-thugga": "0.0.0",
"eslint-config-thugga": "workspace:*",
"prettier": "2.7.1",
"syncpack": "8.2.4",
"turbo": "latest"
Expand All @@ -22,7 +22,6 @@
"npm": ">=7.0.0",
"node": ">=14.0.0"
},
"packageManager": "[email protected]",
"private": true,
"workspaces": [
"apps/*",
Expand Down
2 changes: 1 addition & 1 deletion packages/academic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/figlet": "1.5.5",
"@types/node": "17.0.12",
"eslint": "8.36.0",
"eslint-config-thugga": "0.0.0",
"eslint-config-thugga": "workspace:*",
"tsconfig": "workspace:*",
"tsx": "3.12.1",
"typescript": "4.9.5"
Expand Down
6 changes: 3 additions & 3 deletions packages/markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
"peerDependencies": {
"@markdoc/markdoc": "0.2.2",
"@thugga/ui": "workspace:*",
"react-dom": "^18.2.0"
"react-dom": "18.2.0"
},
"dependencies": {
"prism-react-renderer": "1.3.3"
},
"devDependencies": {
"@markdoc/markdoc": "0.1.2",
"@markdoc/markdoc": "0.2.2",
"@thugga/ui": "workspace:*",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"eslint": "8.36.0",
"eslint-config-thugga": "0.0.0",
"eslint-config-thugga": "workspace:*",
"react": "18.2.0",
"react-dom": "18.2.0",
"tsconfig": "workspace:*",
Expand Down
12 changes: 12 additions & 0 deletions packages/markdoc/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ const config: Config = {
content: { type: String },
},
},
blockquote: {
render: "Blockquote",
},
link: {
render: "Link",
attributes: {
Expand Down Expand Up @@ -109,6 +112,15 @@ const config: Config = {
};

const components = {
Blockquote: ({ children }: any) => {

Check warning on line 115 in packages/markdoc/src/index.tsx

View workflow job for this annotation

GitHub Actions / Build, Linting

Unexpected any. Specify a different type
return (
<Box paddingY="500">
<Text as="div" color="slate11" variant="large">
{children.props.children}
</Text>
</Box>
);
},
Document: ({ children }: any) => {

Check warning on line 124 in packages/markdoc/src/index.tsx

View workflow job for this annotation

GitHub Actions / Build, Linting

Unexpected any. Specify a different type
return (
<Stack as="article" space="500" align="flex-start">
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"peerDependencies": {
"@stitches/react": "1.2.8",
"next": "13.4.0",
"next": "13.4.12",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand Down Expand Up @@ -48,7 +48,7 @@
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"eslint": "8.36.0",
"eslint-config-thugga": "0.0.0",
"eslint-config-thugga": "workspace:*",
"next": "13.4.12",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/ui/src/components/Link/Link.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ const variant = {
base: "blue11",
},
}),
danger: atoms({
textDecorationColor: "red8",
color: {
hover: "redA11",
base: "red11",
},
}),
};

const underline = {
Expand Down
13 changes: 2 additions & 11 deletions packages/ui/src/components/Link/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,16 @@ export const Link = React.forwardRef<HTMLElement, LinkProps>(
underline,
nextLink = true,
disabled,
size = "base",
size,
...restProps
},
ref
) => {
const externalProps = external
? {
rel: "noopener norefferer",
target: "_blank",
}
: null;

const labelContent = (
<Text
as="span"
bold={bold}
variant={size}
variant={undefined}
color="inherit"
font={mono ? "mono" : undefined}
display="initial"
Expand Down Expand Up @@ -105,8 +98,6 @@ export const Link = React.forwardRef<HTMLElement, LinkProps>(
underline,
disabled,
})}
// {...nativeProps}
{...externalProps}
{...restProps}
>
{childContent}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/Text/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const Text = React.forwardRef<
font = "sans",
weight,
underline,
variant = "base",
variant = undefined,
},
ref: React.Ref<HTMLElement>
) => {
Expand Down
Loading

0 comments on commit f144cfb

Please sign in to comment.