apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from apuc/tracker-connect-back

Browse Source 
fix
This commit is contained in:
NikoM1k 2023-06-13 12:03:15 +03:00 committed by GitHub
commit 6abc3c2c0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Common/BaseButton/BaseButton.jsx
View File

@ -1,11 +1,11 @@
import React from "react"; import React from "react";
import classes from "./basebutton.module.scss"; import "./basebutton.scss"
export const BaseButton = ({ children, styles, ...props }) => { export const BaseButton = ({ children, styles, ...props }) => {
return ( return (
<button <button
className={styles ? `${styles} ${classes.button}` : classes.button} className={styles ? `${styles} button` : "button"}
{...props} {...props}
> >
{children} {children}

0
src/components/Common/BaseButton/basebutton.module.scss → src/components/Common/BaseButton/basebutton.scss
View File

3
src/components/UI/TicketFullScreen/TicketFullScreen.jsx
View File

@ -16,7 +16,7 @@ import {
setProjectBoardFetch, setProjectBoardFetch,
setToggleTab, setToggleTab,
getProjectBoard, getProjectBoard,
getBoarderLoader, filteredParticipateTasks, filterCreatedByMe getBoarderLoader,
} from "../../../redux/projectsTrackerSlice"; } from "../../../redux/projectsTrackerSlice";
import { apiRequest } from "../../../api/request"; import { apiRequest } from "../../../api/request";
@ -33,7 +33,6 @@ import link from "../../../images/link.svg";
import archive2 from "../../../images/archive.svg"; import archive2 from "../../../images/archive.svg";
import del from "../../../images/delete.svg"; import del from "../../../images/delete.svg";
import edit from "../../../images/edit.svg"; import edit from "../../../images/edit.svg";
import accept from "../../../assets/images/accept.png";
import close from "../../../images/closeProjectPersons.svg"; import close from "../../../images/closeProjectPersons.svg";
import "./ticketFullScreen.scss"; import "./ticketFullScreen.scss";