From 4f9d08d064b4be8c4abe0e509c78264f2c0ebda1 Mon Sep 17 00:00:00 2001 From: Maximus Date: Wed, 27 Jul 2022 18:38:08 +0300 Subject: [PATCH 1/6] Collect icons, modified svg tag into them, create icons.tsx to reexport our icons --- src/assets/svg/Aggow-Big-Right.svg | 3 ++ src/assets/svg/Arrow-Down.svg | 4 +++ src/assets/svg/Arrow-Left.svg | 4 +++ src/assets/svg/Bookmark.svg | 3 ++ src/assets/svg/Caret-Down.svg | 3 ++ src/assets/svg/Caret-Left.svg | 3 ++ src/assets/svg/Caret-Right.svg | 3 ++ src/assets/svg/Caret-Up.svg | 3 ++ src/assets/svg/Chevrones-Left.svg | 6 ++++ src/assets/svg/Chevrones-Right.svg | 6 ++++ src/assets/svg/Cite.svg | 9 ++++++ src/assets/svg/Copy.svg | 4 +++ src/assets/svg/Delete.svg | 5 ++++ src/assets/svg/Download.svg | 5 ++++ src/assets/svg/Error.svg | 5 ++++ src/assets/svg/Favorite.svg | 3 ++ src/assets/svg/Filetext.svg | 7 +++++ src/assets/svg/Folder.svg | 5 ++++ src/assets/svg/Key.svg | 6 ++++ src/assets/svg/List.svg | 8 ++++++ src/assets/svg/Minus.svg | 3 ++ src/assets/svg/More.svg | 5 ++++ src/assets/svg/Plus.svg | 4 +++ src/assets/svg/Printer.svg | 5 ++++ src/assets/svg/Share.svg | 3 ++ src/assets/svg/XMark.svg | 4 +++ src/assets/svg/arrow-right-short.svg | 4 --- src/assets/svg/arrow-right.svg | 6 ++-- src/assets/svg/at-sign.svg | 3 -- src/assets/svg/backstab.svg | 7 ----- src/assets/svg/bell.svg | 7 ----- src/assets/svg/check.svg | 5 ---- src/assets/svg/chip.svg | 3 -- src/assets/svg/circle-progress.svg | 17 ------------ src/assets/svg/cog.svg | 7 ----- src/assets/svg/dollar.svg | 4 --- src/assets/svg/dropdown.svg | 6 ---- src/assets/svg/envelope.svg | 7 ----- src/assets/svg/exit.svg | 8 ------ src/assets/svg/fingerprint.svg | 8 ------ src/assets/svg/globe.svg | 8 ------ src/assets/svg/hexagon.svg | 3 -- src/assets/svg/identification.svg | 3 -- src/assets/svg/lock.svg | 7 ----- src/assets/svg/logotype-fsize-horizontal.svg | 5 ---- src/assets/svg/logotype-fsize.svg | 5 ---- src/assets/svg/logotype.svg | 4 --- src/assets/svg/moon.svg | 3 -- src/assets/svg/phone.svg | 3 -- src/assets/svg/search.svg | 7 ++--- src/assets/svg/services.svg | 11 -------- src/assets/svg/shield.svg | 7 ----- src/assets/svg/speed.svg | 3 -- src/assets/svg/times.svg | 7 ----- src/assets/svg/user-add.svg | 9 ------ src/assets/svg/user.svg | 7 ++--- src/assets/svg/users.svg | 9 ------ src/components/icons.tsx | 29 ++++++++++++++++++++ 58 files changed, 155 insertions(+), 186 deletions(-) create mode 100644 src/assets/svg/Aggow-Big-Right.svg create mode 100644 src/assets/svg/Arrow-Down.svg create mode 100644 src/assets/svg/Arrow-Left.svg create mode 100644 src/assets/svg/Bookmark.svg create mode 100644 src/assets/svg/Caret-Down.svg create mode 100644 src/assets/svg/Caret-Left.svg create mode 100644 src/assets/svg/Caret-Right.svg create mode 100644 src/assets/svg/Caret-Up.svg create mode 100644 src/assets/svg/Chevrones-Left.svg create mode 100644 src/assets/svg/Chevrones-Right.svg create mode 100644 src/assets/svg/Cite.svg create mode 100644 src/assets/svg/Copy.svg create mode 100644 src/assets/svg/Delete.svg create mode 100644 src/assets/svg/Download.svg create mode 100644 src/assets/svg/Error.svg create mode 100644 src/assets/svg/Favorite.svg create mode 100644 src/assets/svg/Filetext.svg create mode 100644 src/assets/svg/Folder.svg create mode 100644 src/assets/svg/Key.svg create mode 100644 src/assets/svg/List.svg create mode 100644 src/assets/svg/Minus.svg create mode 100644 src/assets/svg/More.svg create mode 100644 src/assets/svg/Plus.svg create mode 100644 src/assets/svg/Printer.svg create mode 100644 src/assets/svg/Share.svg create mode 100644 src/assets/svg/XMark.svg delete mode 100644 src/assets/svg/arrow-right-short.svg delete mode 100644 src/assets/svg/at-sign.svg delete mode 100644 src/assets/svg/backstab.svg delete mode 100644 src/assets/svg/bell.svg delete mode 100644 src/assets/svg/check.svg delete mode 100644 src/assets/svg/chip.svg delete mode 100644 src/assets/svg/circle-progress.svg delete mode 100644 src/assets/svg/cog.svg delete mode 100644 src/assets/svg/dollar.svg delete mode 100644 src/assets/svg/dropdown.svg delete mode 100644 src/assets/svg/envelope.svg delete mode 100644 src/assets/svg/exit.svg delete mode 100644 src/assets/svg/fingerprint.svg delete mode 100644 src/assets/svg/globe.svg delete mode 100644 src/assets/svg/hexagon.svg delete mode 100644 src/assets/svg/identification.svg delete mode 100644 src/assets/svg/lock.svg delete mode 100644 src/assets/svg/logotype-fsize-horizontal.svg delete mode 100644 src/assets/svg/logotype-fsize.svg delete mode 100644 src/assets/svg/logotype.svg delete mode 100644 src/assets/svg/moon.svg delete mode 100644 src/assets/svg/phone.svg delete mode 100644 src/assets/svg/services.svg delete mode 100644 src/assets/svg/shield.svg delete mode 100644 src/assets/svg/speed.svg delete mode 100644 src/assets/svg/times.svg delete mode 100644 src/assets/svg/user-add.svg delete mode 100644 src/assets/svg/users.svg create mode 100644 src/components/icons.tsx diff --git a/src/assets/svg/Aggow-Big-Right.svg b/src/assets/svg/Aggow-Big-Right.svg new file mode 100644 index 0000000..a9397d2 --- /dev/null +++ b/src/assets/svg/Aggow-Big-Right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Arrow-Down.svg b/src/assets/svg/Arrow-Down.svg new file mode 100644 index 0000000..a958b41 --- /dev/null +++ b/src/assets/svg/Arrow-Down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/Arrow-Left.svg b/src/assets/svg/Arrow-Left.svg new file mode 100644 index 0000000..e768e5a --- /dev/null +++ b/src/assets/svg/Arrow-Left.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/Bookmark.svg b/src/assets/svg/Bookmark.svg new file mode 100644 index 0000000..6a7aa54 --- /dev/null +++ b/src/assets/svg/Bookmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Caret-Down.svg b/src/assets/svg/Caret-Down.svg new file mode 100644 index 0000000..7018716 --- /dev/null +++ b/src/assets/svg/Caret-Down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Caret-Left.svg b/src/assets/svg/Caret-Left.svg new file mode 100644 index 0000000..d1e2a96 --- /dev/null +++ b/src/assets/svg/Caret-Left.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Caret-Right.svg b/src/assets/svg/Caret-Right.svg new file mode 100644 index 0000000..cd66b42 --- /dev/null +++ b/src/assets/svg/Caret-Right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Caret-Up.svg b/src/assets/svg/Caret-Up.svg new file mode 100644 index 0000000..11d79a7 --- /dev/null +++ b/src/assets/svg/Caret-Up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Chevrones-Left.svg b/src/assets/svg/Chevrones-Left.svg new file mode 100644 index 0000000..8653efb --- /dev/null +++ b/src/assets/svg/Chevrones-Left.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/Chevrones-Right.svg b/src/assets/svg/Chevrones-Right.svg new file mode 100644 index 0000000..cf1b7a3 --- /dev/null +++ b/src/assets/svg/Chevrones-Right.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/Cite.svg b/src/assets/svg/Cite.svg new file mode 100644 index 0000000..318e475 --- /dev/null +++ b/src/assets/svg/Cite.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/svg/Copy.svg b/src/assets/svg/Copy.svg new file mode 100644 index 0000000..b49085d --- /dev/null +++ b/src/assets/svg/Copy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/Delete.svg b/src/assets/svg/Delete.svg new file mode 100644 index 0000000..ddaed9d --- /dev/null +++ b/src/assets/svg/Delete.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Download.svg b/src/assets/svg/Download.svg new file mode 100644 index 0000000..42e1b28 --- /dev/null +++ b/src/assets/svg/Download.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Error.svg b/src/assets/svg/Error.svg new file mode 100644 index 0000000..393174a --- /dev/null +++ b/src/assets/svg/Error.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Favorite.svg b/src/assets/svg/Favorite.svg new file mode 100644 index 0000000..4cfc17c --- /dev/null +++ b/src/assets/svg/Favorite.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/Filetext.svg b/src/assets/svg/Filetext.svg new file mode 100644 index 0000000..e085d8e --- /dev/null +++ b/src/assets/svg/Filetext.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/svg/Folder.svg b/src/assets/svg/Folder.svg new file mode 100644 index 0000000..79839fc --- /dev/null +++ b/src/assets/svg/Folder.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Key.svg b/src/assets/svg/Key.svg new file mode 100644 index 0000000..443abf4 --- /dev/null +++ b/src/assets/svg/Key.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/List.svg b/src/assets/svg/List.svg new file mode 100644 index 0000000..3525c5b --- /dev/null +++ b/src/assets/svg/List.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/svg/Minus.svg b/src/assets/svg/Minus.svg new file mode 100644 index 0000000..28ba7bf --- /dev/null +++ b/src/assets/svg/Minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/More.svg b/src/assets/svg/More.svg new file mode 100644 index 0000000..37ddd55 --- /dev/null +++ b/src/assets/svg/More.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Plus.svg b/src/assets/svg/Plus.svg new file mode 100644 index 0000000..d54be81 --- /dev/null +++ b/src/assets/svg/Plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/Printer.svg b/src/assets/svg/Printer.svg new file mode 100644 index 0000000..e947e1a --- /dev/null +++ b/src/assets/svg/Printer.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/Share.svg b/src/assets/svg/Share.svg new file mode 100644 index 0000000..d641e77 --- /dev/null +++ b/src/assets/svg/Share.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/XMark.svg b/src/assets/svg/XMark.svg new file mode 100644 index 0000000..5e0c7bd --- /dev/null +++ b/src/assets/svg/XMark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/arrow-right-short.svg b/src/assets/svg/arrow-right-short.svg deleted file mode 100644 index 0e07537..0000000 --- a/src/assets/svg/arrow-right-short.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/assets/svg/arrow-right.svg b/src/assets/svg/arrow-right.svg index e853128..6c67bc6 100644 --- a/src/assets/svg/arrow-right.svg +++ b/src/assets/svg/arrow-right.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/assets/svg/at-sign.svg b/src/assets/svg/at-sign.svg deleted file mode 100644 index 95e5dd2..0000000 --- a/src/assets/svg/at-sign.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/backstab.svg b/src/assets/svg/backstab.svg deleted file mode 100644 index b61b0ba..0000000 --- a/src/assets/svg/backstab.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/bell.svg b/src/assets/svg/bell.svg deleted file mode 100644 index a8f78e8..0000000 --- a/src/assets/svg/bell.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/check.svg b/src/assets/svg/check.svg deleted file mode 100644 index 2a52c96..0000000 --- a/src/assets/svg/check.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/src/assets/svg/chip.svg b/src/assets/svg/chip.svg deleted file mode 100644 index 109da73..0000000 --- a/src/assets/svg/chip.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/circle-progress.svg b/src/assets/svg/circle-progress.svg deleted file mode 100644 index 152aaed..0000000 --- a/src/assets/svg/circle-progress.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/cog.svg b/src/assets/svg/cog.svg deleted file mode 100644 index 68fdca9..0000000 --- a/src/assets/svg/cog.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/dollar.svg b/src/assets/svg/dollar.svg deleted file mode 100644 index 19d1e7a..0000000 --- a/src/assets/svg/dollar.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -; diff --git a/src/assets/svg/dropdown.svg b/src/assets/svg/dropdown.svg deleted file mode 100644 index bc5da5b..0000000 --- a/src/assets/svg/dropdown.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/assets/svg/envelope.svg b/src/assets/svg/envelope.svg deleted file mode 100644 index e601e47..0000000 --- a/src/assets/svg/envelope.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/exit.svg b/src/assets/svg/exit.svg deleted file mode 100644 index ab57702..0000000 --- a/src/assets/svg/exit.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/fingerprint.svg b/src/assets/svg/fingerprint.svg deleted file mode 100644 index d71be22..0000000 --- a/src/assets/svg/fingerprint.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/globe.svg b/src/assets/svg/globe.svg deleted file mode 100644 index 801af63..0000000 --- a/src/assets/svg/globe.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/hexagon.svg b/src/assets/svg/hexagon.svg deleted file mode 100644 index ec0a46e..0000000 --- a/src/assets/svg/hexagon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/identification.svg b/src/assets/svg/identification.svg deleted file mode 100644 index 92b805a..0000000 --- a/src/assets/svg/identification.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/lock.svg b/src/assets/svg/lock.svg deleted file mode 100644 index b461521..0000000 --- a/src/assets/svg/lock.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/logotype-fsize-horizontal.svg b/src/assets/svg/logotype-fsize-horizontal.svg deleted file mode 100644 index 3e42e73..0000000 --- a/src/assets/svg/logotype-fsize-horizontal.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - -; diff --git a/src/assets/svg/logotype-fsize.svg b/src/assets/svg/logotype-fsize.svg deleted file mode 100644 index 3cce528..0000000 --- a/src/assets/svg/logotype-fsize.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/svg/logotype.svg b/src/assets/svg/logotype.svg deleted file mode 100644 index 3bd9880..0000000 --- a/src/assets/svg/logotype.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/moon.svg b/src/assets/svg/moon.svg deleted file mode 100644 index e72e3be..0000000 --- a/src/assets/svg/moon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/phone.svg b/src/assets/svg/phone.svg deleted file mode 100644 index 458077b..0000000 --- a/src/assets/svg/phone.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/search.svg b/src/assets/svg/search.svg index 5d33fd2..643d0e3 100644 --- a/src/assets/svg/search.svg +++ b/src/assets/svg/search.svg @@ -1,7 +1,4 @@ - - - - + + - \ No newline at end of file diff --git a/src/assets/svg/services.svg b/src/assets/svg/services.svg deleted file mode 100644 index 381e1b9..0000000 --- a/src/assets/svg/services.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/shield.svg b/src/assets/svg/shield.svg deleted file mode 100644 index b33ac0c..0000000 --- a/src/assets/svg/shield.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/speed.svg b/src/assets/svg/speed.svg deleted file mode 100644 index 78e6bfc..0000000 --- a/src/assets/svg/speed.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -; diff --git a/src/assets/svg/times.svg b/src/assets/svg/times.svg deleted file mode 100644 index 6ce48b1..0000000 --- a/src/assets/svg/times.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/user-add.svg b/src/assets/svg/user-add.svg deleted file mode 100644 index ac1acdb..0000000 --- a/src/assets/svg/user-add.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/assets/svg/user.svg b/src/assets/svg/user.svg index 771bd2d..10488f3 100644 --- a/src/assets/svg/user.svg +++ b/src/assets/svg/user.svg @@ -1,7 +1,4 @@ - - - - + + - \ No newline at end of file diff --git a/src/assets/svg/users.svg b/src/assets/svg/users.svg deleted file mode 100644 index 36eae67..0000000 --- a/src/assets/svg/users.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/components/icons.tsx b/src/components/icons.tsx new file mode 100644 index 0000000..23cefb0 --- /dev/null +++ b/src/components/icons.tsx @@ -0,0 +1,29 @@ +export {ReactComponent as SVGAggowBigRight} from "src/asset/svg/Aggow-Big-Right.svg"; +export {ReactComponent as SVGArrowDown} from "src/assets/svg/Arrow-Down.svg"; +export {ReactComponent as SVGArrowLeft} from "src/assets/svg/Arrow-Left.svg"; +export {ReactComponent as SVGArrowRight} from "src/assets/svg/Arrow-Right.svg"; +export {ReactComponent as SVGBookmark} from "src/assets/svg/Bookmark.svg"; +export {ReactComponent as SVGCaretDown} from "src/assets/svg/Caret-Down.svg" +export {ReactComponent as SVGCaretLeft} from "src/assets/svg/Caret-Left.svg" +export {ReactComponent as SVGCaretRight} from "src/assets/svg/Caret-Right.svg" +export {ReactComponent as SVGCaretUp} from "src/assets/svg/Caret-Up.svg"; +export {ReactComponent as SVGChevronesLeft} from "src/assets/svg/Chevrones-Left.svg"; +export {ReactComponent as SVGChevronesRight} from "src/assets/svg/Chevrones-Right.svg"; +export {ReactComponent as SVGCite} from "src/assets/svg/Cite.svg"; +export {ReactComponent as SVGCopy} from "src/assets/svg/Copy.svg"; +export {ReactComponent as SVGDelete} from "src/assets/svg/Delete.svg"; +export {ReactComponent as SVGDownload} from "src/assets/svg/Download.svg"; +export {ReactComponent as SVGError} from "src/assets/svg/Error.svg"; +export {ReactComponent as SVGFavorite} from "src/assets/svg/Favorite.svg"; +export {ReactComponent as SVGFiletext} from "src/assets/svg/Filetext.svg"; +export {ReactComponent as SVGFolder} from "src/assets/svg/Folder.svg"; +export {ReactComponent as SVGKey} from "src/assets/svg/Key.svg"; +export {ReactComponent as SVGList} from "src/assets/svg/List.svg"; +export {ReactComponent as SVGMinus} from "src/assets/svg/Minus.svg"; +export {ReactComponent as SVGMore} from "src/assets/svg/More.svg"; +export {ReactComponent as SVGPlus} from "src/assets/svg/Plus.svg"; +export {ReactComponent as SVGPrinter} from "src/assets/svg/Printer.svg"; +export {ReactComponent as SVGSearch} from "src/assets/svg/Search.svg"; +export {ReactComponent as SVGShare} from "src/assets/svg/Share.svg"; +export {ReactComponent as SVGUser} from "src/assets/svg/User.svg"; +export {ReactComponent as SVGXMark} from "src/assets/svg/XMark.svg"; From a98651a08eed80e221aed835db1fa245e7e7d40b Mon Sep 17 00:00:00 2001 From: Maximus Date: Wed, 27 Jul 2022 19:07:48 +0300 Subject: [PATCH 2/6] renamed svg icons files --- ...ggow-Big-Right.svg => arrow-big-right.svg} | 0 src/components/icons.tsx | 58 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) rename src/assets/svg/{Aggow-Big-Right.svg => arrow-big-right.svg} (100%) diff --git a/src/assets/svg/Aggow-Big-Right.svg b/src/assets/svg/arrow-big-right.svg similarity index 100% rename from src/assets/svg/Aggow-Big-Right.svg rename to src/assets/svg/arrow-big-right.svg diff --git a/src/components/icons.tsx b/src/components/icons.tsx index 23cefb0..89b026f 100644 --- a/src/components/icons.tsx +++ b/src/components/icons.tsx @@ -1,29 +1,29 @@ -export {ReactComponent as SVGAggowBigRight} from "src/asset/svg/Aggow-Big-Right.svg"; -export {ReactComponent as SVGArrowDown} from "src/assets/svg/Arrow-Down.svg"; -export {ReactComponent as SVGArrowLeft} from "src/assets/svg/Arrow-Left.svg"; -export {ReactComponent as SVGArrowRight} from "src/assets/svg/Arrow-Right.svg"; -export {ReactComponent as SVGBookmark} from "src/assets/svg/Bookmark.svg"; -export {ReactComponent as SVGCaretDown} from "src/assets/svg/Caret-Down.svg" -export {ReactComponent as SVGCaretLeft} from "src/assets/svg/Caret-Left.svg" -export {ReactComponent as SVGCaretRight} from "src/assets/svg/Caret-Right.svg" -export {ReactComponent as SVGCaretUp} from "src/assets/svg/Caret-Up.svg"; -export {ReactComponent as SVGChevronesLeft} from "src/assets/svg/Chevrones-Left.svg"; -export {ReactComponent as SVGChevronesRight} from "src/assets/svg/Chevrones-Right.svg"; -export {ReactComponent as SVGCite} from "src/assets/svg/Cite.svg"; -export {ReactComponent as SVGCopy} from "src/assets/svg/Copy.svg"; -export {ReactComponent as SVGDelete} from "src/assets/svg/Delete.svg"; -export {ReactComponent as SVGDownload} from "src/assets/svg/Download.svg"; -export {ReactComponent as SVGError} from "src/assets/svg/Error.svg"; -export {ReactComponent as SVGFavorite} from "src/assets/svg/Favorite.svg"; -export {ReactComponent as SVGFiletext} from "src/assets/svg/Filetext.svg"; -export {ReactComponent as SVGFolder} from "src/assets/svg/Folder.svg"; -export {ReactComponent as SVGKey} from "src/assets/svg/Key.svg"; -export {ReactComponent as SVGList} from "src/assets/svg/List.svg"; -export {ReactComponent as SVGMinus} from "src/assets/svg/Minus.svg"; -export {ReactComponent as SVGMore} from "src/assets/svg/More.svg"; -export {ReactComponent as SVGPlus} from "src/assets/svg/Plus.svg"; -export {ReactComponent as SVGPrinter} from "src/assets/svg/Printer.svg"; -export {ReactComponent as SVGSearch} from "src/assets/svg/Search.svg"; -export {ReactComponent as SVGShare} from "src/assets/svg/Share.svg"; -export {ReactComponent as SVGUser} from "src/assets/svg/User.svg"; -export {ReactComponent as SVGXMark} from "src/assets/svg/XMark.svg"; +export {ReactComponent as SVGAggowBigRight} from "src/asset/svg/arrow-Big-Right.svg"; +export {ReactComponent as SVGArrowDown} from "src/assets/svg/arrow-Down.svg"; +export {ReactComponent as SVGArrowLeft} from "src/assets/svg/arrow-Left.svg"; +export {ReactComponent as SVGArrowRight} from "src/assets/svg/arrow-Right.svg"; +export {ReactComponent as SVGBookmark} from "src/assets/svg/bookmark.svg"; +export {ReactComponent as SVGCaretDown} from "src/assets/svg/caret-down.svg" +export {ReactComponent as SVGCaretLeft} from "src/assets/svg/caret-left.svg" +export {ReactComponent as SVGCaretRight} from "src/assets/svg/caret-right.svg" +export {ReactComponent as SVGCaretUp} from "src/assets/svg/caret-up.svg"; +export {ReactComponent as SVGChevronesLeft} from "src/assets/svg/chevrones-left.svg"; +export {ReactComponent as SVGChevronesRight} from "src/assets/svg/chevrones-right.svg"; +export {ReactComponent as SVGCite} from "src/assets/svg/cite.svg"; +export {ReactComponent as SVGCopy} from "src/assets/svg/copy.svg"; +export {ReactComponent as SVGDelete} from "src/assets/svg/delete.svg"; +export {ReactComponent as SVGDownload} from "src/assets/svg/download.svg"; +export {ReactComponent as SVGError} from "src/assets/svg/error.svg"; +export {ReactComponent as SVGFavorite} from "src/assets/svg/favorite.svg"; +export {ReactComponent as SVGFiletext} from "src/assets/svg/filetext.svg"; +export {ReactComponent as SVGFolder} from "src/assets/svg/folder.svg"; +export {ReactComponent as SVGKey} from "src/assets/svg/key.svg"; +export {ReactComponent as SVGList} from "src/assets/svg/list.svg"; +export {ReactComponent as SVGMinus} from "src/assets/svg/minus.svg"; +export {ReactComponent as SVGMore} from "src/assets/svg/more.svg"; +export {ReactComponent as SVGPlus} from "src/assets/svg/plus.svg"; +export {ReactComponent as SVGPrinter} from "src/assets/svg/printer.svg"; +export {ReactComponent as SVGSearch} from "src/assets/svg/search.svg"; +export {ReactComponent as SVGShare} from "src/assets/svg/share.svg"; +export {ReactComponent as SVGUser} from "src/assets/svg/user.svg"; +export {ReactComponent as SVGXMark} from "src/assets/svg/xmark.svg"; From f799a33b17ea526af1eaf696b86a3854e367dde8 Mon Sep 17 00:00:00 2001 From: Maximus Date: Wed, 27 Jul 2022 19:31:10 +0300 Subject: [PATCH 3/6] fixed paths to icons --- src/App.tsx | 22 ++------------- src/components/icons.tsx | 58 ++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 49 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index ae91156..defc0e0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,21 +2,13 @@ /* Libraries */ /* -------------------------------------------------------------------------- */ import React, { useEffect } from "react"; -import { BrowserRouter as Router } from "react-router-dom"; -import { Provider } from "react-redux"; /* -------------------------------------------------------------------------- */ /* Parts */ /* -------------------------------------------------------------------------- */ -import AppHotKeys from "ui/views/HotKeys"; -import AppLoader from "components/parts/Loader"; -import GlobalSearchbar from "ui/views/GlobalSearch"; /* -------------------------------------------------------------------------- */ /* Misc */ /* -------------------------------------------------------------------------- */ -import { store } from "store/store"; -import routes from "routes"; -import RoutesRenderer from "components/RoutesRenderer"; -import NotificationsField from "ui/views/NotificationsField"; +import { SVGArrowBigRight, SVGArrowDown, SVGDelete, SVGFavorite } from "components/icons"; /* -------------------------------------------------------------------------- */ /* Application root component */ /* -------------------------------------------------------------------------- */ @@ -26,17 +18,7 @@ import NotificationsField from "ui/views/NotificationsField"; */ function App() { return ( - - - }> - - - - - - - - + ); } diff --git a/src/components/icons.tsx b/src/components/icons.tsx index 89b026f..41b3cfb 100644 --- a/src/components/icons.tsx +++ b/src/components/icons.tsx @@ -1,29 +1,29 @@ -export {ReactComponent as SVGAggowBigRight} from "src/asset/svg/arrow-Big-Right.svg"; -export {ReactComponent as SVGArrowDown} from "src/assets/svg/arrow-Down.svg"; -export {ReactComponent as SVGArrowLeft} from "src/assets/svg/arrow-Left.svg"; -export {ReactComponent as SVGArrowRight} from "src/assets/svg/arrow-Right.svg"; -export {ReactComponent as SVGBookmark} from "src/assets/svg/bookmark.svg"; -export {ReactComponent as SVGCaretDown} from "src/assets/svg/caret-down.svg" -export {ReactComponent as SVGCaretLeft} from "src/assets/svg/caret-left.svg" -export {ReactComponent as SVGCaretRight} from "src/assets/svg/caret-right.svg" -export {ReactComponent as SVGCaretUp} from "src/assets/svg/caret-up.svg"; -export {ReactComponent as SVGChevronesLeft} from "src/assets/svg/chevrones-left.svg"; -export {ReactComponent as SVGChevronesRight} from "src/assets/svg/chevrones-right.svg"; -export {ReactComponent as SVGCite} from "src/assets/svg/cite.svg"; -export {ReactComponent as SVGCopy} from "src/assets/svg/copy.svg"; -export {ReactComponent as SVGDelete} from "src/assets/svg/delete.svg"; -export {ReactComponent as SVGDownload} from "src/assets/svg/download.svg"; -export {ReactComponent as SVGError} from "src/assets/svg/error.svg"; -export {ReactComponent as SVGFavorite} from "src/assets/svg/favorite.svg"; -export {ReactComponent as SVGFiletext} from "src/assets/svg/filetext.svg"; -export {ReactComponent as SVGFolder} from "src/assets/svg/folder.svg"; -export {ReactComponent as SVGKey} from "src/assets/svg/key.svg"; -export {ReactComponent as SVGList} from "src/assets/svg/list.svg"; -export {ReactComponent as SVGMinus} from "src/assets/svg/minus.svg"; -export {ReactComponent as SVGMore} from "src/assets/svg/more.svg"; -export {ReactComponent as SVGPlus} from "src/assets/svg/plus.svg"; -export {ReactComponent as SVGPrinter} from "src/assets/svg/printer.svg"; -export {ReactComponent as SVGSearch} from "src/assets/svg/search.svg"; -export {ReactComponent as SVGShare} from "src/assets/svg/share.svg"; -export {ReactComponent as SVGUser} from "src/assets/svg/user.svg"; -export {ReactComponent as SVGXMark} from "src/assets/svg/xmark.svg"; +export {ReactComponent as SVGArrowBigRight} from "assets/svg/arrow-big-right.svg"; +export {ReactComponent as SVGArrowDown} from "assets/svg/arrow-down.svg"; +export {ReactComponent as SVGArrowLeft} from "assets/svg/arrow-left.svg"; +export {ReactComponent as SVGArrowRight} from "assets/svg/arrow-right.svg"; +export {ReactComponent as SVGBookmark} from "assets/svg/bookmark.svg"; +export {ReactComponent as SVGCaretDown} from "assets/svg/caret-down.svg" +export {ReactComponent as SVGCaretLeft} from "assets/svg/caret-left.svg" +export {ReactComponent as SVGCaretRight} from "assets/svg/caret-right.svg" +export {ReactComponent as SVGCaretUp} from "assets/svg/caret-up.svg"; +export {ReactComponent as SVGChevronesLeft} from "assets/svg/chevrones-left.svg"; +export {ReactComponent as SVGChevronesRight} from "assets/svg/chevrones-right.svg"; +export {ReactComponent as SVGCite} from "assets/svg/cite.svg"; +export {ReactComponent as SVGCopy} from "assets/svg/copy.svg"; +export {ReactComponent as SVGDelete} from "assets/svg/delete.svg"; +export {ReactComponent as SVGDownload} from "assets/svg/download.svg"; +export {ReactComponent as SVGError} from "assets/svg/error.svg"; +export {ReactComponent as SVGFavorite} from "assets/svg/favorite.svg"; +export {ReactComponent as SVGFiletext} from "assets/svg/filetext.svg"; +export {ReactComponent as SVGFolder} from "assets/svg/folder.svg"; +export {ReactComponent as SVGKey} from "assets/svg/key.svg"; +export {ReactComponent as SVGList} from "assets/svg/list.svg"; +export {ReactComponent as SVGMinus} from "assets/svg/minus.svg"; +export {ReactComponent as SVGMore} from "assets/svg/more.svg"; +export {ReactComponent as SVGPlus} from "assets/svg/plus.svg"; +export {ReactComponent as SVGPrinter} from "assets/svg/printer.svg"; +export {ReactComponent as SVGSearch} from "assets/svg/search.svg"; +export {ReactComponent as SVGShare} from "assets/svg/share.svg"; +export {ReactComponent as SVGUser} from "assets/svg/user.svg"; +export {ReactComponent as SVGXMark} from "assets/svg/xmark.svg"; From 596fdd9d71e3893f96036c96cc16a97df9ff0cdc Mon Sep 17 00:00:00 2001 From: Maximus Date: Thu, 28 Jul 2022 17:37:51 +0300 Subject: [PATCH 4/6] remove changes in App.tsx --- src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index defc0e0..0a199a1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -18,7 +18,7 @@ import { SVGArrowBigRight, SVGArrowDown, SVGDelete, SVGFavorite } from "componen */ function App() { return ( - +
Hello world!
); } From 5777ee550d3a45b5ca0b4c54ad89fbb4c84b2008 Mon Sep 17 00:00:00 2001 From: Maximus Date: Thu, 28 Jul 2022 17:41:43 +0300 Subject: [PATCH 5/6] fixed App tsx --- src/App.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 0a199a1..e9d3678 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,14 +1,7 @@ /* -------------------------------------------------------------------------- */ /* Libraries */ /* -------------------------------------------------------------------------- */ -import React, { useEffect } from "react"; -/* -------------------------------------------------------------------------- */ -/* Parts */ -/* -------------------------------------------------------------------------- */ -/* -------------------------------------------------------------------------- */ -/* Misc */ -/* -------------------------------------------------------------------------- */ -import { SVGArrowBigRight, SVGArrowDown, SVGDelete, SVGFavorite } from "components/icons"; +import React from "react"; /* -------------------------------------------------------------------------- */ /* Application root component */ /* -------------------------------------------------------------------------- */ From 3d22c69c7ab03e9aa7e137fd389f408ce36ef4d7 Mon Sep 17 00:00:00 2001 From: decamel Date: Fri, 29 Jul 2022 10:05:24 +0300 Subject: [PATCH 6/6] Solve conflicts --- src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index e9d3678..4e529cc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -15,4 +15,4 @@ function App() { ); } -export default App; +export default App; \ No newline at end of file