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

More various fixes #322

Merged
merged 3 commits into from
Dec 4, 2024
Merged

More various fixes #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6121131
More various fixes
Samuel-Therrien-Beslogic Dec 3, 2024
0f97619
Merge branch 'main' into more-various-small-changes
Samuel-Therrien-Beslogic Dec 4, 2024
62a29e2
Merge branch 'main' into more-various-small-changes
Samuel-Therrien-Beslogic Dec 4, 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
2 changes: 1 addition & 1 deletion canopeum_frontend/src/components/social/PostCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const PostCard = ({ post, showActions }: Props) => {
/>
</Link>
<div className='d-flex flex-column'>
<h6 className='text-uppercase fw-bold mb-1'>
<h6 className='fw-bold mb-1'>
<Link to={appRoutes.siteSocial(post.site.id)}>{post.site.name}</Link>
</h6>
<Link className='text-muted initialism' to={appRoutes.postDetail(post.id)}>
Expand Down
1 change: 0 additions & 1 deletion canopeum_frontend/src/locale/en/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default {
'table-row-13': 'Types of seeds collected',
'last-update': 'Last Update',
visitors: 'Visitors',
sponsored: 'Sponsored',
'unnamed-site': 'Unnamed site',
'site-save-success': 'Site saved successfully',
'site-save-error': 'Error saving Site',
Expand Down
1 change: 0 additions & 1 deletion canopeum_frontend/src/locale/fr/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default {
'table-row-13': 'Types de graines collectées',
'last-update': 'Dernière Mise à Jour',
visitors: 'Visiteurs',
sponsored: 'Sponsorisé',
'unnamed-site': 'Site sans nom',
'site-save-success': 'Site saved successfully',
'site-save-error': 'Error saving Site',
Expand Down
6 changes: 1 addition & 5 deletions canopeum_frontend/src/pages/UserManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ const UserManagement = () => {
<div className='col-12 col-md-5 col-lg-3 pb-4'>
<div className='settings-left-nav-menu card py-3 px-4'>
<div className='py-3 d-none d-md-block'>
<h4 className='text-center'>
{currentUser?.role === 'MegaAdmin'
? 'CANOPEUM'
: currentUser?.username}
</h4>
<h4 className='text-center'>{currentUser?.username}</h4>
</div>

<div className='d-flex flex-column gap-2'>{tabsDisplay()}</div>
Expand Down
Loading