Skip to content

Commit

Permalink
Implement Calendar Add Event
Browse files Browse the repository at this point in the history
Ft docs implementation (#254)

* fix login

* docs implementation

github activity (#244)

ft:Upload Profile

Co-authored-by: teerenzo <renzahoemmanuel8@gmail.com>

Dark theme implementation (#259)

* ch(fix sign up):  fixing sign up

- google is removed
-Date of birth is validated to be at least 18 years
-Email field is automatically filled and uneditable ( collect the email
from the sign up link sent to them)
-Password should not be too easy. (Should not be in the first 100 most
common passwords: https://tinyurl.com/wiki-100)

[Finishes #42-signup-fix]

* ch(dark-theme):implementation of dark theme

-Dark theme is added using our new design
-implement effective dark theme at all

[finishes #59-dark-theme-implementation]

* add orgLogin update (#260)

* add

* Add change

* move space in organiaztionLogin

* add newUpdate

* add newChange

* add change

* add changing

* Add change

* add change

---------

Co-authored-by: Rachel UMWARI <94528079+rachelumwari@users.noreply.github.com>

* style: enhance UI/UX on the super admin dashboard

- Organization page table design

[Fixes #65]

* style: enhance UI/UX on the super admin dashboard

- Changed Organization page table design to use the DataTable component.
- Fixed some styling and formatting errors
- Fixed grammatical errors in code.

[Fixes #65]

fix: translate error message (#310)

fix-trainee-dashbord (#312)

-modifying trainee dashbord designs

fix: Replace buttons with icons on organizations page (#318)

- Change action buttons to specific icons
- Change icon colors to our platform color codes

add retrieving coordinators from data (#317)

Feat(drop trainee): Admin/coordinator to drop trainee (#281)

* Rating Feature Implementation

* feat: drop trainee

---------

Co-authored-by: Aline096 <anoclez@gmail.com>

fix:new cohort visibility (#326)

Co-authored-by: Your Name <you@example.com>
  • Loading branch information
2 people authored and NTElissa committed Oct 23, 2023
1 parent 8d5cb83 commit 9403126
Show file tree
Hide file tree
Showing 66 changed files with 9,699 additions and 14,726 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"plugins": ["react", "@typescript-eslint"],
"ignorePatterns": ["/root/webpack.config.js"],
"rules": {
"react/prop-types": "off",
"no-console": ["error"],
"import/extensions": "off",
"react/jsx-filename-extension": 0,
Expand Down
21,304 changes: 7,564 additions & 13,740 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
"jwt-decode": "^3.1.2",
"moment": "^2.29.4",
"pnpm": "^8.6.11",
"react": "^18.2.0",
"react-apexcharts": "^1.4.1",
"react-calendar": "^3.9.0",
"react-chartjs-2": "^5.2.0",
Expand Down Expand Up @@ -157,7 +156,7 @@
"jest-image-snapshot": "^6.1.0",
"lint-staged": "^13.2.3",
"mini-css-extract-plugin": "^2.7.6",
"npm": "^8.19.4",
"npm": "^10.0.0",
"postcss": "^8.4.26",
"postcss-loader": "^7.3.3",
"prettier": "^2.7.1",
Expand All @@ -178,4 +177,4 @@
"*.{js,ts,tsx}": "eslint --fix",
"*.{js,ts,html,css,md}": "prettier --write \"./**/*.{js,ts,jsx,tsx,json}\""
}
}
}
3 changes: 2 additions & 1 deletion public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -342,5 +342,6 @@
"Enter the title and description of the document you want to add": "Enter the title and description of the document you want to add",
"Documentation updated successfully": "Documentation updated successfully",
"Please fill all fields": "Please fill all fields",
"Boost your organization": "Boost your organizations productivity with Pulse"
"Boost your organization": "Boost your organizations productivity with Pulse",
"Please wait to be added to a program or cohort": "Please wait to be added to a program or cohort"
}
3 changes: 2 additions & 1 deletion public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,6 @@
"Provide Quality range between 1-2": "Fournir une gamme de qualité entre 1-2",
"Provide Quantity range between 1-2": "Fournir une gamme de quantité comprise entre 1-2",
"Provide Professional_Skills range between 1-2": "Fournir une gamme de compétences professionnelles comprise entre 1-2",
"Sprint Ratings": "Sprint Notations"
"Sprint Ratings": "Sprint Notations",
"Please wait to be added to a program or cohort":"Veuillez attendre d'être ajouté à un programme ou à une cohorte"
}
3 changes: 2 additions & 1 deletion public/locales/kn/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -448,5 +448,6 @@
"Provide Quality range between 1-2": "Tanga ubuziranenge hagati ya 1-2",
"Provide Quantity range between 1-2": "Tanga Umubare uri hagati ya 1-2",
"Provide Professional_Skills range between 1-2": "Tanga ubuhanga buri hagati ya 1-2",
"Sprint Ratings": "Amanota ya Sprint"
"Sprint Ratings": "Amanota ya Sprint",
"Please wait to be added to a program or cohort": "Tegereza tukongere muri porogarame cyangwa itsinda"
}
9 changes: 9 additions & 0 deletions src/Mutations/User.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,13 @@ export const DROP_TTL_USER = gql`
dropTTLUser(email: $email, reason: $reason)
}
`;
export const GET_USERS = gql`
query GetUserEmails {
GetUserEmails {
email
}
}
`;

export default GET_PROFILE;

40 changes: 40 additions & 0 deletions src/Mutations/event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,23 @@ export const GET_EVENTS = gql`
start
timeToEnd
timeToStart
guests
title
guests
}
}
`;
export const GET_ACCEPTED_EVENTS = gql`
query GetAcceptedEvents($authToken: String) {
getAcceptedEvents(authToken: $authToken) {
end
hostName
start
timeToEnd
timeToStart
guests
title
guests
}
}
`;
Expand All @@ -21,6 +37,7 @@ export const ADD_EVENT = gql`
$timeToFinish: String!
$hostName: String!
$start: String!
$guests: [String!]!
$authToken: String
) {
createEvent(
Expand All @@ -30,6 +47,7 @@ export const ADD_EVENT = gql`
timeToEnd: $timeToFinish
hostName: $hostName
start: $start
guests: $guests
authToken: $authToken
) {
end
Expand All @@ -38,6 +56,28 @@ export const ADD_EVENT = gql`
timeToEnd
title
timeToStart
guests
}
}
`;

export const SEND_INVITATION_EMAIL = gql`
mutation SendInvitationEmail($email: String!, $title: String!) {
sendInvitationEmail(email: $email, title: $title) {
email
title
}
}
`;

export const GET_ALL_COHORTS = gql`
query($orgToken: String) {
getAllCohorts(orgToken: $orgToken) {
name
}
}
`;




36 changes: 36 additions & 0 deletions src/Mutations/manageStudentMutations.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// import { gql } from '@apollo/client';
import { gql, ApolloClient, InMemoryCache } from '@apollo/client';

import GET_PROFILE from './User';

export const GET_USERS_QUERY = gql`
query GetUsers($orgToken: String) {
Expand All @@ -11,6 +12,13 @@ export const GET_USERS_QUERY = gql`
}
`;

export const DROP_TRAINEE = gql`
mutation DropTrainee($traineeId: String!, $reason: String!, $date: DateTime!) {
dropTrainee(traineeId: $traineeId, reason: $reason, date: $date)
}
`;


export const GET_TRAINEES_QUERY = gql`
query GetTrainees($orgToken: String) {
getTrainees(orgToken: $orgToken) {
Expand All @@ -35,6 +43,7 @@ export const GET_TRAINEES_QUERY = gql`
githubUsername
resume
}
id
email
team {
name
Expand Down Expand Up @@ -62,6 +71,8 @@ export const GET_TRAINEES_QUERY = gql`
}
}
`;


export const GET_COHORT_TRAINEES_QUERY = gql`
query GetCohortTrainees($cohort: String, $orgToken: String) {
getCohortTrainees(cohort: $cohort, orgToken: $orgToken) {
Expand Down Expand Up @@ -330,6 +341,31 @@ export const INVITE_USER_MUTATION = gql`
inviteUser(email: $email, orgToken: $orgToken, type: $type)
}
`;
export const ACCEPT_EVENT_MUTATION = gql`
mutation RespondToEventInvitation(
$eventId: ID!
$status: String!
$reason: String!
$authToken: String
) {
respondToEventInvitation(
eventId: $eventId
status: $status
reason: $reason
authToken: $authToken
) {
title
timeToStart
timeToEnd
invitationStatus
invitationReason
hostName
guests
end
start
}
}
`;
export const GET_TEAM_QUERY = gql`
query GetAllTeamInCohort($orgToken: String, $cohort: String) {
getAllTeamInCohort(orgToken: $orgToken, cohort: $cohort) {
Expand Down
Loading

0 comments on commit 9403126

Please sign in to comment.