Skip to content

Commit

Permalink
Merge pull request #57 from AnWhiteM/sidebar
Browse files Browse the repository at this point in the history
boards operations update
  • Loading branch information
AnWhiteM authored Jun 13, 2024
2 parents 2f04846 + 5b572ce commit bf192bd
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 37 deletions.
54 changes: 27 additions & 27 deletions src/assets/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235323/2x-mob/mvpdq41gwcl2lzeslisp.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235354/1x-tab/ioqrlucnqyw3jt9uhbxd.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235328/2x-tab/iqt1mdlqxkpvd1r8emqd.png",
"desc": "../img/1x-desk/1x-deskFont-1.png",
"desc2x": "../img/2x-desk/2x-deskFont-1.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235337/1x-desk/pobsjmzuxudyk3cgmsl5.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235360/2x-desk/zysg5jhxr1hcdmivu6os.png"
},
{
"id": 3,
Expand All @@ -23,8 +23,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235325/2x-mob/muyccsdzhajjt8ir3cdf.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235356/1x-tab/hbvpwof5pqbwosuapdjm.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235331/2x-tab/yc3ymht5dqpkefepnrh1.png",
"desc": "../img/1x-desk/1x-deskFont-2.png",
"desc2x": "../img/2x-desk/2x-deskFont-2.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235339/1x-desk/oapliursewappq2xecx5.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235367/2x-desk/hg9r4i8ouu2a3oo4uebr.png"
},
{
"id": 4,
Expand All @@ -34,8 +34,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235326/2x-mob/jqwhkabzxxqlx7ka57o0.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235357/1x-tab/evkre7nbixr4nbxnjadw.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235331/2x-tab/r7ewqeeviswrbgbplzon.png",
"desc": "../img/1x-desk/1x-deskFont-3.png",
"desc2x": "../img/2x-desk/2x-deskFont-3.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235340/1x-desk/nczwh9mawqohloyisvwe.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235364/2x-desk/k1zauxqydmrhb2t2motm.png"
},
{
"id": 5,
Expand All @@ -45,8 +45,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235326/2x-mob/je40mg4acb8s6zyvqomb.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235357/1x-tab/nqrgynkocstk8mbdwlhz.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235332/2x-tab/dqzc2on0rg5nkbwhmpoa.png",
"desc": "../img/1x-desk/1x-deskFont-4.png",
"desc2x": "../img/2x-desk/2x-deskFont-4.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235340/1x-desk/iqr8b9fjbxtmrzdlgvai.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235364/2x-desk/vnewplfmrsrb3zkc4vss.png"
},
{
"id": 6,
Expand All @@ -56,8 +56,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235327/2x-mob/drzducr8ysszjshfrduz.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235357/1x-tab/fd3pqrduz1zobibqk9oo.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235332/2x-tab/rglefgabqtyganra1zsf.png",
"desc": "../img/1x-desk/1x-deskFont-5.png",
"desc2x": "../img/2x-desk/2x-deskFont-5.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235341/1x-desk/unskfxufmemjw3lsich7.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235365/2x-desk/otrofjuiozlonxxfhhvp.png"
},
{
"id": 7,
Expand All @@ -67,8 +67,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235327/2x-mob/p03gwo5vnan4fz21o79x.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235358/1x-tab/vz651v8br4wo1ftodfid.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235332/2x-tab/qlzisddo3mfxja55mk2x.png",
"desc": "../img/1x-desk/1x-deskFont-6.png",
"desc2x": "../img/2x-desk/2x-deskFont-6.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235341/1x-desk/bfh9y6yzaklfekgaxjgs.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235366/2x-desk/etesp60ueaq7xrtuuquu.png"
},
{
"id": 8,
Expand All @@ -77,9 +77,9 @@
"mob": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235353/1x-mob/hwza2y9cbmm1ugztpzau.png",
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235327/2x-mob/j5uznxxkeechaqm2oyqd.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235358/1x-tab/lzstv3qds2xu39ktpcrh.png",
"tab2x": "../img/2x-tab/2x-tabFont-7.png",
"desc": "../img/1x-desk/1x-deskFont-7.png",
"desc2x": "../img/2x-desk/2x-deskFont-7.png"
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235333/2x-tab/rr9ygs7cmhbcymqbk8ff.png",
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235341/1x-desk/l1pqdmjaw5kq3ss6qffg.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235366/2x-desk/neitikrrdzpyjadiu7wr.png"
},
{
"id": 9,
Expand Down Expand Up @@ -111,8 +111,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235324/2x-mob/iinty7rvj5cogcaue3s0.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235354/1x-tab/pyhqiur1zhrbmwmboqwb.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235329/2x-tab/w5mzxhvgporgdavhedz7.png",
"desc": "../img/1x-desk/1x-deskFont-10.png",
"desc2x": "../img/2x-desk/2x-deskFont-10.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235337/1x-desk/kyb9nhuxyirxchycsldn.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235361/2x-desk/gqdxolkswwljlkyrrdmn.png"
},
{
"id": 12,
Expand All @@ -122,8 +122,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235324/2x-mob/iinty7rvj5cogcaue3s0.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235354/1x-tab/wefdqmfyr9fgn0onwydn.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235329/2x-tab/vx3anq5tyjpl0cmytaoe.png",
"desc": "../img/1x-desk/1x-deskFont-11.png",
"desc2x": "../img/2x-desk/2x-deskFont-11.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235338/1x-desk/kuo2fsqmppfpangfovpu.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235362/2x-desk/lbfnb8che6ewpb3ovh6k.png"
},
{
"id": 13,
Expand All @@ -133,8 +133,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235324/2x-mob/bdkcjwh2vei7u2yyusii.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235355/1x-tab/nh5fy8d8lpxleqiubxhc.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235330/2x-tab/fgweqqhsmqex53je6qtm.png",
"desc": "../img/1x-desk/1x-deskFont-12.png",
"desc2x": "../img/2x-desk/2x-deskFont-12.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235338/1x-desk/a9gnbsdllsxexcappiev.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235367/2x-desk/kujozvu4frt83b91d57f.png"
},
{
"id": 14,
Expand All @@ -144,8 +144,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235324/2x-mob/bozodmvctup9rkuzipra.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235355/1x-tab/hq2vvoyew0xx1zihpx0l.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235330/2x-tab/sibjesgk4uczv8vzluzl.png",
"desc": "../img/1x-desk/1x-deskFont-13.png",
"desc2x": "../img/2x-desk/2x-deskFont-13.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235338/1x-desk/zyrxugu6dv1tgnipciq5.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235362/2x-desk/w8wxoabqoik4i1psghqj.png"
},
{
"id": 15,
Expand All @@ -155,8 +155,8 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235325/2x-mob/quff1jmljjsdhciiez2p.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235356/1x-tab/rjxpilhpsnwp6dxe1qvh.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235330/2x-tab/kycqmtmyrufie2rhg8sk.png",
"desc": "../img/1x-desk/1x-deskFont-14.png",
"desc2x": "../img/2x-desk/2x-deskFont-14.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235339/1x-desk/fbrx05riua7hlyitfuya.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235363/2x-desk/fmnf9p9zmzwklmt4pyjr.png"
},
{
"id": 16,
Expand All @@ -166,7 +166,7 @@
"mob2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235325/2x-mob/tb9mijj7ehl4dovwtwlb.png",
"tab": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235356/1x-tab/rdthj1sccspbqbjf3dze.png",
"tab2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235331/2x-tab/hhejtfwhmkvagmrbvl42.png",
"desc": "../img/1x-desk/1x-deskFont-15.png",
"desc2x": "../img/2x-desk/2x-deskFont-15.png"
"desc": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235339/1x-desk/zd79sr45vnnoyzuyzwux.png",
"desc2x": "https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235364/2x-desk/drnfrohvwkcmtk0vv7ze.png"
}
]
3 changes: 1 addition & 2 deletions src/components/Board/Board.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from "react";
import EditBoardModal from "../EditBoardModal/EditBoardModal";
import { useDispatch } from "react-redux";
import { deleteBoard, getBoards } from "../../redux/boards/operations";
import { deleteBoard } from "../../redux/boards/operations";
import toast from "react-hot-toast";

