Skip to content

Commit f45f6b7

Browse files
authored
Merge pull request #177 from ucdavis/refactor/dead-code-and-shared-chrome
PR 4: refactor: dead-code removal + shared chrome extraction
2 parents 652e145 + d09da71 commit f45f6b7

81 files changed

Lines changed: 250 additions & 2244 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

VueApp/src/CAHFS/assets/cahfs.css

Whitespace-only changes.

VueApp/src/CAHFS/router/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import { createRouter, createWebHistory } from "vue-router"
1+
import { createSpaRouter } from "@/shared/createSpaRouter"
22
import { routes } from "./routes"
33
import { useRequireLogin } from "@/composables/RequireLogin"
44
import { checkHasOnePermission } from "@/composables/CheckPagePermission"
5-
import { useRouteFocus } from "@/composables/use-route-focus"
65

7-
const baseUrl = import.meta.env.VITE_VIPER_HOME
8-
const router = createRouter({
9-
scrollBehavior: () => ({ left: 0, top: 0 }),
10-
history: createWebHistory(baseUrl),
11-
routes,
12-
})
6+
const router = createSpaRouter(routes)
137

148
router.beforeEach(async (to) => {
159
const { requireLogin } = useRequireLogin(to)
@@ -25,6 +19,4 @@ router.beforeEach(async (to) => {
2519
}
2620
})
2721

28-
useRouteFocus(router)
29-
3022
export { router as CAHFSRouter }

VueApp/src/CMS/assets/cms.css

Whitespace-only changes.

VueApp/src/CMS/router/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import { createRouter, createWebHistory } from "vue-router"
1+
import { createSpaRouter } from "@/shared/createSpaRouter"
22
import { routes } from "./routes"
33
import { useRequireLogin } from "@/composables/RequireLogin"
44
import { checkHasOnePermission } from "@/composables/CheckPagePermission"
5-
import { useRouteFocus } from "@/composables/use-route-focus"
65

7-
const baseUrl = import.meta.env.VITE_VIPER_HOME
8-
const router = createRouter({
9-
scrollBehavior: () => ({ left: 0, top: 0 }),
10-
history: createWebHistory(baseUrl),
11-
routes,
12-
})
6+
const router = createSpaRouter(routes)
137

148
router.beforeEach(async (to) => {
159
const { requireLogin } = useRequireLogin(to)
@@ -25,6 +19,4 @@ router.beforeEach(async (to) => {
2519
}
2620
})
2721

28-
useRouteFocus(router)
29-
3022
export { router as cmsRouter }

VueApp/src/CTS/pages/CourseList.vue

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

VueApp/src/CTS/pages/MyAssessmentCharts.vue

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

VueApp/src/CTS/router/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import { createRouter, createWebHistory } from "vue-router"
1+
import { createSpaRouter } from "@/shared/createSpaRouter"
22
import { routes } from "./routes"
33
import { useRequireLogin } from "@/composables/RequireLogin"
44
import { checkHasOnePermission } from "@/composables/CheckPagePermission"
5-
import { useRouteFocus } from "@/composables/use-route-focus"
65

7-
const baseUrl = import.meta.env.VITE_VIPER_HOME
8-
const router = createRouter({
9-
scrollBehavior: () => ({ left: 0, top: 0 }),
10-
history: createWebHistory(baseUrl),
11-
routes,
12-
})
6+
const router = createSpaRouter(routes)
137

148
router.beforeEach(async (to) => {
159
const { requireLogin } = useRequireLogin(to)
@@ -25,6 +19,4 @@ router.beforeEach(async (to) => {
2519
}
2620
})
2721

28-
useRouteFocus(router)
29-
3022
export { router }

VueApp/src/CTS/types/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,22 +272,19 @@ export type {
272272
LegacyComptency,
273273
Epa,
274274
Assessment,
275-
StudentEpaFormData,
276275
Level,
277276
ServiceSelect,
278277
Service,
279278
Student,
280279
Person,
281280
Role,
282281
Bundle,
283-
BundleRole,
284282
BundleCompetency,
285283
CompetencyBundleAssociation,
286284
BundleCompetencyAddUpdate,
287285
BundleCompetencyGroup,
288286
Milestone,
289287
MilestoneLevel,
290-
MilestoneLevelUpdate,
291288
Course,
292289
Session,
293290
Term,

VueApp/src/ClinicalScheduler/assets/schedule-shared.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
}
1616

1717
/* Shared typography for schedule pages */
18-
h3 {
18+
.clinical-scheduler-container h3 {
1919
color: var(--ucdavis-black-80);
20-
font-size: 16px;
21-
margin-top: 20px;
22-
margin-bottom: 10px;
20+
font-size: 1rem;
21+
margin-top: 1.25rem;
22+
margin-bottom: 0.625rem;
2323
}
2424

2525
.schedule-note {
@@ -38,8 +38,8 @@ h3 {
3838

3939
/* Mobile responsiveness for main headers */
4040
@media (max-width: 768px) {
41-
h2 {
42-
font-size: 18px;
41+
.clinical-scheduler-container h2 {
42+
font-size: 1.125rem;
4343
}
4444

4545
/* Shared mobile badge positioning */
@@ -93,7 +93,7 @@ h3 {
9393
}
9494

9595
@media (max-width: 480px) {
96-
h2 {
97-
font-size: 16px;
96+
.clinical-scheduler-container h2 {
97+
font-size: 1rem;
9898
}
9999
}

VueApp/src/ClinicalScheduler/components/WeekCell.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function isNewlyAdded(assignmentId: number): boolean {
176176
return newlyAddedAssignments.value.has(assignmentId)
177177
}
178178
179-
export interface WeekAssignment {
179+
interface WeekAssignment {
180180
id: number
181181
displayName: string
182182
isPrimary?: boolean
@@ -355,8 +355,6 @@ const cardClasses = computed(() => {
355355
</script>
356356

357357
<style scoped>
358-
@import url("@/styles/colors.css");
359-
360358
.week-schedule-card {
361359
max-width: 280px;
362360
min-width: 200px;

0 commit comments

Comments
 (0)