From 25f73bf81b29c63c4418d19c9e2dc8eafbb7f76d Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Sat, 25 Nov 2017 01:20:35 -0700
Subject: [PATCH] Project apikeys

---
 app/authenticated/project/apikeys/account/template.hbs |  2 +-
 .../apikeys/{environment => project}/controller.js     |  0
 .../project/apikeys/{environment => project}/route.js  |  0
 .../apikeys/{environment => project}/template.hbs      |  8 ++++----
 app/router.js                                          | 10 +++++-----
 lib/shared/addon/endpoint/service.js                   |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename app/authenticated/project/apikeys/{environment => project}/controller.js (100%)
 rename app/authenticated/project/apikeys/{environment => project}/route.js (100%)
 rename app/authenticated/project/apikeys/{environment => project}/template.hbs (76%)

diff --git a/app/authenticated/project/apikeys/account/template.hbs b/app/authenticated/project/apikeys/account/template.hbs
index 564931c86..a720a65db 100644
--- a/app/authenticated/project/apikeys/account/template.hbs
+++ b/app/authenticated/project/apikeys/account/template.hbs
@@ -1,7 +1,7 @@
 <section class="header has-tabs clearfix p-0">
   <ul class="tab-nav">
     <li>{{#link-to "authenticated.project.apikeys.account"}}{{t 'apiPage.account.header'}}{{/link-to}}</li>
-    <li>{{#link-to "authenticated.project.apikeys.environment"}}{{t 'apiPage.header'}}{{/link-to}}</li>
+    <li>{{#link-to "authenticated.project.apikeys.project"}}{{t 'apiPage.header'}}{{/link-to}}</li>
   </ul>
 
   <div class="right-buttons">
diff --git a/app/authenticated/project/apikeys/environment/controller.js b/app/authenticated/project/apikeys/project/controller.js
similarity index 100%
rename from app/authenticated/project/apikeys/environment/controller.js
rename to app/authenticated/project/apikeys/project/controller.js
diff --git a/app/authenticated/project/apikeys/environment/route.js b/app/authenticated/project/apikeys/project/route.js
similarity index 100%
rename from app/authenticated/project/apikeys/environment/route.js
rename to app/authenticated/project/apikeys/project/route.js
diff --git a/app/authenticated/project/apikeys/environment/template.hbs b/app/authenticated/project/apikeys/project/template.hbs
similarity index 76%
rename from app/authenticated/project/apikeys/environment/template.hbs
rename to app/authenticated/project/apikeys/project/template.hbs
index aa7e80e7f..1763ce179 100644
--- a/app/authenticated/project/apikeys/environment/template.hbs
+++ b/app/authenticated/project/apikeys/project/template.hbs
@@ -1,11 +1,11 @@
 <section class="header has-tabs clearfix p-0">
   <ul class="tab-nav">
     <li>{{#link-to "authenticated.project.apikeys.account"}}{{t 'apiPage.account.header'}}{{/link-to}}</li>
-    <li>{{#link-to "authenticated.project.apikeys.environment"}}{{t 'apiPage.header'}}{{/link-to}}</li>
+    <li>{{#link-to "authenticated.project.apikeys.project"}}{{t 'apiPage.header'}}{{/link-to}}</li>
   </ul>
 
   <div class="right-buttons">
-    <button class="btn btn-sm bg-primary" {{action "newApikey" "environment"}}>{{t 'apiPage.actionButton'}}</button>
+    <button class="btn btn-sm bg-primary" {{action "newApikey" "project"}}>{{t 'apiPage.actionButton'}}</button>
   </div>
 </section>
 
@@ -20,8 +20,8 @@
   <p>
     <b>{{t 'apiPage.currentEndpoint'}}</b>
     <code>
-      <a href="{{endpointService.api.auth.environment.current}}" target="_blank" rel="nofollow noreferer">{{endpointService.api.display.environment.current}}</a>
-      {{copy-to-clipboard clipboardText=endpointService.api.auth.environment.current size="sm"}}
+      <a href="{{endpointService.api.auth.project.current}}" target="_blank" rel="nofollow noreferer">{{endpointService.api.display.project.current}}</a>
+      {{copy-to-clipboard clipboardText=endpointService.api.auth.project.current size="sm"}}
     </code>
   </p>
 </section>
diff --git a/app/router.js b/app/router.js
index b8fcddd78..5dc335f34 100644
--- a/app/router.js
+++ b/app/router.js
@@ -43,8 +43,8 @@ Router.map(function() {
       this.route('new', {path: '/add'}, function() {
         this.route('rke');
       });
-      this.route('new-project', {path: '/add-env'});
-      this.route('project', {path: '/env/:project_id'});
+      this.route('new-project', {path: '/add-project'});
+      this.route('project', {path: '/p/:project_id'});
 
       this.route('cluster', {path: '/:cluster_id'}, function() {
         this.route('edit');
@@ -65,11 +65,11 @@ Router.map(function() {
     });
 
     // Per-Project
-    this.route('project', {path: '/env/:project_id'}, function() {
+    this.route('project', {path: '/p/:project_id'}, function() {
       this.route('index', {path: '/'});
       this.route('apikeys', {path: '/api/keys'}, function() {
         this.route('account', {path: '/account'});
-        this.route('environment', {path: '/environment'});
+        this.route('project', {path: '/project'});
       });
       this.route('waiting');
 
@@ -151,7 +151,7 @@ Router.map(function() {
 
       this.route('apikeys', {path: '/api/keys'}, function() {
         this.route('account', {path: '/account'});
-        this.route('environment', {path: '/environment'});
+        this.route('project', {path: '/project'});
       });
 
       this.route('hooks', {path: '/api/hooks'}, function() {
diff --git a/lib/shared/addon/endpoint/service.js b/lib/shared/addon/endpoint/service.js
index d37d0a728..df5d1cde9 100644
--- a/lib/shared/addon/endpoint/service.js
+++ b/lib/shared/addon/endpoint/service.js
@@ -64,7 +64,7 @@ export default Service.extend({
           current: authBase + current,
           legacy:  authBase + legacy
         },
-        environment: {
+        project: {
           current: authBase + current + project,
           legacy:  authBase + legacy + project
         }
@@ -74,7 +74,7 @@ export default Service.extend({
           current: base + current,
           legacy:  base + legacy
         },
-        environment: {
+        project: {
           current: base + current + project,
           legacy:  base + legacy + project
         }