Merge pull request #108 from ror-community/staging

Merge staging to master
ror-community · Oct 27, 2022 · e5ddd6b · e5ddd6b
2 parents 1a7e94e + 57b1840
commit e5ddd6b
Show file tree

Hide file tree

Showing 11 changed files with 214 additions and 332 deletions.
diff --git a/app/components/organization-item.js b/app/components/organization-item.js
@@ -3,6 +3,7 @@ import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Component.extend({
+  INACTIVE_STATUSES: ['inactive', 'withdrawn'],
   fundref: null,
   grid: null,
   isni: null,
@@ -15,11 +16,12 @@ export default Component.extend({
   isSearch: computed('router.currentURL', function() {
     return this.router.currentURL.includes("search")
   }),
+  inactiveStatus: false,
 
   // Convert label array into a dictionary with relationship type as key
   // for variable fields in template
   convertRelationships(relationships){
-    let formattedRelationships = {Parent:[], Child:[], Related:[]};
+    let formattedRelationships = {Parent:[], Child:[], Related:[], Successor:[], Predecessor:[]};
     for (let i = 0; i < relationships.length; i++){
       formattedRelationships[relationships[i]["type"]].push({"label": relationships[i]["label"], "id": relationships[i]["id"]});
     }
@@ -33,6 +35,9 @@ export default Component.extend({
           this.set('notFoundMsg', this.model.response_status[0])
         }
     }
+    if(this.INACTIVE_STATUSES.indexOf(this.model.get('status')) > -1) {
+      this.set('inactiveStatus', true)
+    }
     if(this.notFound === false){
       if(this.model.get('relationships')) {
         this.set('relationshipsCount', this.model.get('relationships').length)
@@ -52,11 +57,15 @@ export default Component.extend({
       }
       if (this.model.get('external_ids.ISNI')) {
         if (this.model.get('external_ids.ISNI').preferred){
-          let isni = this.model.get('external_ids.ISNI').preferred.replace(/-|\s/g,"");
-          this.set('isni', isni);
+          let display_isni = this.model.get('external_ids.ISNI').preferred;
+          let link_isni = this.model.get('external_ids.ISNI').preferred.replace(/-|\s/g,"");
+          this.set('display_isni', display_isni);
+          this.set('link_isni', link_isni);
       } else {
-          let isni = this.model.get('external_ids.ISNI').all.get('firstObject').replace(/-|\s/g,"");
-          this.set('isni', isni);
+          let display_isni = this.model.get('external_ids.ISNI').all.get('firstObject');
+          let link_isni = this.model.get('external_ids.ISNI').all.get('firstObject').replace(/-|\s/g,"");
+          this.set('display_isni', display_isni);
+          this.set('link_isni', link_isni);
         }
       }
       if (this.model.get('external_ids.FundRef')) {

diff --git a/app/index.html b/app/index.html
@@ -14,12 +14,14 @@
     <link href="//cdnjs.cloudflare.com/ajax/libs/cc-icons/1.2.1/css/cc-icons.min.css" rel="stylesheet">
     <link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
 
-    
+
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css"type='text/css'>
-    <link rel="stylesheet" href="https://ror.org/css/hugo-ror.css?v=4" type='text/css'>
+    <!--Change back to prod CSS URL after website refresh is deployed-->
+    <link rel="stylesheet" href="https://dev.ror.org/css/hugo-ror.css?v=4" type='text/css'>
+    <link rel="stylesheet" href="{{rootURL}}assets/ror-app.css" type='text/css'>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
-    
+
     {{content-for "head-footer"}}
   </head>
   <body>

diff --git a/app/models/organization.js b/app/models/organization.js
@@ -15,5 +15,6 @@ export default DS.Model.extend({
   country: DS.attr(),
   addresses: DS.attr(),
   relationships: DS.attr(),
+  status: DS.attr('string')
 });
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -1,92 +1,50 @@
-@import "ember-bootstrap/bootstrap";
-
-/*!
-
- =========================================================
- * Now UI Kit Pro - v1.2.2
- =========================================================
-
- * Product Page: https://www.creative-tim.com/product/now-ui-kit-pro
- * Copyright 2018 Creative Tim (http://www.creative-tim.com)
-
- * Designed by www.invisionapp.com Coded by www.creative-tim.com
-
- =========================================================
-
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
- */
-
- @import 'now-ui-kit/variables';
- @import 'now-ui-kit/mixins';
-
- // Plugins CSS
- @import 'now-ui-kit/plugins/plugin-bootstrap-switch';
- @import 'now-ui-kit/plugins/plugin-nouislider';
- @import 'now-ui-kit/plugins/plugin-bootstrap-select';
- @import 'now-ui-kit/plugins/plugin-tagsinput';
- @import 'now-ui-kit/plugins/plugin-fileupload';
- @import 'now-ui-kit/plugins/plugin-datetimepicker';
-
- // Core CSS
- @import 'now-ui-kit/nucleo-outline';
-
- @import 'now-ui-kit/alerts';
- @import 'now-ui-kit/checkboxes-radio';
- @import 'now-ui-kit/badges';
- @import 'now-ui-kit/pagination';
- @import 'now-ui-kit/typography';
- @import 'now-ui-kit/misc';
-
- @import 'now-ui-kit/buttons';
- @import 'now-ui-kit/social-buttons';
- @import 'now-ui-kit/inputs';
- @import 'now-ui-kit/progress';
- @import 'now-ui-kit/pills';
- @import 'now-ui-kit/pills-extend';
-
- // components
- @import 'now-ui-kit/tabs';
- @import 'now-ui-kit/navbar';
- @import 'now-ui-kit/navbar-extend';
- @import 'now-ui-kit/dropdown';
- @import 'now-ui-kit/dropdown-extend';
- @import 'now-ui-kit/images';
- @import 'now-ui-kit/popups';
- @import 'now-ui-kit/tables';
- @import 'now-ui-kit/info-areas';
- @import 'now-ui-kit/media';
- @import 'now-ui-kit/modals';
- @import 'now-ui-kit/modals-extend';
- @import 'now-ui-kit/carousel';
- @import 'now-ui-kit/footers';
-
- // cards
- @import 'now-ui-kit/cards';
- @import 'now-ui-kit/cards/card-extend';
- @import 'now-ui-kit/cards/card-background';
- @import 'now-ui-kit/cards/card-blog';
- @import 'now-ui-kit/cards/card-contact';
- @import 'now-ui-kit/cards/card-fashion';
- @import 'now-ui-kit/cards/card-form-horizontal';
- @import 'now-ui-kit/cards/card-no-shadow';
- @import 'now-ui-kit/cards/card-plain';
- @import 'now-ui-kit/cards/card-pricing';
- @import 'now-ui-kit/cards/card-profile';
- @import 'now-ui-kit/cards/card-product';
- @import 'now-ui-kit/cards/card-raised';
- @import 'now-ui-kit/cards/card-signup';
- @import 'now-ui-kit/cards/card-testimonials';
-
-
- // example pages and sections
- @import 'now-ui-kit/example-pages';
- @import 'now-ui-kit/sections';
- @import 'now-ui-kit/sections-extend';
-
- @import 'now-ui-kit/responsive';
-
-  // customizations
-  @import 'ror';
-  @import 'site';
-
+$green: #53baa1;
+$dark-grey: #505759;
+$light-grey: #efefef;
+$orange: #da3200;
+$mustard: #e89005;
+$beige: #d3bdb0;
+$black: #293030;
+
+
+
+$phone-width: 420px;
+$tablet-width: 768px;
+$desktop-width: 1024px;
+
+// override, color links
+.card {
+  h1, h2 {
+    font-size: 2rem;
+    margin-top: 0;
+    @media screen and (max-width:$phone-width) {
+        font-size: 1.6rem;
+    }
+  }
+  h3 {
+    font-size: 1.3rem;
+    text-transform: uppercase;
+  }
+}
+
+.badge {
+    padding: 8px 12px;
+    font-size: .8em;
+    float: right;
+    @media screen and (max-width:$phone-width) {
+        float: left;
+        margin-top: .5rem
+    }
+}
+
+.badge-status{
+    border-color: $orange;
+    background-color: $orange;
+    color: #FFF;
+}
+
+.ror-id {
+    @media screen and (max-width:$phone-width) {
+        display: none;
+    }
+}
diff --git a/app/styles/ror.scss b/app/styles/ror.scss
diff --git a/app/styles/site.scss b/app/styles/site.scss
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -3,4 +3,5 @@
 </div>
 
 {{application-subscribe}}
+{{application-socials}}
 {{application-footer}}