Skip to content

Commit 9f2edda

Browse files
committed
Fix related links and subpages showing
1 parent 45cbe58 commit 9f2edda

File tree

4 files changed

+33
-46
lines changed

4 files changed

+33
-46
lines changed

frontend/package-lock.json

Lines changed: 14 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/routes.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
"projects/firebase/firebase-ios-sdk/contributing.md",
128128
"projects/firebase/firebase-ios-sdk/roadmap.md",
129129
"projects/firebase/firebaseopensource.com/docs/configure-repo.md",
130+
"projects/firebase/firebaseopensource.com/docs/stage-project.md",
130131
"projects/firebase/firebaseui-android/auth/readme.md",
131132
"projects/firebase/firebaseui-android/database/readme.md",
132133
"projects/firebase/firebaseui-android/docs/upgrade-to-2.0.md",

frontend/src/components/Projects/index.ts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ interface DisplayTimestamps {
8888
last_fetched_from_now: string;
8989
}
9090

91+
interface RelatedRepo {
92+
name: string;
93+
path: string;
94+
}
95+
9196
interface ProjectArgs {
9297
env: Env;
9398

@@ -96,7 +101,7 @@ interface ProjectArgs {
96101
header: Section;
97102
subheader_tabs: SelectableLink[];
98103
sidebar: SidebarSection[];
99-
related_repos: string[];
104+
related_repos: RelatedRepo[];
100105

101106
info: RepoInfo;
102107
timestamps: DisplayTimestamps;
@@ -142,7 +147,7 @@ export default class Projects extends Vue implements ProjectArgs {
142147
@Prop()
143148
sidebar: SidebarSection[];
144149
@Prop()
145-
related_repos: string[];
150+
related_repos: RelatedRepo[];
146151

147152
cancels: Function[];
148153
show_clone_cmd: Boolean = false;
@@ -276,6 +281,7 @@ export default class Projects extends Vue implements ProjectArgs {
276281
const href = `${projectPath}/${pageConfig.path}`.toLowerCase();
277282
subpages.push(new SelectableLink(pageName, href, selected));
278283
}
284+
projectSidebar.pages = projectSidebar.pages.concat(subpages);
279285
}
280286
result.sidebar = [projectSidebar, OSS_SIDEBAR, FIREBASE_SIDEBAR];
281287

@@ -289,7 +295,7 @@ export default class Projects extends Vue implements ProjectArgs {
289295
}
290296

291297
// Related repos
292-
result.related_repos = this.relatedRepoNames(configData);
298+
result.related_repos = this.relatedRepos(configData);
293299

294300
return result;
295301
}
@@ -298,7 +304,7 @@ export default class Projects extends Vue implements ProjectArgs {
298304
return text.toLowerCase().replace(" ", "_");
299305
}
300306

301-
static relatedRepoNames(config: StoredProjectConfig): string[] {
307+
static relatedRepos(config: StoredProjectConfig): RelatedRepo[] {
302308
if (!config.related) {
303309
return [];
304310
}
@@ -307,14 +313,17 @@ export default class Projects extends Vue implements ProjectArgs {
307313
// Format the name of a related project for display.
308314
// Strips the "firebase/" from the name to save space, since
309315
// the firebase context is implied on firebaseopensource.com
316+
let name = repo;
310317
if (repo.indexOf("firebase/") >= 0) {
311-
return repo.substring("firebase/".length, repo.length);
318+
name = repo.substring("firebase/".length, repo.length);
312319
}
313320

314-
return repo;
321+
return {
322+
name,
323+
path: repo
324+
}
315325
});
316326
}
317-
318327
get isStaging() {
319328
return this.env === Env.STAGING;
320329
}

frontend/src/components/Projects/template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ <h1>
4444

4545
<div class="related" v-if="!is_subpage">
4646
<div class="repos">
47-
<a class="repo test" :href="`/projects/${repo}`" v-for="repo in related_repos">
48-
<i class="material-icons">link</i><span>{{repo}}</span>
47+
<a class="repo test" :href="`/projects/${repo.path}`" v-for="repo in related_repos">
48+
<i class="material-icons">link</i><span>{{repo.name}}</span>
4949
</a>
5050
</div>
5151
</div>

0 commit comments

Comments
 (0)