Merge pull request #144 from ror-community/dev

Merge dev to staging: Base URL var in head
ror-community · Jan 5, 2023 · 93ee7f8 · 93ee7f8
2 parents 1d1ddf3 + 4d34e57
commit 93ee7f8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 2 deletions.
diff --git a/.env.dev b/.env.dev
@@ -1,2 +1,3 @@
 API_URL=https://api.dev.ror.org
 SENTRY_DSN=https://[email protected]/1422597
+BASE_URL=https://dev.ror.org
diff --git a/.env.production b/.env.production
@@ -1,2 +1,3 @@
 API_URL=https://api.ror.org
 SENTRY_DSN=https://[email protected]/1422597
+BASE_URL=https://ror.org
diff --git a/.env.staging b/.env.staging
@@ -1,2 +1,3 @@
 API_URL=https://api.staging.ror.org
 SENTRY_DSN=https://[email protected]/1422597
+BASE_URL=https://staging.ror.org
diff --git a/app/index.html b/app/index.html
@@ -18,7 +18,7 @@
 
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css" type='text/css'>
 
-    <link rel="stylesheet" href="https://ror.org/css/hugo-ror.css?v4">
+    <link rel="stylesheet" href="{{content-for 'baseURL'}}/css/hugo-ror.css?v4">
     <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">

diff --git a/config/environment.js b/config/environment.js
@@ -2,7 +2,7 @@
 
 module.exports = function(environment) {
   const pkg = require('../package.json');
-  
+
   let ENV = {
     modulePrefix: 'ror-app',
     environment,
@@ -20,6 +20,7 @@ module.exports = function(environment) {
     },
 
     API_URL: process.env.API_URL || "https://api.ror.org",
+    BASE_URL: process.env.BASE_URL || null,
     SENTRY_DSN: process.env.SENTRY_DSN || null,
     VERSION: pkg.version,
     APP_NAME: pkg.name,

diff --git a/lib/base-url/index.js b/lib/base-url/index.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  name: require('./package').name,
+
+  isDevelopingAddon() {
+    return true;
+  },
+  contentFor: function(type, config){
+    if (type === 'baseURL'){
+      return `${config.BASE_URL}`
+      ;
+    }
+  }
+};
diff --git a/lib/base-url/package.json b/lib/base-url/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "base-url",
+  "keywords": [
+    "ember-addon"
+  ]
+}
diff --git a/package.json b/package.json
@@ -66,5 +66,10 @@
   "dependencies": {
     "@sentry/browser": "^5.10.2",
     "@sentry/integrations": "^5.10.2"
+  },
+  "ember-addon": {
+    "paths": [
+      "lib/base-url"
+    ]
   }
 }