feat: use hosted org icons instead of embedded svg

Chia-Network · Jan 9, 2022 · 978e59a · 978e59a
1 parent 6d6cbd2
commit 978e59a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/controllers/organization.controller.js b/src/controllers/organization.controller.js
@@ -19,19 +19,15 @@ export const findAll = async (req, res) => {
     ...(await Organization.getHomeOrg()),
     '35f92331-c8d7-4e9e-a8d2-cd0a86cbb2cf': {
       name: 'chili',
-      icon: await loadFileIntoString('src/assets/organizationIcons/chili.svg'),
+      icon: 'https://climate-warehouse.s3.us-west-2.amazonaws.com/public/orgs/chili.svg',
     },
     'fbffae6b-0203-4ac0-a08b-1551b730783b': {
       name: 'belgium',
-      icon: await loadFileIntoString(
-        'src/assets/organizationIcons/belgium.svg',
-      ),
+      icon: 'https://climate-warehouse.s3.us-west-2.amazonaws.com/public/orgs/belgium.svg',
     },
     '70150fde-57f6-44a6-9486-1fef49528475': {
       name: 'bulgaria',
-      icon: await loadFileIntoString(
-        'src/assets/organizationIcons/bulgaria.svg',
-      ),
+      icon: 'https://climate-warehouse.s3.us-west-2.amazonaws.com/public/orgs/bulgaria.svg',
     },
   });
 };
diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js
@@ -2,6 +2,7 @@ import _ from 'lodash';
 
 import { uuid as uuidv4 } from 'uuidv4';
 import { sequelize } from '../models/database';
+
 import {
   Staging,
   ProjectMock,
@@ -105,13 +106,13 @@ export const findAll = async (req, res) => {
 
   const query = {
     attributes: columnsList,
-    include: [
+    include: getRequestedForignModels(req.query.columns, [
       ProjectLocation,
       Qualification,
       Vintage,
       CoBenefit,
       RelatedProject,
-    ],
+    ]),
   };
 
   return res.json(

diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -25,7 +25,7 @@ class Organization extends Model {
     return {
       'f1c54511-865e-4611-976c-7c3c1f704662': {
         name: 'Chia',
-        icon: await loadFileIntoString('src/assets/organizationIcons/me.svg'),
+        icon: 'https://climate-warehouse.s3.us-west-2.amazonaws.com/public/orgs/me.svg',
         writeAccess: true,
       },
     };