Skip to content

Commit 2e5ef74

Browse files
committed
refactor(elections): changed upcoming to schedule
1 parent a4523ba commit 2e5ef74

10 files changed

Lines changed: 48 additions & 25 deletions

src/app/app.routes.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export enum SiteRoute {
1010
Events = '/events',
1111
EventsArchives = '/events/archives',
1212
Elections = '/elections',
13-
ElectionsUpcoming = '/elections/upcoming',
13+
ElectionsSchedule = '/elections/schedule',
1414
ElectionsSpeeches = '/elections/speeches'
1515
}
1616

@@ -98,9 +98,11 @@ export const routes: Routes = [
9898
}
9999
},
100100
{
101-
path: 'elections/upcoming',
101+
path: 'elections/schedule',
102102
loadComponent: () =>
103-
import('./pages/elections/upcoming/upcoming.component').then(m => m.UpcomingComponent),
103+
import('pages/elections/upcoming/elections-schedule.component').then(
104+
m => m.ElectionsScheduleComponent
105+
),
104106
title: makeTitle('Elections'),
105107
data: {
106108
description: 'Learn about the responsibilities of our executives and how you can become one.'

src/app/components/nav-bar/nav-entries.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ export const NAVBAR_ENTRIES: NavItem[] = [
112112
route: SiteRoute.Elections
113113
},
114114
{
115-
key: 'elections.upcoming',
116-
label: 'Upcoming',
115+
key: 'elections.schedule',
116+
label: 'Schedule',
117117
icon: faFile,
118-
route: SiteRoute.ElectionsUpcoming
118+
route: SiteRoute.ElectionsSchedule
119119
},
120120
{
121121
key: 'elections.speeches',
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<code-article>
2+
<header>
3+
<h1>Schedule</h1>
4+
<p>Tune in here to see upcoming or past elections (Soon &trade;)</p>
5+
<section>
6+
<h2>Elections Schedule</h2>
7+
<div class="post">
8+
<h3 class="post__title">Director of Multi-Media</h3>
9+
<p></p>
10+
</div>
11+
</section>
12+
</header>
13+
</code-article>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.post {
2+
border: 1px black solid;
3+
padding: 0.5rem;
4+
box-shadow: 10px 10px 5px black;
5+
6+
&__title {
7+
margin: 0;
8+
}
9+
}

src/app/pages/elections/upcoming/upcoming.component.spec.ts renamed to src/app/pages/elections/upcoming/elections-schedule.component.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
22

3-
import { UpcomingComponent } from './upcoming.component';
3+
import { ElectionsScheduleComponent } from './elections-schedule.component';
44

55
describe('UpcomingComponent', () => {
6-
let component: UpcomingComponent;
7-
let fixture: ComponentFixture<UpcomingComponent>;
6+
let component: ElectionsScheduleComponent;
7+
let fixture: ComponentFixture<ElectionsScheduleComponent>;
88

99
beforeEach(async () => {
1010
await TestBed.configureTestingModule({
11-
imports: [UpcomingComponent]
11+
imports: [ElectionsScheduleComponent]
1212
})
1313
.compileComponents();
1414

15-
fixture = TestBed.createComponent(UpcomingComponent);
15+
fixture = TestBed.createComponent(ElectionsScheduleComponent);
1616
component = fixture.componentInstance;
1717
fixture.detectChanges();
1818
});
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { ChangeDetectionStrategy, Component } from '@angular/core';
2+
import { ArticleComponent } from '@csss-code/article/article.component';
3+
4+
@Component({
5+
selector: 'cs-upcoming',
6+
imports: [ArticleComponent],
7+
templateUrl: './elections-schedule.component.html',
8+
styleUrl: './elections-schedule.component.scss',
9+
changeDetection: ChangeDetectionStrategy.OnPush
10+
})
11+
// eslint-disable-next-line @typescript-eslint/no-extraneous-class
12+
export class ElectionsScheduleComponent {}

src/app/pages/elections/upcoming/upcoming.component.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/pages/elections/upcoming/upcoming.component.scss

Whitespace-only changes.

src/app/pages/elections/upcoming/upcoming.component.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/app/services/application/applications.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
126126
label: 'Upcoming',
127127
activityKey: '',
128128
key: 'elections-upcoming',
129-
route: SiteRoute.ElectionsUpcoming
129+
route: SiteRoute.ElectionsSchedule
130130
}
131131
],
132132
[

0 commit comments

Comments
 (0)