Fix the Activity category and Date display #203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kachulio1
approved these changes
Apr 2, 2019
Kachulio1
added a commit
that referenced
this pull request
Jun 14, 2019
* Clean up in preparation for version 2 * Set up new folder structure and web pack config (#167) * chore(setup): add webpack configuration * chore(setup): add HomeComponent * feat(setup): add webpack dev config feat(setup): add eslint dependencies * feat(setup): add babel config * feat(setup): add clean-webpack-plugin dependency * feat(setup): add optimization using splitChunks - add CleanWebpackPlugin config - add MiniCssExtractPlugin config - refactor to use source-map * feat(setup): add webpack config for production * feat(setup): add node sass dependency - add home scss * feat(setup): add jest and enzyme for testing - test HomeComponent * chore(tests): add babel-core dependency - add jest config file * chore(setup): add coveralls dependency * chore(node): upgrade node version - upgrade node version to enable compatibility with eslint upgrade [ Fixes #162770492 ] * chore(badges): circle ci & coveralls badges (#171) - change badges to reflect the develop v2 branch [ Fixes #163145741] * #163360183 Continuous deployment for develop-V2 (#174) * ft(container): create a docker image - create a docker file that creates the application production environment [ Fixes #163360183] * chore(cleanup): remove unused commands - remove the copy:favicon command [ Fixes #163360183 ] * chore(node): move to node version 10 - use node version 10 in tests and deployment - add deployment for develop-v2 [ Fixes #163360183 ] * feat(deployment): add deployment script - Add a deployment script for the application - change the design configuration on the application to staging_v2 - Refactor the slack notification script [ Fixes #163360183 ] * chore(docker-image): opt for a lighter images - choose alpine image [ Fixes #163360183 ] * Add new login design (#172) * feat(login): add css variables * feat(login): add login component * feat(routes): add routes * feat(styles): add login component scss * feat(login): add Din Pro font face * feat(login): add jwt-decode and js-cookie dependencies - use js-ccokie to get token - use js-decode to decode token - add function tokenIsValid to check validity of the decoded token - add check to route to login or home in componentDidMount * feat(login): add component to authenticate routes and its tests - add devServer config - refactor login test to add history prop - add image place holder * feat(login): add token fixture - add tokenIsValid test * feat(login): add bootstrap and modify css - add rem function to convert px to rem - add bootstrap classes in LoginComponent - add lightGray css variable * feat(login): add test cases - add test case for components not authenticated - add invalid token test case * chore(domains): update domains (#181) - update domains to use the v2 version [ Fixes #163615519] * Setup Redux and Redux-Saga (#170) * Redux Saga setup * Clean Saga examples * Resolve Conflicts * Resolve conflicts * Create personal dashboard (#178) * feat(login): add login component * feat(dashboard): add a HeroComponent * feat(dashboard): add SidebarComponent * feat(dashboard): refactor login component to add LogoCompoment - add styling for hero class * feat(dashboard): add Dashboard component * feat(dashboard): add MyStatsComponent and SocietyStatsComponent * feat(dashboard): add sidebar footer and it's scss file feat(dashboard): add styles and logoClassType props in LogoComponent * feat(dashboard): add dashboard svg, blue and white andela image logos * feat(dashboard): add navbar component with its scss file * feat(dashboard): add Navbar component in dashboard - add css classes and styling in Navbar component * feat(dashboard): add text-styles mixin - add person placeholder image - add jpg in test property of url-loader - add css classes to MyStatsComponent - add myStats scss file - add css classes to SocietyStatsComponent - add societyStats.scss * feat(dashboard): add buttons to log points and filter - add button component and it's styling * feat(dashboard): add file-loader * feat(dashboard): add society icons * feat(dashboard): add media queries for small and medium devices - handle responsiveness of dashboard component * feat(dashboard): add media queries to handle resposiveness of society stats component * feat(Dashboard): add component tests - add dashboard component tests - add my stats component tests - add society stats component tests - add button component tests - add hero component tests - add logo component tests - add navabar tests - add sidebar component tests - add wrapper, main-content, sidebar and sub-content class names - add position absolute to main-content - add flex grow in sub-content * feat(dashboard): add sidebar in navbar component - add media query for small and other devices * feat(dashboard): add NavItem component in sidebar component - add NavItem component - add media query for devices with width > 767 * feat(dashboard): add capitalize util * feat(dashboard): add css files in styles folder of each domain - add NavItemComponent tests - add Capitalize tests - add NavbarComponent tests - refactor image urls in logo.scss * feat(dashboard): add image svg files * feat(dashboard): add society icon class names and their images - add border left on hover - add top navigation separator * feat(dashboard): refactor to use rems * feat(dashboard): refactor svg files * feat(dashboard): add constants and refactor scss files to add spaces * feat(dashboard): add date-fns dependency - remove default webkit - remove png images * feat(dashboard): add progress bar * Display graphic of total points and activities logged (#182) * feat(login): add login component * feat(dashboard): add a HeroComponent * feat(dashboard): add SidebarComponent * feat(dashboard): refactor login component to add LogoCompoment - add styling for hero class * feat(dashboard): add Dashboard component * feat(dashboard): add MyStatsComponent and SocietyStatsComponent * feat(dashboard): add sidebar footer and it's scss file feat(dashboard): add styles and logoClassType props in LogoComponent * feat(dashboard): add dashboard svg, blue and white andela image logos * feat(dashboard): add navbar component with its scss file * feat(dashboard): add Navbar component in dashboard - add css classes and styling in Navbar component * feat(dashboard): add text-styles mixin - add person placeholder image - add jpg in test property of url-loader - add css classes to MyStatsComponent - add myStats scss file - add css classes to SocietyStatsComponent - add societyStats.scss * feat(dashboard): add buttons to log points and filter - add button component and it's styling * feat(dashboard): add file-loader * feat(dashboard): add society icons * feat(dashboard): add media queries for small and medium devices - handle responsiveness of dashboard component * feat(dashboard): add media queries to handle resposiveness of society stats component * feat(Dashboard): add component tests - add dashboard component tests - add my stats component tests - add society stats component tests - add button component tests - add hero component tests - add logo component tests - add navabar tests - add sidebar component tests - add wrapper, main-content, sidebar and sub-content class names - add position absolute to main-content - add flex grow in sub-content * feat(dashboard): add sidebar in navbar component - add media query for small and other devices * feat(dashboard): add NavItem component in sidebar component - add NavItem component - add media query for devices with width > 767 * feat(dashboard): add capitalize util * feat(dashboard): add css files in styles folder of each domain - add NavItemComponent tests - add Capitalize tests - add NavbarComponent tests - refactor image urls in logo.scss * feat(dashboard): add image svg files * feat(dashboard): add society icon class names and their images - add border left on hover - add top navigation separator * feat(dashboard): refactor to use rems * feat(dashboard): refactor svg files * feat(dashboard): add constants and refactor scss files to add spaces * feat(dashboard): add date-fns dependency - remove default webkit - remove png images * feat(dashboard): add progress bar * feat(dashboard): add Dashboard component * feat(totalPointsAndActivities): configure store, sagas and reducer * feat(userActivites): add fetch user activities actions and types * feat(userActivities): add fetch user activities saga - handle fetch user activities actions in reducer * feat(userActivities): add api util - add get request util - add getToken and getUserInfo utils * feat(userActivities): Add dependencies - add redux-saga - add redux - add redux-devtools-extension * feat(userActivities): add plugin-transform-runtime dependency * feat(userActivities): map dashboard state to props - add post util * feat(userActivities): resolve linting errors * feat(userActivities): add action to fetchUser - handle fetchUser action in reducer * feat(useraActivities): add tests - add tests for dashboard actions i.e fetch user activities. - add reducer tests - refactor to remove fetch user action * feat(userActivities): add tests - add Dashboard tests - add dashboard saga tests - add tokenIsValid test * feat(userActivities): add background image in HeroComponent * feat(userActivities): evaluate the right JSX before rendering * Add api util tests * feat(userActivities): add token parameter to tokenIsValid & getUserInfo * Add button interactions (#184) * chore(feedback): Add pointer cursor to settings nav item - add pointer cursor to buttons - add box shadow and transition to hover state - add bold font weight to society stats * chore(feedback): add colors variables - remove unused content-wrapper class * chore(feedback): use andela blue and gold colors * chore(feedback): add border around society icons - reduce height and width of society svgs * chore(feedback): refactor button styles - add shared class user-dashboard__button - remove unshared hover state styles and button class * chore(feedback): add mixins - add border and widthAndHeight mixin * Wrap pages within common sidebar and navigation bar (#185) * chore(commonWrapper): wrap components under common sidebar and navbar - redirect to login if not authenticated - remove hero, navbar and sidebar component from dashboard component * chore(commonWrapper): add user's society in state * chore(commonWrapper): add user's society image in society stats component - pass down user's society as props to society stats component - add society images * chore(commonWrapper): refactor tests to add society * chore: add background image on login page (#189) * #163083355 Display redesigned my logged activities (#187) * feat(loggedActivities): add TableComponent * feat(myActivities): add table component and its scss * feat(myActivities): add TruncateDescriptionComponent and its scss * feat(myActivities): add onClick prop * feat(myActivities): add MyActivities component - add userActivities constant * feat(myActivities): rework dashboard to edit padding and margin values * feat(myActivities): Add tableClassName prop in TableComponent - add myActivities scss file - add truncateDescription scss file - add styles to TableComponent - refactor dashboard actions * feat(myActivities): add society prop - rename color value * feat(myActivities): format date value - modify text styles for table body - add border collapse and spacing styles on table class * feat(myActivities): add MyActivitiesComponent and TableComponent tests - add condition to check if there are userActivities * feat(myActivities): Add StatusIndicatorComponent - add statusIndicator scss file - add colors representing the various statuses - make use of status indicator component in MyActivities and SocietyStats components * feat(myActivities): Add TruncateDescriptionComponent tests * feat(myActivities): add colSpan attribute on table data * chore(rename): rename stateful components to have container suffix (#191) - add DashboardContainer - add TruncateDescriptionContainer - add LoginContainer - add NavbarContainer * feat(userProfile): add profile component (#190) - add its scss file - add userInfo prop - pass down userInfo prop to NavbarComponent - add prop validation for userInfo - add profile dropdown menu - refactor remove logo styles - add user profile on small devices - refactor profile component to be stateful - add profileIconClick - add classname prop - add tests - add withRouter on login component - add function to logOut a user - add removeCookies util - add tests - add box shadow on profile dropdown - add a class on buttons in the DashboardComponent - rename component to ProfileContainer * chore(login): update image on login page (#193) * chore(pipeline): master-V2 pipeline (#186) - create a pipeline for master-V2 [ Fixes #164102566 ] * #163083132 Display redesigned societies page (#194) * feat(societies): add ProgressBarComponent * feat(societies): add SocietiesContainer * feat(societies): add society actions, types, reducer and saga - add society initial state * feat(societies): move TruncateDescriptionContainer to common folder - refactor societies path - add loggedActivities argument in fetchSocietyInfoSuccess action * feat(societies): add SocietyActivitiesComponent - add defaultProps and propTypes in SocietiesContainer - refactor to add societyName object - refactor match propType - add societies scss file - add society image placeholder - add Activities and Redemption tabs - add className prop in SocietyStatsComponent - add background image on societies page profile - add SocietyActivitiesComponent tests * feat(societies): add totalPoints and activitiesLogged props * feat(societies): conditionally display total points & activities logged - refactor to remove unused classes - refactor styles under society-stats__desc class - refactor MyStatsComponent tests * fetch(societies): add action, reducer, data tests - add SocietiesContainer tests - add media queries and modify styles - add userinfo prop when authenticating society pages - modify color of points subscript - add SocietyStatsComponent tests * #164324997 Log Society Activity points (#188) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * fix datefns time format error * #164528722 Switch between activities and redemption tabs on any society page (#195) * feat(societyTabs): add TabsComponent - add selectedSocietyTab mixin - add styles for the selected tab title - add fetch society redemptions action types - handle fetch society redemptions actions in reducer - add fetch society redemptions generators - modify container to stateless component ): refactor tabs container * feat(societyTabs): display redemptions table - add selectedTab prop to SocietyActivitiesComponent - conditionally display redemptions table - add pointsToDollarConverter util - modify society initial state - add societyName to fetchSocietyInfoSuccess payload - refactor state returned in FETCH_SOCIETY_INFO_SUCCESS case block - refactor mapStateToProps to add society - add fetch society redemptions tests - add test to handle case FETCH_SOCIETY_REDEMPTIONS_SUCCESS in reducer - add watchFetchSocietyRedemptionsReq and fetchSocietyRedemptions generator tests - add pointsToDollarConverter test - add TabsComponent tests * add authorization token on the Header (#200) * #163083300 Display activities awaiting verification by a society secretary (#198) * feat(societyTabs): add TabsComponent - add selectedSocietyTab mixin - add styles for the selected tab title - add fetch society redemptions action types - handle fetch society redemptions actions in reducer - add fetch society redemptions generators - modify container to stateless component ): refactor tabs container * feat(verify): add Sidebar domain - rename SidebarComponent to SidebarContainer - add verify activities nav item - conditionally render an outlined checkmark - add outlined checkmark styles - add fetch user role actions, types, saga - handle actions in reducer - add sidebar initial state - conditionally render verify activities nav item - add VerifyActivities container - add VerifyActivitiesComponent - add tests - add ActionsComponent - add LoaderComponent - add action, reducer and saga tests * chore(dlevel): add user's dlevel (#199) * #164397766 Display Toast message after successfully logging an activity (#196) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * fix datefns time format error * success toast message * Clean Saga examples * resolve conflicts * feat(sidebar): get user id from token (#202) * Fix the Activity category and Date display (#203) * feat(sidebar): get user id from token * fix activity category and date name formats * #164830528 Display redemptions page (#201) * feat: add redemptions screen - add tests * feat: add redemptions nav item - add fetchSocietyInfoRequest request * chore: add SidebarContainer tests * feat(approve): Add Approve Budget page (#204) - move SocietyStatsComponent & TabsComponent to common folder - add ApproveActivitiesContainer - add TabsComponent - add ApproveBudgetComponent - add ApproveBudgetContainer tests - add getTabBorderClassname helper - add ApproveBudgetComponent tests - add Approve Budget nav item * feat(redeem): add redeem points dialog (#206) - add createRedemptionRequest and createRedemptionSuccess actions - add createRedemption generator - add dollarsToPointsConverter util - add redemption dialog styles - add RedeemPointsDialogComponent tests - add RedemptionsContainer tests - add action, reducer and saga tests - add money svg image * #164397809 Validate Log points Modal inputs (#197) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * fix failing CI build * tests * test * test * fix date format * add backround opacity by using Material UI Dialog (#208) * Ft log points validation (#212) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * fix failing CI build * tests * test * test * fix date format * resolve conflict * #165116475 Secretary verify activity (#207) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * activity verification by secretary * fix failing CI build * tests * test * test * fix date format * tests * resolve conflict * fix failing test * remove whitespace * test handleVerify * improve test * implement feedback * fix reducer * Verify activity alert modal (#209) * verify dialog * fix failing build * fix alert message * Approve reject budget actions (#210) * feat(approveBudget): Approve reject actions - add approve and reject click actions on ActionsComponent - add request, success actions for budget approval - add approve budget page loading and error actions - handle APPROVE_BUDGET actions - add approveBudget generator - add AlertDialogComponent - status and message parameters in approveBudgetSuccess - add approveBudgetStatus and approveBudgetMessage in society state - add action,reducer and saga tests - add AlertDialogComponent tests - add ApproveBudgetContainer tests - move ActionsComponent to common folder - add ActionsComponent tests * feat(approveReject): add tests - add api and ActionsComponent tests * feat(approveActivities): add approve activities page (#211) - add ApproveActivitiesComponent - add ApproveActivitiesContainer - add activities sidebar item - add tests * Add pagination (#214) * add pagination * include pagination across other pages * add tests * bug(dashboard): add usedPoints & remainingPoints (#215) - remove footer on sidebar - remove Profile dropdown item - remove dlevel - hide profile dropdown * feat: search (#213) - add Navbar folder - move NavbarContainer and tests tp Navbar folder - add search util - add search action - add reducer to handle SEARCH action - add search on all the pages - add tests * bug: blue login background (#216) - remove class container - add watchCreateRedemptionReq import * Adjust log points padding (#217) * adjust log points padding * api base url quick fix * update api base url * update * Filter engineer activities (#205) * add bootstrap js * add filter component * add filter css * add filter Component * fix css issue * export filter component * fix lint errors * change select all to lowercase * add test * add bootstrap js * add filter component * add filter css * add filter Component * fix css issue * export filter component * fix lint errors * change select all to lowercase * add test * chore(filter): add tests * fix lint * remove event listener * fix api base url and pagination display (#220) * bug: fix staging errors (#221) - fix redemption date error - fix activity status sent while verifying by society secretary * feat(filter): filter society activities (#219) - import Filter component - add filter dropdown - add filter functionality [Finishes ######] * Resolve deploy v2 conflicts (#223) * chore(badges): rename the badges (#169) - rename badges to match the new repository [ Fixes #162779200 ] * chore(deployment): remove deployment for MVP2 on develop (#175) - ensure that branches from develop do not point to MVP2 [ Fixes #163449835 ]
Kachulio1
added a commit
that referenced
this pull request
Jun 24, 2019
* feat(logging): implement logging on the frontend (#162) - introduce the package morgan to the frontend application - log to stderr and stdout [ Fixes #162052401 ] * feat(design) CI/CD pipeline (#166) - refactor CI/CD pipeline to include a design branch - configure bundling for design environment [ Fixes #162496788 ] * chore(badges): rename the badges (#169) - rename badges to match the new repository [ Fixes #162779200 ] * chore(deployment): remove deployment for MVP2 on develop (#175) - ensure that branches from develop do not point to MVP2 [ Fixes #163449835 ] * Deploy v2 (#222) * Clean up in preparation for version 2 * Set up new folder structure and web pack config (#167) * chore(setup): add webpack configuration * chore(setup): add HomeComponent * feat(setup): add webpack dev config feat(setup): add eslint dependencies * feat(setup): add babel config * feat(setup): add clean-webpack-plugin dependency * feat(setup): add optimization using splitChunks - add CleanWebpackPlugin config - add MiniCssExtractPlugin config - refactor to use source-map * feat(setup): add webpack config for production * feat(setup): add node sass dependency - add home scss * feat(setup): add jest and enzyme for testing - test HomeComponent * chore(tests): add babel-core dependency - add jest config file * chore(setup): add coveralls dependency * chore(node): upgrade node version - upgrade node version to enable compatibility with eslint upgrade [ Fixes #162770492 ] * chore(badges): circle ci & coveralls badges (#171) - change badges to reflect the develop v2 branch [ Fixes #163145741] * #163360183 Continuous deployment for develop-V2 (#174) * ft(container): create a docker image - create a docker file that creates the application production environment [ Fixes #163360183] * chore(cleanup): remove unused commands - remove the copy:favicon command [ Fixes #163360183 ] * chore(node): move to node version 10 - use node version 10 in tests and deployment - add deployment for develop-v2 [ Fixes #163360183 ] * feat(deployment): add deployment script - Add a deployment script for the application - change the design configuration on the application to staging_v2 - Refactor the slack notification script [ Fixes #163360183 ] * chore(docker-image): opt for a lighter images - choose alpine image [ Fixes #163360183 ] * Add new login design (#172) * feat(login): add css variables * feat(login): add login component * feat(routes): add routes * feat(styles): add login component scss * feat(login): add Din Pro font face * feat(login): add jwt-decode and js-cookie dependencies - use js-ccokie to get token - use js-decode to decode token - add function tokenIsValid to check validity of the decoded token - add check to route to login or home in componentDidMount * feat(login): add component to authenticate routes and its tests - add devServer config - refactor login test to add history prop - add image place holder * feat(login): add token fixture - add tokenIsValid test * feat(login): add bootstrap and modify css - add rem function to convert px to rem - add bootstrap classes in LoginComponent - add lightGray css variable * feat(login): add test cases - add test case for components not authenticated - add invalid token test case * chore(domains): update domains (#181) - update domains to use the v2 version [ Fixes #163615519] * Setup Redux and Redux-Saga (#170) * Redux Saga setup * Clean Saga examples * Resolve Conflicts * Resolve conflicts * Create personal dashboard (#178) * feat(login): add login component * feat(dashboard): add a HeroComponent * feat(dashboard): add SidebarComponent * feat(dashboard): refactor login component to add LogoCompoment - add styling for hero class * feat(dashboard): add Dashboard component * feat(dashboard): add MyStatsComponent and SocietyStatsComponent * feat(dashboard): add sidebar footer and it's scss file feat(dashboard): add styles and logoClassType props in LogoComponent * feat(dashboard): add dashboard svg, blue and white andela image logos * feat(dashboard): add navbar component with its scss file * feat(dashboard): add Navbar component in dashboard - add css classes and styling in Navbar component * feat(dashboard): add text-styles mixin - add person placeholder image - add jpg in test property of url-loader - add css classes to MyStatsComponent - add myStats scss file - add css classes to SocietyStatsComponent - add societyStats.scss * feat(dashboard): add buttons to log points and filter - add button component and it's styling * feat(dashboard): add file-loader * feat(dashboard): add society icons * feat(dashboard): add media queries for small and medium devices - handle responsiveness of dashboard component * feat(dashboard): add media queries to handle resposiveness of society stats component * feat(Dashboard): add component tests - add dashboard component tests - add my stats component tests - add society stats component tests - add button component tests - add hero component tests - add logo component tests - add navabar tests - add sidebar component tests - add wrapper, main-content, sidebar and sub-content class names - add position absolute to main-content - add flex grow in sub-content * feat(dashboard): add sidebar in navbar component - add media query for small and other devices * feat(dashboard): add NavItem component in sidebar component - add NavItem component - add media query for devices with width > 767 * feat(dashboard): add capitalize util * feat(dashboard): add css files in styles folder of each domain - add NavItemComponent tests - add Capitalize tests - add NavbarComponent tests - refactor image urls in logo.scss * feat(dashboard): add image svg files * feat(dashboard): add society icon class names and their images - add border left on hover - add top navigation separator * feat(dashboard): refactor to use rems * feat(dashboard): refactor svg files * feat(dashboard): add constants and refactor scss files to add spaces * feat(dashboard): add date-fns dependency - remove default webkit - remove png images * feat(dashboard): add progress bar * Display graphic of total points and activities logged (#182) * feat(login): add login component * feat(dashboard): add a HeroComponent * feat(dashboard): add SidebarComponent * feat(dashboard): refactor login component to add LogoCompoment - add styling for hero class * feat(dashboard): add Dashboard component * feat(dashboard): add MyStatsComponent and SocietyStatsComponent * feat(dashboard): add sidebar footer and it's scss file feat(dashboard): add styles and logoClassType props in LogoComponent * feat(dashboard): add dashboard svg, blue and white andela image logos * feat(dashboard): add navbar component with its scss file * feat(dashboard): add Navbar component in dashboard - add css classes and styling in Navbar component * feat(dashboard): add text-styles mixin - add person placeholder image - add jpg in test property of url-loader - add css classes to MyStatsComponent - add myStats scss file - add css classes to SocietyStatsComponent - add societyStats.scss * feat(dashboard): add buttons to log points and filter - add button component and it's styling * feat(dashboard): add file-loader * feat(dashboard): add society icons * feat(dashboard): add media queries for small and medium devices - handle responsiveness of dashboard component * feat(dashboard): add media queries to handle resposiveness of society stats component * feat(Dashboard): add component tests - add dashboard component tests - add my stats component tests - add society stats component tests - add button component tests - add hero component tests - add logo component tests - add navabar tests - add sidebar component tests - add wrapper, main-content, sidebar and sub-content class names - add position absolute to main-content - add flex grow in sub-content * feat(dashboard): add sidebar in navbar component - add media query for small and other devices * feat(dashboard): add NavItem component in sidebar component - add NavItem component - add media query for devices with width > 767 * feat(dashboard): add capitalize util * feat(dashboard): add css files in styles folder of each domain - add NavItemComponent tests - add Capitalize tests - add NavbarComponent tests - refactor image urls in logo.scss * feat(dashboard): add image svg files * feat(dashboard): add society icon class names and their images - add border left on hover - add top navigation separator * feat(dashboard): refactor to use rems * feat(dashboard): refactor svg files * feat(dashboard): add constants and refactor scss files to add spaces * feat(dashboard): add date-fns dependency - remove default webkit - remove png images * feat(dashboard): add progress bar * feat(dashboard): add Dashboard component * feat(totalPointsAndActivities): configure store, sagas and reducer * feat(userActivites): add fetch user activities actions and types * feat(userActivities): add fetch user activities saga - handle fetch user activities actions in reducer * feat(userActivities): add api util - add get request util - add getToken and getUserInfo utils * feat(userActivities): Add dependencies - add redux-saga - add redux - add redux-devtools-extension * feat(userActivities): add plugin-transform-runtime dependency * feat(userActivities): map dashboard state to props - add post util * feat(userActivities): resolve linting errors * feat(userActivities): add action to fetchUser - handle fetchUser action in reducer * feat(useraActivities): add tests - add tests for dashboard actions i.e fetch user activities. - add reducer tests - refactor to remove fetch user action * feat(userActivities): add tests - add Dashboard tests - add dashboard saga tests - add tokenIsValid test * feat(userActivities): add background image in HeroComponent * feat(userActivities): evaluate the right JSX before rendering * Add api util tests * feat(userActivities): add token parameter to tokenIsValid & getUserInfo * Add button interactions (#184) * chore(feedback): Add pointer cursor to settings nav item - add pointer cursor to buttons - add box shadow and transition to hover state - add bold font weight to society stats * chore(feedback): add colors variables - remove unused content-wrapper class * chore(feedback): use andela blue and gold colors * chore(feedback): add border around society icons - reduce height and width of society svgs * chore(feedback): refactor button styles - add shared class user-dashboard__button - remove unshared hover state styles and button class * chore(feedback): add mixins - add border and widthAndHeight mixin * Wrap pages within common sidebar and navigation bar (#185) * chore(commonWrapper): wrap components under common sidebar and navbar - redirect to login if not authenticated - remove hero, navbar and sidebar component from dashboard component * chore(commonWrapper): add user's society in state * chore(commonWrapper): add user's society image in society stats component - pass down user's society as props to society stats component - add society images * chore(commonWrapper): refactor tests to add society * chore: add background image on login page (#189) * #163083355 Display redesigned my logged activities (#187) * feat(loggedActivities): add TableComponent * feat(myActivities): add table component and its scss * feat(myActivities): add TruncateDescriptionComponent and its scss * feat(myActivities): add onClick prop * feat(myActivities): add MyActivities component - add userActivities constant * feat(myActivities): rework dashboard to edit padding and margin values * feat(myActivities): Add tableClassName prop in TableComponent - add myActivities scss file - add truncateDescription scss file - add styles to TableComponent - refactor dashboard actions * feat(myActivities): add society prop - rename color value * feat(myActivities): format date value - modify text styles for table body - add border collapse and spacing styles on table class * feat(myActivities): add MyActivitiesComponent and TableComponent tests - add condition to check if there are userActivities * feat(myActivities): Add StatusIndicatorComponent - add statusIndicator scss file - add colors representing the various statuses - make use of status indicator component in MyActivities and SocietyStats components * feat(myActivities): Add TruncateDescriptionComponent tests * feat(myActivities): add colSpan attribute on table data * chore(rename): rename stateful components to have container suffix (#191) - add DashboardContainer - add TruncateDescriptionContainer - add LoginContainer - add NavbarContainer * feat(userProfile): add profile component (#190) - add its scss file - add userInfo prop - pass down userInfo prop to NavbarComponent - add prop validation for userInfo - add profile dropdown menu - refactor remove logo styles - add user profile on small devices - refactor profile component to be stateful - add profileIconClick - add classname prop - add tests - add withRouter on login component - add function to logOut a user - add removeCookies util - add tests - add box shadow on profile dropdown - add a class on buttons in the DashboardComponent - rename component to ProfileContainer * chore(login): update image on login page (#193) * chore(pipeline): master-V2 pipeline (#186) - create a pipeline for master-V2 [ Fixes #164102566 ] * #163083132 Display redesigned societies page (#194) * feat(societies): add ProgressBarComponent * feat(societies): add SocietiesContainer * feat(societies): add society actions, types, reducer and saga - add society initial state * feat(societies): move TruncateDescriptionContainer to common folder - refactor societies path - add loggedActivities argument in fetchSocietyInfoSuccess action * feat(societies): add SocietyActivitiesComponent - add defaultProps and propTypes in SocietiesContainer - refactor to add societyName object - refactor match propType - add societies scss file - add society image placeholder - add Activities and Redemption tabs - add className prop in SocietyStatsComponent - add background image on societies page profile - add SocietyActivitiesComponent tests * feat(societies): add totalPoints and activitiesLogged props * feat(societies): conditionally display total points & activities logged - refactor to remove unused classes - refactor styles under society-stats__desc class - refactor MyStatsComponent tests * fetch(societies): add action, reducer, data tests - add SocietiesContainer tests - add media queries and modify styles - add userinfo prop when authenticating society pages - modify color of points subscript - add SocietyStatsComponent tests * #164324997 Log Society Activity points (#188) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * fix datefns time format error * #164528722 Switch between activities and redemption tabs on any society page (#195) * feat(societyTabs): add TabsComponent - add selectedSocietyTab mixin - add styles for the selected tab title - add fetch society redemptions action types - handle fetch society redemptions actions in reducer - add fetch society redemptions generators - modify container to stateless component ): refactor tabs container * feat(societyTabs): display redemptions table - add selectedTab prop to SocietyActivitiesComponent - conditionally display redemptions table - add pointsToDollarConverter util - modify society initial state - add societyName to fetchSocietyInfoSuccess payload - refactor state returned in FETCH_SOCIETY_INFO_SUCCESS case block - refactor mapStateToProps to add society - add fetch society redemptions tests - add test to handle case FETCH_SOCIETY_REDEMPTIONS_SUCCESS in reducer - add watchFetchSocietyRedemptionsReq and fetchSocietyRedemptions generator tests - add pointsToDollarConverter test - add TabsComponent tests * add authorization token on the Header (#200) * #163083300 Display activities awaiting verification by a society secretary (#198) * feat(societyTabs): add TabsComponent - add selectedSocietyTab mixin - add styles for the selected tab title - add fetch society redemptions action types - handle fetch society redemptions actions in reducer - add fetch society redemptions generators - modify container to stateless component ): refactor tabs container * feat(verify): add Sidebar domain - rename SidebarComponent to SidebarContainer - add verify activities nav item - conditionally render an outlined checkmark - add outlined checkmark styles - add fetch user role actions, types, saga - handle actions in reducer - add sidebar initial state - conditionally render verify activities nav item - add VerifyActivities container - add VerifyActivitiesComponent - add tests - add ActionsComponent - add LoaderComponent - add action, reducer and saga tests * chore(dlevel): add user's dlevel (#199) * #164397766 Display Toast message after successfully logging an activity (#196) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * fix datefns time format error * success toast message * Clean Saga examples * resolve conflicts * feat(sidebar): get user id from token (#202) * Fix the Activity category and Date display (#203) * feat(sidebar): get user id from token * fix activity category and date name formats * #164830528 Display redemptions page (#201) * feat: add redemptions screen - add tests * feat: add redemptions nav item - add fetchSocietyInfoRequest request * chore: add SidebarContainer tests * feat(approve): Add Approve Budget page (#204) - move SocietyStatsComponent & TabsComponent to common folder - add ApproveActivitiesContainer - add TabsComponent - add ApproveBudgetComponent - add ApproveBudgetContainer tests - add getTabBorderClassname helper - add ApproveBudgetComponent tests - add Approve Budget nav item * feat(redeem): add redeem points dialog (#206) - add createRedemptionRequest and createRedemptionSuccess actions - add createRedemption generator - add dollarsToPointsConverter util - add redemption dialog styles - add RedeemPointsDialogComponent tests - add RedemptionsContainer tests - add action, reducer and saga tests - add money svg image * #164397809 Validate Log points Modal inputs (#197) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * fix failing CI build * tests * test * test * fix date format * add backround opacity by using Material UI Dialog (#208) * Ft log points validation (#212) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * fix failing CI build * tests * test * test * fix date format * resolve conflict * #165116475 Secretary verify activity (#207) * Redux Saga setup * Clean Saga examples * Onboading screen * log points * merge conflicts * Log society activity points * Log points reducer tests * log activity points action tests * log activity points generators and component tests * refactor and implement review feedback * remove evaluation * update branch * add expects blocks to my tests * team feedback implementation * improve test coverage * improve test coverage * improve tests * toast component * Remove unnecessary code * logged activity should be added to the user activity list * Rename file * test componentDidUpdate * add snapshot * toast component * add modal inputs validation * commit * fix failing test * clean branch * activity verification by secretary * fix failing CI build * tests * test * test * fix date format * tests * resolve conflict * fix failing test * remove whitespace * test handleVerify * improve test * implement feedback * fix reducer * Verify activity alert modal (#209) * verify dialog * fix failing build * fix alert message * Approve reject budget actions (#210) * feat(approveBudget): Approve reject actions - add approve and reject click actions on ActionsComponent - add request, success actions for budget approval - add approve budget page loading and error actions - handle APPROVE_BUDGET actions - add approveBudget generator - add AlertDialogComponent - status and message parameters in approveBudgetSuccess - add approveBudgetStatus and approveBudgetMessage in society state - add action,reducer and saga tests - add AlertDialogComponent tests - add ApproveBudgetContainer tests - move ActionsComponent to common folder - add ActionsComponent tests * feat(approveReject): add tests - add api and ActionsComponent tests * feat(approveActivities): add approve activities page (#211) - add ApproveActivitiesComponent - add ApproveActivitiesContainer - add activities sidebar item - add tests * Add pagination (#214) * add pagination * include pagination across other pages * add tests * bug(dashboard): add usedPoints & remainingPoints (#215) - remove footer on sidebar - remove Profile dropdown item - remove dlevel - hide profile dropdown * feat: search (#213) - add Navbar folder - move NavbarContainer and tests tp Navbar folder - add search util - add search action - add reducer to handle SEARCH action - add search on all the pages - add tests * bug: blue login background (#216) - remove class container - add watchCreateRedemptionReq import * Adjust log points padding (#217) * adjust log points padding * api base url quick fix * update api base url * update * Filter engineer activities (#205) * add bootstrap js * add filter component * add filter css * add filter Component * fix css issue * export filter component * fix lint errors * change select all to lowercase * add test * add bootstrap js * add filter component * add filter css * add filter Component * fix css issue * export filter component * fix lint errors * change select all to lowercase * add test * chore(filter): add tests * fix lint * remove event listener * fix api base url and pagination display (#220) * bug: fix staging errors (#221) - fix redemption date error - fix activity status sent while verifying by society secretary * feat(filter): filter society activities (#219) - import Filter component - add filter dropdown - add filter functionality [Finishes ######] * Resolve deploy v2 conflicts (#223) * chore(badges): rename the badges (#169) - rename badges to match the new repository [ Fixes #162779200 ] * chore(deployment): remove deployment for MVP2 on develop (#175) - ensure that branches from develop do not point to MVP2 [ Fixes #163449835 ] * remove require (#224) * remove background color (#226)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Description of Task to be completed?
Screenshots?
Before
After