Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: Publish on Merge to Main

on:
push:
branches:
- main
workflow_dispatch:

jobs:
publish:
Expand All @@ -22,9 +20,12 @@ jobs:
- name: Install dependencies
run: yarn install --immutable

<<<<<<< HEAD
=======
- name: Bump version
run: yarn version --patch --no-git-tag-version

>>>>>>> main
- name: Publish to npm
run: yarn publish --non-interactive
env:
Expand Down
19 changes: 9 additions & 10 deletions src/types/api/time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ export enum ByDay {
SU = "Sunday",
}

export type Occasionally = "occasionally";
export type OccasionalDays = "weekends" | "weekdays";
export enum Occasionally {
OCCASIONALLY = "occasionally",
}

export enum OccasionalType {
WEEKENDS = "weekends",
WEEKDAYS = "weekdays",
}

export enum Hour {
H00 = "0:00",
Expand Down Expand Up @@ -47,20 +53,13 @@ export enum Hour {
H24 = "24:00",
}

export type Daytime = [Hour, Hour] | OccasionalDays;
export type Daytime = [Hour, Hour] | [OccasionalType];

export interface Availability {
day: ByDay | Occasionally;
daytime: Daytime;
}

export enum OccasionalType {
UNDEFINED = "undefined",
WEEKENDS = "weekends",
WEEKDAYS = "weekdays",
OCCASIONALLY = "occasionally",
}

export interface TimedText {
date: Date;
text: string;
Expand Down
3 changes: 2 additions & 1 deletion src/types/api/volunteer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface Volunteer {
}

export interface VolunteerFormData {
opportunityId?: Id | undefined;
opportunityId?: Id;
fullName: string;
phone: string;
email: string;
Expand All @@ -41,6 +41,7 @@ export interface VolunteerFormData {
}

export interface ApiVolunteerGetList {
id: number;
name: string;
languages: ApiLanguage[];
availability: Availability[];
Expand Down