Swapped duplicated members files from -dev to -old

no issue

- allows continued development on the "original/non duplicated" files to better preserve git history once the `-old.*` files are deleted

app/components/gh-members-list-item-dev.hbs → app/components/gh-members-list-item-old.hbs

@@ -1,5 +1,5 @@
 <li class="gh-list-row gh-members-list-item" ...attributes>
-    <LinkTo @route="member-dev" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-basic">
+    <LinkTo @route="member-old" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-basic">
         <div class="flex items-center">
             <GhMemberAvatar @member={{@member}} @containerClass="w9 h9 mr3" />
             <div>
@@ -11,7 +11,7 @@
         </div>
     </LinkTo>
 
-    <LinkTo @route="member-dev" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-geolocation gh-list-cellwidth-20 nowrap middarkgrey f8 {{if (not @member.name) "gh-members-geolocation-noname"}}">
+    <LinkTo @route="member-old" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-geolocation gh-list-cellwidth-20 nowrap middarkgrey f8 {{if (not @member.name) "gh-members-geolocation-noname"}}">
         {{#if @member.geolocation}}
             {{#if (eq @member.geolocation.country_code "US")}}
                 {{@member.geolocation.region}}, US
@@ -23,11 +23,11 @@
         {{/if}}
     </LinkTo>
 
-    <LinkTo @route="member-dev" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-subscribed-at gh-list-cellwidth-20 nowrap middarkgrey f8 {{if (not @member.name) "gh-members-subscribed-noname"}}">
+    <LinkTo @route="member-old" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-subscribed-at gh-list-cellwidth-20 nowrap middarkgrey f8 {{if (not @member.name) "gh-members-subscribed-noname"}}">
         {{moment-format @member.createdAtUTC "MMM DD, YYYY"}} <span class="midlightgrey">({{this.memberSince}})</span>
     </LinkTo>
 
-    <LinkTo @route="member-dev" @model={{@member}} title="Member details" class="gh-list-data gh-list-cellwidth-chevron gh-members-list-chevron">
+    <LinkTo @route="member-old" @model={{@member}} title="Member details" class="gh-list-data gh-list-cellwidth-chevron gh-members-list-chevron">
         <div class="flex items-center justify-end w-100 h-100">
             <span class="nr2">{{svg-jar "arrow-right" class="w6 h6 fill-midgrey pa1"}}</span>
         </div>

app/components/gh-members-no-members-dev.hbs → app/components/gh-members-no-members-old.hbs

@@ -5,11 +5,11 @@
     </button>
 
     <div class="flex flex-column items-stretch mt8 pt8 pb10 bt b--lightgrey-d1">
-        <LinkTo @route="member-dev.new" class="gh-btn gh-btn-outline mb3">
+        <LinkTo @route="member-old.new" class="gh-btn gh-btn-outline mb3">
             <span>Manually add a member</span>
         </LinkTo>
 
-        <LinkTo @route="members-dev.import" class="gh-btn gh-btn-outline">
+        <LinkTo @route="members-old.import" class="gh-btn gh-btn-outline">
             <span>Import members from CSV</span>
         </LinkTo>
     </div>

app/components/gh-nav-menu.hbs

@@ -77,11 +77,11 @@
             {{/if}}
             {{#if (and this.feature.members (gh-user-can-admin this.session.user))}}
                 <li>
-                    <LinkTo @route="members" @current-when="members member" @query={{hash label=null}} data-test-nav="members">{{svg-jar "members"}}Members</LinkTo>
+                    <LinkTo @route="members-old" @current-when="members-old member-old" @query={{hash label=null}} data-test-nav="members">{{svg-jar "members"}}Members</LinkTo>
                 </li>
                 {{#if this.config.enableDeveloperExperiments}}
                     <li>
-                        <LinkTo @route="members-dev" @current-when="members-dev member-dev" @query={{hash label=null}} data-test-nav="members-dev">{{svg-jar "members"}}Members (dev)</LinkTo>
+                        <LinkTo @route="members" @current-when="members member" @query={{hash label=null}} data-test-nav="members-old">{{svg-jar "members"}}Members (dev)</LinkTo>
                     </li>
                 {{/if}}
             {{/if}}

app/controllers/member-dev.js → app/controllers/member-old.js

@@ -11,7 +11,7 @@ import {task} from 'ember-concurrency';
 const SCRATCH_PROPS = ['name', 'email', 'note'];
 
 export default Controller.extend({
-    members: controller(),
+    members: controller('members-old'),
     session: service(),
     dropdown: service(),
     notifications: service(),
@@ -53,7 +53,7 @@ export default Controller.extend({
 
         deleteMember() {
             return this.member.destroyRecord().then(() => {
-                return this.transitionToRoute('members-dev');
+                return this.transitionToRoute('members-old');
             }, (error) => {
                 return this.notifications.showAPIError(error, {key: 'member.delete'});
             });

app/controllers/members-dev/import.js → app/controllers/members-old/import.js

@@ -4,7 +4,7 @@ import {inject as service} from '@ember/service';
 
 /* eslint-disable ghost/ember/alias-model-in-controller */
 export default Controller.extend({
-    members: controller(),
+    members: controller('members-old'),
     router: service(),
 
     actions: {
@@ -13,7 +13,7 @@ export default Controller.extend({
         },
 
         close() {
-            this.router.transitionTo('members-dev');
+            this.router.transitionTo('members-old');
         }
     }
 });

app/router.js

@@ -58,17 +58,17 @@ Router.map(function () {
     this.route('settings.integrations.unsplash', {path: '/settings/integrations/unsplash'});
     this.route('settings.integrations.zapier', {path: '/settings/integrations/zapier'});
 
-    this.route('members', function () {
+    this.route('members', {path: '/members-dev'}, function () {
         this.route('import');
     });
-    this.route('member.new', {path: '/members/new'});
-    this.route('member', {path: '/members/:member_id'});
+    this.route('member.new', {path: '/members-dev/new'});
+    this.route('member', {path: '/members-dev/:member_id'});
 
-    this.route('members-dev', function () {
+    this.route('members-old', {path: '/members'}, function () {
         this.route('import');
     });
-    this.route('member-dev.new', {path: '/members-dev/new'});
-    this.route('member-dev', {path: '/members-dev/:member_id'});
+    this.route('member-old.new', {path: '/members/new'});
+    this.route('member-old', {path: '/members/:member_id'});
 
     this.route('error404', {path: '/*path'});
 });

app/routes/member-old/new.js

@@ -0,0 +1,6 @@
+import MemberRoute from '../member-old';
+
+export default MemberRoute.extend({
+    controllerName: 'member-old',
+    templateName: 'member-old'
+});

app/templates/member-dev.hbs → app/templates/member-old.hbs

@@ -1,7 +1,7 @@
 <section class="gh-canvas">
     <GhCanvasHeader class="gh-canvas-header">
         <h2 class="gh-canvas-title" data-test-screen-title>
-            <LinkTo @route="members-dev" data-test-link="members-back">Members</LinkTo>
+            <LinkTo @route="members-old" data-test-link="members-back">Members</LinkTo>
             <span>{{svg-jar "arrow-right"}}</span>
             {{#if this.member.isNew}}
                 New member

app/templates/members-dev.hbs → app/templates/members-old.hbs

@@ -29,7 +29,7 @@
                 <GhDropdown @name="members-actions-menu" @tagName="ul"
                     @classNames="gh-member-actions-menu dropdown-menu dropdown-triangle-top-right">
                     <li>
-                        <LinkTo @route="members-dev.import" class="mr2" data-test-link="import-csv">
+                        <LinkTo @route="members-old.import" class="mr2" data-test-link="import-csv">
                             <span>Import members</span>
                         </LinkTo>
                     </li>
@@ -40,7 +40,7 @@
                     </li>
                 </GhDropdown>
             </span>
-            <LinkTo @route="member-dev.new" class="gh-btn gh-btn-green" data-test-new-member-button="true"><span>New member</span></LinkTo>
+            <LinkTo @route="member-old.new" class="gh-btn gh-btn-green" data-test-new-member-button="true"><span>New member</span></LinkTo>
         </section>
     </GhCanvasHeader>
     {{#if this.showLoader}}
@@ -52,7 +52,7 @@
             {{#if this.filteredMembers}}
                 {{#if this.showingAll}}
                     <section>
-                        <GhMembersChartDev @members={{members}} />
+                        <GhMembersChartOld @members={{members}} />
                     </section>
                 {{/if}}
             {{/if}}
@@ -66,7 +66,7 @@
                             <div class="gh-list-header gh-list-cellwidth-chevron"></div>
                         </li>
                         <VerticalCollection @items={{this.filteredMembers}} @key="id" @containerSelector=".gh-main" @estimateHeight={{69}} @staticHeight={{true}} @bufferSize={{20}} as |member|>
-                            <GhMembersListItemDev @member={{member}} @data-test-member-id={{member.id}} />
+                            <GhMembersListItemOld @member={{member}} @data-test-member-id={{member.id}} />
                         </VerticalCollection>
                     {{else}}
                         <li class="no-posts-box">