Skip to content

Commit eb9f8d9

Browse files
authored
Merge pull request #356 from EducationalTools/main
Redesigns, new gmaes page, tags, tailwind v4, themes, more gmaes
2 parents 041f372 + ba3ec83 commit eb9f8d9

1,006 files changed

Lines changed: 115887 additions & 2319 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/beta_deploy.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: 'Beta Deployment'
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- uses: actions/create-github-app-token@v1
15+
id: app-token
16+
with:
17+
owner: EducationalTools-Beta
18+
repositories: |
19+
EducationalTools-Beta.github.io
20+
app-id: ${{ secrets.GH_APP_ID }}
21+
private-key: ${{ secrets.GH_PRIVATE_KEY }}
22+
23+
- uses: pnpm/action-setup@v4
24+
with:
25+
version: 9
26+
27+
- name: Install dependencies
28+
run: pnpm install && pnpm install -g firebase-tools
29+
30+
- name: Build
31+
run: |
32+
pnpm run build
33+
34+
- name: Deploy to repo
35+
uses: peaceiris/actions-gh-pages@v4
36+
with:
37+
personal_token: ${{ steps.app-token.outputs.token }}
38+
external_repository: EducationalTools-Beta/EducationalTools-Beta.github.io
39+
publish_branch: main
40+
publish_dir: ./build
41+
user_name: 'edutools-bot[bot]'
42+
user_email: '1183662+edutools-bot[bot]@users.noreply.github.com'

components.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "https://next.shadcn-svelte.com/schema.json",
2+
"$schema": "https://shadcn-svelte.com/schema.json",
33
"tailwind": {
44
"css": "src/app.css",
5-
"baseColor": "neutral"
5+
"baseColor": "slate"
66
},
77
"aliases": {
88
"components": "$lib/components",
@@ -12,5 +12,5 @@
1212
"lib": "$lib"
1313
},
1414
"typescript": true,
15-
"registry": "https://tw3.shadcn-svelte.com/registry/default"
15+
"registry": "https://shadcn-svelte.com/registry"
1616
}

package.json

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,45 @@
1414
"lint": "prettier --check ."
1515
},
1616
"devDependencies": {
17-
"@lucide/svelte": "^0.482.0",
18-
"@sveltejs/adapter-auto": "^6.0.0",
17+
"@internationalized/date": "^3.8.2",
18+
"@lucide/svelte": "^0.515.0",
19+
"@sveltejs/adapter-auto": "^6.0.1",
1920
"@sveltejs/adapter-static": "^3.0.8",
20-
"@sveltejs/kit": "^2.20.8",
21-
"@sveltejs/vite-plugin-svelte": "^5.0.3",
21+
"@sveltejs/kit": "^2.21.5",
22+
"@sveltejs/vite-plugin-svelte": "^5.1.0",
2223
"@tailwindcss/typography": "^0.5.16",
24+
"@tailwindcss/vite": "^4.1.10",
25+
"@tanstack/table-core": "^8.21.3",
2326
"@types/md5": "^2.3.5",
2427
"autoprefixer": "^10.4.21",
25-
"bits-ui": "1.8.0",
28+
"bits-ui": "2.8.0",
2629
"clsx": "^2.1.1",
27-
"lucide-svelte": "^0.512.0",
28-
"mode-watcher": "^1.0.7",
30+
"embla-carousel-svelte": "^8.6.0",
31+
"layerchart": "2.0.0-next.22",
32+
"lucide-svelte": "^0.516.0",
33+
"mode-watcher": "^1.0.8",
34+
"paneforge": "1.0.0-next.5",
2935
"prettier": "^3.5.3",
30-
"prettier-plugin-svelte": "^3.3.3",
31-
"prettier-plugin-tailwindcss": "^0.6.11",
32-
"svelte": "^5.28.2",
36+
"prettier-plugin-svelte": "^3.4.0",
37+
"prettier-plugin-tailwindcss": "^0.6.12",
38+
"svelte": "^5.34.3",
3339
"svelte-check": "^4.2.1",
34-
"svelte-sonner": "^0.3.28",
35-
"tailwind-merge": "^3.2.0",
40+
"svelte-sonner": "^1.0.5",
41+
"sveltekit-superforms": "^2.27.0",
42+
"tailwind-merge": "^3.3.1",
3643
"tailwind-variants": "^1.0.0",
37-
"tailwindcss": "^3.4.17",
38-
"tailwindcss-animate": "^1.0.7",
44+
"tailwindcss": "^4.1.10",
45+
"tw-animate-css": "^1.3.4",
3946
"typescript": "^5.8.3",
4047
"vaul-svelte": "1.0.0-next.7",
4148
"vite": "^6.3.5"
4249
},
4350
"dependencies": {
4451
"@friendofsvelte/tipex": "0.0.7",
52+
"@tanstack/match-sorter-utils": "^8.19.4",
53+
"formsnap": "^2.0.1",
4554
"md5": "^2.3.0",
46-
"posthog-js": "^1.249.4",
55+
"posthog-js": "^1.253.4",
4756
"svelte-persisted-store": "^0.12.0"
4857
}
4958
}

0 commit comments

Comments
 (0)