Skip to content

Commit

Permalink
fix: color issues and prefix for new player (#1586)
Browse files Browse the repository at this point in the history
* fix: color isses and prefix for new player

* fix: issues

* fix: revert changes to use new client and update deps

* fix: remove leftover env vars
  • Loading branch information
spaenleh authored Nov 29, 2024
1 parent 71e776b commit d93fa3d
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Cypress CI
on:
push:
branches:
- 'main'
- "main"
merge_group:
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: graasp/graasp-deploy/.github/actions/deploy-s3@v1
# Replace input build-folder or version if needed
with:
build-folder: 'build'
build-folder: "build"
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }}
aws-region: ${{ secrets.AWS_REGION_DEV }}
aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: graasp/graasp-deploy/.github/actions/deploy-s3@v1
# Replace input build-folder or version if needed
with:
build-folder: 'build'
build-folder: "build"
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }}
aws-region: ${{ secrets.AWS_REGION_PROD }}
aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: graasp/graasp-deploy/.github/actions/deploy-s3@v1
# Replace input build-folder or version if needed
with:
build-folder: 'build'
build-folder: "build"
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGE }}
aws-region: ${{ secrets.AWS_REGION_STAGE }}
aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }}
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Graasp Builder

[![GitHub Release](https://img.shields.io/github/release/graasp/graasp-builder)]()
![GitHub Release](https://img.shields.io/github/release/graasp/graasp-builder)
![Cypress CI](https://github.com/graasp/graasp-builder/actions/workflows/ci.yml/badge.svg?branch=main)
![typescript version](https://img.shields.io/github/package-json/dependency-version/graasp/graasp-builder/dev/typescript)
[![gitlocalized](https://gitlocalize.com/repo/8885/whole_project/badge.svg)](https://gitlocalize.com/repo/8885/whole_project?utm_source=badge)
Expand All @@ -17,21 +17,21 @@
2. Run the API at `localhost:3000`
3. Set the following environnement variables in `.env.development`

```sh
VITE_PORT=3111
VITE_GRAASP_API_HOST=http://localhost:3000
VITE_SHOW_NOTIFICATIONS=true
VITE_GRAASP_AUTH_HOST=http://localhost:3001
VITE_GRAASP_PLAYER_HOST=http://localhost:3112
VITE_GRAASP_ANALYZER_HOST=http://localhost:3113
VITE_GRAASP_LIBRARY_HOST=http://localhost:3115
VITE_GRAASP_ACCOUNT_HOST=http://localhost:3114

# in prod, it is https://go.graasp.org
VITE_GRAASP_REDIRECTION_HOST=http://localhost:3000/items/short-links
VITE_H5P_INTEGRATION_URL=
VITE_VERSION=latest-dev
```
```sh
VITE_PORT=3111
VITE_GRAASP_API_HOST=http://localhost:3000
VITE_SHOW_NOTIFICATIONS=true
VITE_GRAASP_AUTH_HOST=http://localhost:3001
VITE_GRAASP_PLAYER_HOST=http://localhost:3112
VITE_GRAASP_ANALYZER_HOST=http://localhost:3113
VITE_GRAASP_LIBRARY_HOST=http://localhost:3115
VITE_GRAASP_ACCOUNT_HOST=http://localhost:3114/account

# in prod, it is https://go.graasp.org
VITE_GRAASP_REDIRECTION_HOST=http://localhost:3000/items/short-links
VITE_H5P_INTEGRATION_URL=
VITE_VERSION=latest-dev
```

4. Run `yarn start`. The client should be accessible at `localhost:3111`

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"@emotion/cache": "11.13.1",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@graasp/chatbox": "3.3.0",
"@graasp/chatbox": "3.3.1",
"@graasp/map": "1.19.0",
"@graasp/query-client": "5.6.0",
"@graasp/sdk": "5.3.1",
"@graasp/stylis-plugin-rtl": "2.2.0",
"@graasp/translations": "1.42.0",
"@graasp/ui": "5.4.2",
"@graasp/ui": "5.4.4",
"@mui/icons-material": "6.1.7",
"@mui/lab": "6.0.0-beta.15",
"@mui/material": "6.1.7",
Expand Down
2 changes: 0 additions & 2 deletions src/components/main/DownloadButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ export const DownloadButton = ({ item }: Props): JSX.Element => {
isLoading={isDownloading}
title={translateBuilder(BUILDER.DOWNLOAD_ITEM_BUTTON)}
ariaLabel={translateBuilder(BUILDER.DOWNLOAD_ITEM_BUTTON)}
color="primary"
loaderSize={10}
/>
</span>
);
Expand Down
8 changes: 2 additions & 6 deletions src/components/main/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,8 @@ export const Main = ({ children }: Props): JSX.Element => {
id={APP_NAVIGATION_PLATFORM_SWITCH_ID}
selected={Platform.Builder}
platformsProps={platformProps}
color={
isMobile ? theme.palette.primary.main : theme.palette.secondary.main
}
accentColor={
isMobile ? theme.palette.secondary.main : theme.palette.primary.main
}
color={isMobile ? theme.palette.primary.main : 'white'}
accentColor={isMobile ? 'white' : theme.palette.primary.main}
/>
}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/main/NewItemButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ const NewItemButton = ({
{type === 'icon' ? (
<IconButton
onClick={handleClickOpen}
color="secondary"
color="primary"
sx={{
background: theme.palette.primary.main,
'&:hover': { background: 'grey' },
}}
data-umami-event="new-item-icon-button"
>
<PlusIcon />
<PlusIcon color="white" />
</IconButton>
) : (
<Button
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/NotificationButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const NotificationButton = (): JSX.Element | null => {

return (
<MentionButton
color="secondary"
color="white"
badgeColor="primary"
useMentions={hooks.useMentions}
patchMentionFunction={patchMentionFunction}
Expand Down
8 changes: 4 additions & 4 deletions src/config/env.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const {
VITE_VERSION,
VITE_GRAASP_API_HOST,
VITE_GRAASP_DOMAIN,
VITE_GRAASP_ACCOUNT_HOST,
VITE_GRAASP_API_HOST,
VITE_GRAASP_AUTH_HOST,
VITE_GRAASP_PLAYER_HOST,
VITE_GRAASP_ANALYZER_HOST,
VITE_GRAASP_ACCOUNT_HOST,
VITE_GRAASP_LIBRARY_HOST,
VITE_GRAASP_PLAYER_HOST,
VITE_GRAASP_AUTH_HOST,
VITE_SHOW_NOTIFICATIONS,
VITE_GRAASP_ASSETS_URL,
VITE_H5P_INTEGRATION_URL,
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1563,12 +1563,12 @@ __metadata:
languageName: node
linkType: hard

"@graasp/chatbox@npm:3.3.0":
version: 3.3.0
resolution: "@graasp/chatbox@npm:3.3.0"
"@graasp/chatbox@npm:3.3.1":
version: 3.3.1
resolution: "@graasp/chatbox@npm:3.3.1"
dependencies:
lodash.groupby: "npm:^4.6.0"
prism-react-renderer: "npm:^2.3.1"
prism-react-renderer: "npm:^2.4.0"
react-markdown: "npm:^9.0.1"
react-mentions: "npm:^4.4.10"
remark-breaks: "npm:^4.0.0"
Expand All @@ -1581,17 +1581,17 @@ __metadata:
"@graasp/stylis-plugin-rtl": "*"
"@graasp/translations": "*"
"@graasp/ui": "*"
"@mui/icons-material": ^5
"@mui/icons-material": ^5 || ^6.0.0
"@mui/lab": ^5.0.0-alpha.121
"@mui/material": ^5
"@mui/material": ^5 || ^6.0.0
"@tanstack/react-query": ^4
date-fns: ^3.2.0
i18next: ^23.7.0
date-fns: ^3.2.0 || ^4.0.0
i18next: ^23.7.0 || ^24.0.0
lucide-react: "*"
react: "*"
react-dom: "*"
react-i18next: ^13.0.0 || ^14.0.0 || ^15.0.0
checksum: 10/28e8b78901caec13a0416597754d09c4255d421597f9057da54838587ee5f0fd3bf46f1ec4ced1e40791315bb345a4f229385f02d008640128727325184ff998
checksum: 10/f53347a95a193e90f601f586fb22ca08fb23392e2d959546a64bb1040d1a8705e4508092f849941754a06a18a8d30332c7933c532c45c73e97f644dd41eb4c92
languageName: node
linkType: hard

Expand Down Expand Up @@ -1675,9 +1675,9 @@ __metadata:
languageName: node
linkType: hard

"@graasp/ui@npm:5.4.2":
version: 5.4.2
resolution: "@graasp/ui@npm:5.4.2"
"@graasp/ui@npm:5.4.4":
version: 5.4.4
resolution: "@graasp/ui@npm:5.4.4"
dependencies:
http-status-codes: "npm:2.3.0"
interweave: "npm:13.1.0"
Expand All @@ -1698,15 +1698,15 @@ __metadata:
"@mui/icons-material": ^6
"@mui/lab": ^6
"@mui/material": ^6
i18next: ^22.4.15 || ^23.0.0
i18next: ^22.4.15 || ^23.0.0 || ^24.0.0
katex: 0.16.11
lucide-react: ^0
react: ^18.0.0
react-dom: ^18.0.0
react-i18next: ^15.0.0
react-router-dom: ^6.11.0
stylis: ^4.1.3
checksum: 10/17a166897c951de64b4961ea8a8ee8c2541a7d714ba1d9339a4a9f145ca76eabe53524a53693772e68ac8bf8979622509424685fbce022f697f741499dcd6161
checksum: 10/569795cc77bbe839b929817b9ba72511f50374573f0c339252181ff333777de5594f95d72e2e2bc3509012f685a11672d3994d3a3776805276009085d221b151
languageName: node
linkType: hard

Expand Down Expand Up @@ -6399,13 +6399,13 @@ __metadata:
"@emotion/cache": "npm:11.13.1"
"@emotion/react": "npm:11.13.3"
"@emotion/styled": "npm:11.13.0"
"@graasp/chatbox": "npm:3.3.0"
"@graasp/chatbox": "npm:3.3.1"
"@graasp/map": "npm:1.19.0"
"@graasp/query-client": "npm:5.6.0"
"@graasp/sdk": "npm:5.3.1"
"@graasp/stylis-plugin-rtl": "npm:2.2.0"
"@graasp/translations": "npm:1.42.0"
"@graasp/ui": "npm:5.4.2"
"@graasp/ui": "npm:5.4.4"
"@mui/icons-material": "npm:6.1.7"
"@mui/lab": "npm:6.0.0-beta.15"
"@mui/material": "npm:6.1.7"
Expand Down Expand Up @@ -9502,7 +9502,7 @@ __metadata:
languageName: node
linkType: hard

"prism-react-renderer@npm:^2.3.1":
"prism-react-renderer@npm:^2.4.0":
version: 2.4.0
resolution: "prism-react-renderer@npm:2.4.0"
dependencies:
Expand Down

0 comments on commit d93fa3d

Please sign in to comment.