Skip to content

Commit

Permalink
bug fixes (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
rayzhou-bit authored Jun 3, 2024
1 parent 0a2a7f3 commit 2f03563
Show file tree
Hide file tree
Showing 35 changed files with 272 additions and 199 deletions.
59 changes: 46 additions & 13 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,49 @@ logo192.png,1608165656975,3ee59515172ee198f3be375979df15ac5345183e656720a381b887
logo512.png,1608165656975,ee7e2f3fdb8209c4b6fd7bef6ba50d1b9dba30a25bb5c3126df057e1cb6f5331
manifest.json,1608165656976,5c997de1364b8be939319fa9209abd77f2caf7f8844999a9e2e9173f844e7840
robots.txt,1608165656976,b2090cf9761ef60aa06e4fab97679bd43dfa5e5df073701ead5879d7c68f1ec5
asset-manifest.json,1618596263829,11007fc6a48676aa300287bec711a57d0c3a960a706aba45d071a9a38fd4df06
index.html,1618596263828,f2b9dbf81e6b8b0a2cef4bff5643a967cb4c0cdeec9dddcc7d3231bf9d269ac4
precache-manifest.8b2fafd67208ee96a113340e1ad38c8b.js,1618596263829,238a1b03b4e13cf39492fccce92c55ee2a0def751aaa9f9cf0487f19eb9e5812
service-worker.js,1618596263829,51cfa81dcdd2951e5fe83eb5c04c31396c0d4176d30590419ca0e3cd9f5122ab
static/css/main.a3192f22.chunk.css,1618596263830,4ac64b6ecdd50ec06fd6d2089eedfe8bbdadbb290a1b1338d56ca9483180bbaf
static/css/main.a3192f22.chunk.css.map,1618596263847,95cd450f56b4be1859cc05464527dbb2d7864b97eeefc4d4f95832525b5018a8
static/js/2.b310ccda.chunk.js.LICENSE.txt,1618596263847,fa22f80ed6a361f7471389dcd0fa594160721782dad04db37c3f614702b870c2
static/js/runtime-main.09ba2e10.js,1618596263847,90d1b56d0d8ac02c49e8df6d2c2e7272e87b99af4c78965186a49d6f7e56c70d
static/js/runtime-main.09ba2e10.js.map,1618596263847,72eb54cc6d64500f4f02189d88915ce7c8cb1bcdcf1a0c265a34bbd8be2a2e9c
static/js/main.d1c3edc6.chunk.js,1618596263832,c036ae6bcd091e450cbb0cd3254d7654d22d8b104dd277b15c5d38f544696c86
static/js/main.d1c3edc6.chunk.js.map,1618596263847,dacc8c51125fd4e9334dafa68855896c88f19998ddd98900ee1487991d3877a8
static/js/2.b310ccda.chunk.js,1618596263846,c7da2db8593f2b5cdb359b92353797adfbdfc9e2ee3d1e0e79ec49143e129b5f
static/js/2.b310ccda.chunk.js.map,1618596263848,2760f9401d0bbbeccbf704a1f11d8b850be3815318b6b5d253564e5e2c44e16e
index.html,1716625059074,45ef957ec1b37a492b1ec8af2977f3ffc0d40d1a110552ac5ef0923d00d3249c
assets/add-image-dd8d1d44.svg,1716625059066,9a62feca729bc7f09b05fce21bd5732943388afcbf34fbf7cffccd9011d5ede0
assets/condense-disabled-ad9b348c.svg,1716625059072,c09777c73fb0a02d1eb61ca2899c8432eaa6c59a3736f7f22d2d23227b8b25d6
assets/book-460ad16a.svg,1716625059066,02b7c53f59df08bf3b8c5ae9ad67c2e4089a13ebc073e70e0b8ddcdefc3906d5
assets/close-82381f8b.svg,1716625059072,ac17f0f193ba4d936db9806a914483cc1802f4078fc4556ef0007e6d94fee64e
assets/add-tab-70f2a9e5.svg,1716625059072,3288308fc37871afb7da544165d1182f5630d4f87eea325d4c29041ecc6481ff
assets/condense-enabled-111479cd.svg,1716625059072,d8f4ec75368ccbaef6725575f23bfee5e662ee3479e23fec080505097ac868e1
assets/copy-card-4ee264e2.svg,1716625059066,9297570357a8225d5d8e0083f6ce61274f9a4eae76b47ba8802f54bbd0325a33
assets/copy-card-disabled-75c4aef1.svg,1716625059066,462a5209269087b60c806827d3d9d12605cc8a80b9f67f4a9c0fc434b3cf8e70
assets/copy-project-8f762067.svg,1716625059073,eb9cb65743556a60c1cf0d32db2d8ee8d33c60731c56ea9a3c08e4f225e33eed
assets/dropdown-arrow-401aad30.svg,1716625059067,69bd3ba224964a64fb166fe970750418a50e4f0bca332c063a27415fbde0c07f
assets/delete-dfff93f3.svg,1716625059066,f438e216aeb4ca83f8ab7407ca100ae4c921ed61d982057704c7f152381fd33b
assets/delete-red-e4772964.svg,1716625059066,adcfa540bb9474e1e373272c1cfa1b4125f66da8ffd759b4d90964f71c8204a6
assets/dropdown-arrow-white-61456473.svg,1716625059074,aa5bba154f017acfcce0da01bedaf276044e93fe5a4ac8c7ce18a701dd060c4d
assets/expand-enabled-4965ec15.svg,1716625059073,dc87c3062ad6366ac9c596533eec6b2aa2a23db7cef8c7cb041f11b7e78e5de8
assets/library-open-265564d4.svg,1716625059066,347b901c69d084a43ff02250227b7c6a2ca370e43a099d87ae8704ff2dc12c19
assets/library-closed-d6a5e239.svg,1716625059066,49287bda0ab41f38a77be22b7936809dd915833a4d0913023764730e9cdcdefe
assets/expand-disabled-e845c190.svg,1716625059072,48053715a381f60ad027b9de762990a5ec04a9b83e07a707adb7e13f25c00c6a
assets/magnifying-glass-4988e239.svg,1716625059067,0924b57fdbe7cd858e39f2e2810d861dee32ed99a9f89010800a02c1a047c518
assets/new-card-disabled-0456234f.svg,1716625059066,77da799ea9e583f64a40ec15be87def665a4de308131ba29538ca159797bc4c1
assets/new-card-fc59c75e.svg,1716625059066,e613019a1edb5bb2e87020febb0d705302856834fe5805c1bcf956566a781448
assets/plus-1ce2e397.svg,1716625059066,a2ee7cbfb4726f446ae8c868c20634a944f9ff18ca632014a055cc1ba7aca012
assets/new-project-de8742bd.svg,1716625059072,a77ac89250af21b5641f18d8c30bd41a7eaca5c03d6bdf0a7f1276e7ea63071d
assets/redo-disabled-22cf61c5.svg,1716625059071,b952b0daf3afe25a2de3f4643eb9eca9fa655d65aea2862644173c2f55e547eb
assets/redo-enabled-87bf6fa8.svg,1716625059071,e01da16b76303f8674758c6831053f75b3f2fcc1b2cffea0e4021fb798784b6b
assets/index-40137d4e.css,1716625059074,949c4d5b361fec350a75a7bbd6d9c74fad18eadc2c322a178eb7ca1d4cefce0c
assets/rounded-square-5cbc1400.svg,1716625059074,e0eb76c10968037be16090883a41047e319b653f02b6388b6a6f32cabee29c8c
assets/rounded-square-hover-5dba2f1d.svg,1716625059073,870f77f19fd30d095a71ba0a52e354a6d665cb8b291db6d493c02a112405b936
assets/rounded-square-white-aab8e270.svg,1716625059074,4ccb4513a3eed4303a15d12d27f250f31c2d06f37a886cc0912f478f533a0f01
assets/save-completed-fc368c31.svg,1716625059072,92fb7e247577cb1ee9f9e7950f1d22bc8a3cbd721dba711d1040ee0cbc759715
assets/save-disabled-cf1587c9.svg,1716625059072,52328ec36c51b8b413fdfd1221e773dd4560f7d37b0b0e410399d093fbb315d8
assets/save-enabled-eeec0409.svg,1716625059072,df0362d71554f9d5cc7b4186305133f76aed6532bc1e193d8392867687628739
assets/save-pending-2c180786.svg,1716625059072,29e9f6d3ede97cf557e83343eeedee7fdfe18949374733dd5be466b5bf10afc0
assets/save-spinner-ba54cd3e.svg,1716625059072,3cdf3590034af1ebcf5d9c4aab340e0f0141d8d19092abce92f8803632572fab
assets/scroll-left-fe6cc3d8.svg,1716625059066,f19c9f8bfce94ad8e9e43f9cd30e4e349cf52a440817f2e951ba6d67752d46a3
assets/search-clear-black-d70433af.svg,1716625059071,1c0d999463a4e940a8ee64398b13c20787443b260f0ea153b5135c4272d76d36
assets/scroll-right-dc50d5f1.svg,1716625059066,11f56c22132c3f6ded692468ca39bd963bfb2ecda6cde43bcda4202018dc2582
assets/search-clear-faded-6af887f9.svg,1716625059067,edbcb0e3e5fde64afbc167c1293bd0f8bbb0a0de9f74ac8bf699179d1f401372
assets/stat-block-f402ea65.svg,1716625059066,f78a173e609e5359747f7eb8536d57416e785663cfc678b0fa813bc04b0dab97
assets/tab-menu-610949a6.svg,1716625059072,1f04b4d407dc130e3b945fed66aec973626b5e953d9938af06f669472e5f54dc
assets/toggle-left-5f497710.svg,1716625059064,ab3f020c63e8918ff1dbb47e879a2978f3f3bc78855bb3052f3255cf9401edd3
assets/toggle-right-adb65f8b.svg,1716625059066,fb1196af7e56561134606ee5e279488752d28f4f52a85248886d8f9c90fa6f2f
assets/undo-disabled-14aa7034.svg,1716625059071,44a35ebf60e4ab230b2f9ad7898f3918f0bef3e5eadcb256c60ff068c02ae140
assets/undo-enabled-2cecbc3c.svg,1716625059071,2baa486e523c7b2eca5d589291c83bf3275cb86b60c22bbcb51113ba789f9f7a
assets/Roboto-Regular-4e147ab6.ttf,1716625059066,828e6bc54a7c702ec023c091c06a04528799e22057ff9a11cf934814439f249d
assets/index-0b3d804a.js,1716625059075,396ccd98cad616ee154a44da7ca177eaf281b0851e26fbcb2a23068a96db2d68
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

firebase-debug.log
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<!-- <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="An app to manage your d&d campaign" />
<!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
<meta name="description" content="Jot down notes for your D&D campaign!" />
<link rel="icon" href="./templogo.svg" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand Down
3 changes: 3 additions & 0 deletions public/templogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ button {
margin: 0;
border: 0;

justify-content: center;
place-items: center;

&:hover .tooltip {
Expand Down
7 changes: 0 additions & 7 deletions src/assets/credit.html

This file was deleted.

Binary file removed src/assets/icons/close-window-hover.png
Binary file not shown.
4 changes: 4 additions & 0 deletions src/assets/icons/close-window-hover.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/close-window.png
Binary file not shown.
3 changes: 3 additions & 0 deletions src/assets/icons/close-window.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/google.png
Binary file not shown.
6 changes: 6 additions & 0 deletions src/assets/icons/google.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/library-book.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/icons/red-trash.png
Binary file not shown.
12 changes: 12 additions & 0 deletions src/assets/icons/trash-red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 8 additions & 7 deletions src/components-shared/Dropdowns/ActionDropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ export const ACTION_TYPE = {
disabled: 'disabled',
};

export const VARIANT_TYPE = {
dropup: 'dropup',
};

export const ActionDropdown = ({
btnRef,
isOpen,
Expand Down Expand Up @@ -46,14 +50,14 @@ export const ActionDropdown = ({
...itemsList,
<li key={title + index}>
<button
className='item-btn'
className='selection'
onClick={() => {
callback();
onClose();
}}
>
<p className={type + ' btn-title'} >{title}</p>
{icon ? <img className='btn-icon' src={icon} /> : null}
<span className={`selection-name ${type}`} >{title}</span>
{icon ? <img className='selection-icon' src={icon} /> : null}
</button>
</li>
];
Expand All @@ -62,10 +66,7 @@ export const ActionDropdown = ({

return (
<div
className={
'action-dropdown'
+ (variant === 'dropup' ? ' dropup-variant' : '')
}
className={`action-dropdown ${variant}`}
ref={dropdownRef}
>
<ul>
Expand Down
61 changes: 30 additions & 31 deletions src/components-shared/Dropdowns/ActionDropdown.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$y: 38px;
$vertical-offset: 38px;

.action-dropdown {
position: absolute;
top: $y;
top: $vertical-offset;
right: 0;

background: white;
border: 1px solid #f4f4f4;
box-shadow: 0px 0px 8px -3px #9b9b9b;
border-radius: 12px;
padding: 13px 19px;
padding: 13px 0;

z-index: 800;

Expand All @@ -19,24 +19,30 @@ $y: 38px;
li {
list-style: none;
}
.break {
margin: 8px 0;
border: 1px solid #f4f4f4;
}
}
}
.dropup-variant {
.dropup {
top: auto !important;
bottom: $y !important;
bottom: $vertical-offset !important;
}

.item-btn {
.selection {
box-sizing: border-box;
height: 30px;
width: 100%;
margin: 0;
padding: 0;
padding: 0 19px !important;
background-color: white;

display: grid;
grid-template-columns: auto 20px;
display: flex;

&:hover { background-color: #C1E9FF; }

.btn-title {
.selection-name {
box-sizing: border-box;
width: 100%;
margin: 0;
Expand All @@ -49,9 +55,21 @@ $y: 38px;
line-height: 25px;
letter-spacing: 0.05em;
font-feature-settings: "kern" off;
background-color: white;
background-color: transparent;
}
.danger {
font-weight: 600 !important;
color: #ed5e31 !important;
}
.bold {
font-weight: 700 !important;
color: #363B4E !important;
}
.disabled {
color: #C4C4C4 !important;
}
.btn-icon {

.selection-icon {
display: block;
width: auto;
height: auto;
Expand All @@ -60,22 +78,3 @@ $y: 38px;
margin: auto;
}
}

.break {
margin: 8px 0;
border: 1px solid #f4f4f4;
}


// ACTION_TYPES
.danger {
font-weight: 600 !important;
color: #ed5e31 !important;
}
.bold {
font-weight: 700 !important;
color: #353535 !important;
}
.disabled {
color: #C4C4C4 !important;
}
Loading

0 comments on commit 2f03563

Please sign in to comment.