import svg from "../../img/icons.svg";
Expand All @@ -17,7 +17,6 @@ export default function Board({ board }) {

const handleDelete = () => {
dispatch(deleteBoard(_id));
dispatch(getBoards());
boardDeleteNotify();
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/Header.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
cursor: pointer;
border-radius: 5px;
margin-left: 8px;
background-image: url(/src/img/deftAvBlack.png);
background-image: url(https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235453/pojpj365oqqbots9321l.png);
background-repeat: no-repeat;
background-position: center;
background-size: cover;
Expand Down
6 changes: 3 additions & 3 deletions src/components/HelpBlock/HelpBlock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ export default function HelpBlock() {
<picture>
<source
srcSet={`
/img/1x-sidebar-plant.png 54w,
/img/2x-sidebar-plant.png 108w`}
https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235453/rknxidxdzvbuiradrwyc.png 54w,
https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235454/stsa8f4qaylxaggszjey.png 108w`}
sizes="(min-width: 1440px) 54px, (min-width: 1280px) 54px, (min-width: 768px) 54px, (min-width: 320px) 54px"
/>
<img
className={css.img}
src="/img/1x-sidebar-plant.png"
src="https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235453/rknxidxdzvbuiradrwyc.png"
alt="Kaktus"
/>
</picture>
Expand Down
11 changes: 7 additions & 4 deletions src/pages/LoginPage/LoginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ export default function LoginPage() {
<picture>
<source
srcSet={`
/img/1x-mob-man.png 54w,
/img/2x-mob-man.png 108w`}
sizes="(min-width: 1440px) 54px, (min-width: 1280px) 54px, (min-width: 768px) 54px, (min-width: 320px) 54px"
https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235452/p6ex38slxwvcjwcwnbxj.png 124w,
https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235452/ixq02fsx2ekcu2qu7nb0.png 248w`}
sizes="(min-width: 1440px) 124px, (min-width: 1280px) 124px, (min-width: 768px) 124px, (min-width: 320px) 124px"
/>
<img
src="https://res.cloudinary.com/dqwyuuuzd/image/upload/v1718235452/ixq02fsx2ekcu2qu7nb0.png"
alt="man after the laptop"
/>
<img src="/img/1x-mob-man.png" alt="Kaktus" />
</picture>

<div className={css.title}>
Expand Down
1 change: 1 addition & 0 deletions src/redux/boards/operations.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const deleteBoard = createAsyncThunk(
async (boardId, thunkAPI) => {
try {
const response = await axios.delete(`/home/${boardId}`);
await thunkAPI.dispatch(getBoards());
return response.data;
} catch (error) {
return thunkAPI.rejectWithValue(error.message);
Expand Down

0 comments on commit bf192bd

Please sign in to comment.