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

Update layout auth after significant changes in upstream #10

Merged
merged 13 commits into from
Nov 21, 2024
Merged

Update layout auth after significant changes in upstream #10

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
100ca6a
fix: updated name, text and removed library from main page
ymijsters Oct 15, 2024
4b72418
fix: update logo on sign-up page
ymijsters Oct 15, 2024
7ef032d
fix: initial fix for redirect issue
ymijsters Oct 16, 2024
5dba993
fix: resolve merge conflicts merging main after rebase
ymijsters Oct 24, 2024
5a9d02a
fix: re-enable husky
ymijsters Nov 1, 2024
df2462b
Merge branch 'main' into 2-update-layout-after-rebase
ymijsters Nov 1, 2024
4590bb2
Merge branch 'main' into 2-update-layout-after-rebase
ymijsters Nov 13, 2024
cc9c504
fix: update redirect button text
ymijsters Nov 20, 2024
f71b2ff
Merge branch 'main' into 2-update-layout-after-rebase
ymijsters Nov 21, 2024
aa41499
fix: add newline after husky files
ymijsters Nov 21, 2024
d1765d6
fix: update graasp references to lnco.ai in other langs
ymijsters Nov 21, 2024
046a3e3
fix: remove vite file generated by local test
ymijsters Nov 21, 2024
76db70c
fix: add vite config timestamp file to gitignore
ymijsters Nov 21, 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
6 changes: 5 additions & 1 deletion .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
npx --no-install commitlint --edit "$1"

#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
6 changes: 5 additions & 1 deletion .husky/post-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
git status

#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

git status
5 changes: 4 additions & 1 deletion .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
yarn pre-commit
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn prettier:check && yarn lint
5 changes: 4 additions & 1 deletion .husky/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint
yarn build
yarn build
ymijsters marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 3 additions & 3 deletions src/components/BrandingLogo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GraaspLogo } from '@graasp/ui';
import { AccentColors, GraaspLogo } from '@graasp/ui';

import { Stack, Typography, useTheme } from '@mui/material';

Expand All @@ -9,8 +9,8 @@ export function BrandingLogo() {
<div style={{ position: 'absolute', top: 10, left: 10 }}>
<Stack m={1} direction="row" justifyContent="center" alignItems="center">
<GraaspLogo height={50} sx={{ fill: theme.palette.primary.main }} />
<Typography variant="h2" color="primary">
Graasp
<Typography variant="h2" color={AccentColors.builder}>
LNCO.ai
</Typography>
ymijsters marked this conversation as resolved.
Show resolved Hide resolved
</Stack>
</div>
Expand Down
14 changes: 1 addition & 13 deletions src/components/LeftContentContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
AccentColors,
AnalyticsIcon,
BuildIcon,
LibraryIcon,
PlayIcon,
} from '@graasp/ui';
import { AccentColors, AnalyticsIcon, BuildIcon, PlayIcon } from '@graasp/ui';

import { Box, Stack } from '@mui/material';

Expand Down Expand Up @@ -69,12 +63,6 @@ export function LeftContentContainer({ children }: Props): JSX.Element {
name={t(AUTH.PLAYER_BACKGROUND_TEXT_PLATFORM)}
color={AccentColors.player}
/>
<PlatformContent
Icon={LibraryIcon}
text={t(AUTH.LIBRARY_BACKGROUND_TEXT)}
name={t(AUTH.LIBRARY_BACKGROUND_TEXT_PLATFORM)}
color={AccentColors.library}
/>
<PlatformContent
Icon={AnalyticsIcon}
text={t(AUTH.ANALYTICS_BACKGROUND_TEXT)}
Expand Down
5 changes: 3 additions & 2 deletions src/components/register/Register.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
MIN_USERNAME_LENGTH,
RecaptchaAction,
} from '@graasp/sdk';
import { GraaspLogo } from '@graasp/ui';

