Skip to content

Commit

Permalink
Proper site type icons (#327)
Browse files Browse the repository at this point in the history
- Removed all unused icons
- Minified all svgs
- Map pins are now generic, they can take any element, whether text or icons
- Obsoleted `canopeum_frontend/src/components/CustomIconBadge.tsx`, `IconBadge` can now take a children
- Created a `SiteTypeIcon` component dedicated to mapping the side id to its appropriate icon, whether its material or custom
- Remove barely used `material-icons` package (our material icons are currently loaded through Google's CDN)
  • Loading branch information
Samuel-Therrien-Beslogic authored Dec 10, 2024
1 parent 6dbb3cc commit 1570205
Show file tree
Hide file tree
Showing 57 changed files with 275 additions and 558 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"!unused-imports/no-unused-imports",
"!autofix/no-debugger",
"!autofix/no-unused-vars",
"!@eslint-community/eslint-comments/no-unused-disable",
"*"
],
"eslint.rules.customizations": [
Expand Down
7 changes: 0 additions & 7 deletions canopeum_backend/canopeum_backend/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,6 @@ class Internationalization(models.Model):
class Sitetype(models.Model):
name = models.ForeignKey(Internationalization, models.DO_NOTHING, blank=True, null=True)

@override
def delete(self, using=None, keep_parents=False):
# TODO: FIXME, should Sitetype subclass Asset
# or should it have a foreignkey asset like PostAsset???
self.asset.delete() # type:ignore[attr-defined] # pyright: ignore[reportAttributeAccessIssue]
return super().delete(using, keep_parents)


class Site(models.Model):
name = models.TextField()
Expand Down
7 changes: 0 additions & 7 deletions canopeum_frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion canopeum_frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"i18next-http-backend": "^2.5.0",
"jwt-decode": "4.0.0",
"maplibre-gl": "^4.1.1",
"material-icons": "^1.13.12",
"nswag": "^14.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
3 changes: 0 additions & 3 deletions canopeum_frontend/src/assets/icons/add-tree-regular.svg

This file was deleted.

9 changes: 0 additions & 9 deletions canopeum_frontend/src/assets/icons/canopeum-regular.svg

This file was deleted.

26 changes: 4 additions & 22 deletions canopeum_frontend/src/assets/icons/facebook-contact-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions canopeum_frontend/src/assets/icons/facebook-regular.svg

This file was deleted.

This file was deleted.

27 changes: 4 additions & 23 deletions canopeum_frontend/src/assets/icons/instagram-contact-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions canopeum_frontend/src/assets/icons/instagram-regular.svg

This file was deleted.

Loading

0 comments on commit 1570205

Please sign in to comment.