Skip to content

Commit

Permalink
Merge pull request #5 from eliska-n/fix/default-burn
Browse files Browse the repository at this point in the history
Do not burn people
  • Loading branch information
eliska-n authored Nov 17, 2023
2 parents 035d630 + 6ed7fd9 commit af21fea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion public/img/teskalabs-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function SaveNoteScreen({ setAlert }) {
const [url, setUrl] = useState(null); // to picture the url on UI
const [disabledTextArea, setTextAreaDisabled] = useState(false) // to disable text area when save button is hit
const [toggleOn, setToggle] = useState(true) // to change save button into start again button
const [expiration, setExpiration] = useState(1) // to set the time to delete the secret note on BE
const [burnChecked, setBurnChecked] = useState(true)
const [expiration, setExpiration] = useState(5) // to set the time to delete the secret note on BE
const [burnChecked, setBurnChecked] = useState(false)

const expirationTranslationTable = {
1: {
Expand Down Expand Up @@ -319,6 +319,7 @@ function DisplayNoteScreen( setAlert ) {
<button className="btn btn-primary btn-lg" onClick={copySecretToClipboard}>Copy secret to clipboard</button>
{ deleted === false && <button className="btn btn-danger btn-lg" onClick={deleteNote}>Delete Note</button> }
{ deleted === true && <button className="btn btn-dark btn-lg" disabled onClick={deleteNote}>Note was deleted!</button> }
<a class="btn btn-secondary btn-lg" aria-current="page" href="/">Create new secret</a>
</div>
</div>
</>
Expand Down
8 changes: 1 addition & 7 deletions src/Unicorns.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,7 @@ function LinkToUnicorns() {
return (
<div className="row py-4 justify-content-center">
<div className="col-12 col-lg-6">
<div className="card shadow">
<div className="card-body" style={{ backgroundColor: "rgba(165, 16, 128, 0.75)" }}>
<a className="link-light icon-link icon-link-hover" href="#/unicorns">
Is it safe? Tell me how it works!
</a>
</div>
</div>
<a class="link-secondary" aria-current="page" href="#/unicorns">Is it safe? Tell me how it works!</a>
</div>
</div>
)
Expand Down
3 changes: 2 additions & 1 deletion src/scss/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
//#edc5e6 - background pink

$primary: #FCD021;
$secondary: #A51080;
$secondary: #34495E;
$danger: #AC3B61;
$lightpink: #edc5e6;
$form-range-thumb-bg: $secondary;
$form-range-track-bg: $lightpink;
Expand Down

0 comments on commit af21fea

Please sign in to comment.