import { LoadingButton } from '@mui/lab';
import { FormControl, LinearProgress, Stack } from '@mui/material';
Expand Down Expand Up @@ -152,8 +153,8 @@ function RegisterInnerComponent() {

return (
<Stack direction="column" alignItems="center" spacing={2}>
<Stack spacing={1}>
<img alt="LNCO Logo" height="200" src="/lnco-logo.png" />
<Stack spacing={1} alignItems="center">
<GraaspLogo height={90} />
<Typography
variant="h4"
component="h2"
Expand Down
8 changes: 4 additions & 4 deletions src/langs/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
"PASSWORD_DO_NOT_MATCH_ERROR": "The passwords do not match.",
"PASSWORD_SUCCESS_ALERT": "You successfully signed in. You will be redirected soon.",
"PASSWORD_INPUT_PLACEHOLDER": "Password",
"BUILDER_BACKGROUND_TEXT": "Create your own learning activities with the",
"BUILDER_BACKGROUND_TEXT": "Create your own experiments and run them online using the",
"BUILDER_BACKGROUND_TEXT_PLATFORM": "Builder",
"PLAYER_BACKGROUND_TEXT": "Engage your students in your activities with the",
"PLAYER_BACKGROUND_TEXT": "Reach your subjects with your experiments through the",
ymijsters marked this conversation as resolved.
Show resolved Hide resolved
"PLAYER_BACKGROUND_TEXT_PLATFORM": "Player",
"LIBRARY_BACKGROUND_TEXT": "Discover and share Open Educational Resources in our",
"LIBRARY_BACKGROUND_TEXT_PLATFORM": "Library",
"ANALYTICS_BACKGROUND_TEXT": "Gain valuable insights and explore dashboards with",
"ANALYTICS_BACKGROUND_TEXT": "Gain valuable insights and export your data",
"ANALYTICS_BACKGROUND_TEXT_PLATFORM": "Analytics",
"LOGIN_METHODS_DIVIDER": "or",
"REQUEST_PASSWORD_RESET_LINK": "Forgot password?",
Expand Down Expand Up @@ -89,5 +89,5 @@
"INVALID_TOKEN_PROVIDED_DESCRIPTION": "No token was provided or the provided token is expired. Click the button below to generate a request to reset your password.",
"REDIRECTION_TITLE": "Welcome back, {{name}}",
"REDIRECTION_DESCRIPTION": "You are logged in.",
"REDIRECTION_BUTTON": "Go to Graasp"
"REDIRECTION_BUTTON": "Go to LNCO.ai"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Branding inconsistencies found in German translation and package metadata

Several instances still reference "Graasp" and need to be updated to "LNCO.ai":

  • src/langs/de.json: "REDIRECTION_BUTTON" still shows "Gehe zu Graasp"
  • src/langs/ar.json: Two strings still contain "Graasp" references
  • Package metadata files still use Graasp branding:
    • package.json: package name, author, and dependencies
    • public/manifest.json: app name and short name
    • renovate.json: configuration reference

The LNCO.ai branding is consistently capitalized as "LNCO.ai" in all translated strings where it has been updated.

🔗 Analysis chain

Verify complete rebranding from Graasp to LNCO.ai

While this button text has been updated, we should ensure all Graasp references have been updated to LNCO.ai for consistency.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any remaining "Graasp" references that might need updating
rg -i "graasp" --type json

# Also check for consistency in LNCO.ai capitalization
rg -i "lnco" --type json

Length of output: 3303

}
4 changes: 2 additions & 2 deletions src/langs/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"PASSWORD_INPUT_PLACEHOLDER": "Mot de passe",
"BUILDER_BACKGROUND_TEXT": "Créer vos propres activités d'apprentissage dans le",
"BUILDER_BACKGROUND_TEXT_PLATFORM": "Builder",
"PLAYER_BACKGROUND_TEXT": "Impliquez vos étudiants dans des activités interactives avec le",
"PLAYER_BACKGROUND_TEXT": "Atteignez vos sujets avec vos expériences à travers le",
"PLAYER_BACKGROUND_TEXT_PLATFORM": "Player",
"LIBRARY_BACKGROUND_TEXT": "Découvrir et partager des Resources éducatives libres dans notre",
"LIBRARY_BACKGROUND_TEXT_PLATFORM": "Library",
Expand Down Expand Up @@ -85,5 +85,5 @@
"INVALID_TOKEN_PROVIDED_DESCRIPTION": "Aucun jeton n'a été fourni ou le jeton fourni a expiré. Cliquez sur le bouton ci-dessous pour générer une demande de réinitialisation de votre mot de passe.",
"REDIRECTION_TITLE": "Bienvenue, {{name}}",
"REDIRECTION_DESCRIPTION": "Vous êtes connecté.",
"REDIRECTION_BUTTON": "Aller à Graasp"
"REDIRECTION_BUTTON": "Aller à LNCO.ai"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Branding update requires attention: Multiple "Graasp" references need to be updated

The branding change from "Graasp" to "LNCO.ai" is incomplete. Several files still contain references to "Graasp" that need to be updated:

  • Configuration files still use "Graasp" in environment variables and package names
  • UI components are still importing and using GraaspLogo component
  • Translation files contain mixed branding ("Graasp" in Arabic translations while "LNCO.ai" in others)
  • Test files and fixtures contain "Graasp" references
  • Mobile app links and manifest still use "Graasp" branding

Please update all these references to maintain consistent branding across the codebase.

🔗 Analysis chain

Verify branding consistency across the codebase.

The branding update from "Graasp" to "LNCO.ai" is correct. Let's verify the consistency of this branding change across all files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any remaining references to "Graasp" that might need updating

# Search for "Graasp" in all files
echo "Searching for remaining 'Graasp' references:"
rg -i "graasp" --type json --type typescript --type javascript --type tsx

# Search for inconsistent "LNCO.ai" capitalization
echo -e "\nChecking for inconsistent 'LNCO.ai' capitalization:"
rg -i "lnco\.ai" --type json --type typescript --type javascript --type tsx

Length of output: 451

Script:

#!/bin/bash
# Let's try with simpler commands without file type restrictions
# Search for any remaining references to "Graasp"
echo "Searching for remaining 'Graasp' references:"
rg -i "graasp"

# Search for all variations of LNCO.ai
echo -e "\nChecking for 'LNCO.ai' variations:"
rg -i "lnco\.ai"

Length of output: 67251

Script:

#!/bin/bash
# Let's check for any remaining references to "Graasp" in the UI components and translations
# that might need to be updated to "LNCO.ai"

# Search for "Graasp" in UI components and translation files
echo "Searching for 'Graasp' in UI components and translations:"
fd -e tsx -e ts -e json | xargs rg -i "graasp" -l

# Check for inconsistent capitalization of "LNCO.ai" in UI components and translations
echo -e "\nChecking for inconsistent capitalization of 'LNCO.ai':"
fd -e tsx -e ts -e json | xargs rg -i "lnco\.ai" -A 1 -B 1

Length of output: 7726

}
Loading