Skip to content

Commit

Permalink
Merge pull request #95 from mSaurabh/main
Browse files Browse the repository at this point in the history 
Fixes #18
  • Loading branch information
@nfoert
nfoert authored Oct 20, 2024
2 parents e37eb13 + 8b4511a commit 526a9da
Show file tree
Hide file tree
Showing 17 changed files with 195 additions and 195 deletions.
28 changes: 14 additions & 14 deletions cardie/main/templates/authentication.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,62 +13,62 @@
{% endblock %}

{% block body %}
<div id="authentication-box" x-data="box_param_check()">
<div id="authentication_box" x-data="box_param_check()">
{% csrf_token %}
<img id="authentication-box-image"
<img id="authentication_box_image"
@click="window.location.href = server_ip"
src="{% static '/main/images/logo_light.png' %}">
<div class="ui_status_critical"
id="authentication-error"
id="authentication_error"
style="display: none">
<i class="ph-bold ph-warning-octagon ui_status_icon"></i>
<p class="ui_status_text">Critical status box</p>
</div>
<div id="signin-box" x-show="sign_in" x-transition:enter.delay.200ms>
<div id="signin_box" x-show="sign_in" x-transition:enter.delay.200ms>
<p class="ui_text_header">
<i class="ph-bold ph-keyhole"></i> Sign In
</p>
<div class="ui_separator_horizontal"></div>
<input id="signin-username"
<input id="signin_username"
type="text"
class="ui_input_generic"
placeholder="Username">
<input id="signin-password"
<input id="signin_password"
type="password"
class="ui_input_generic"
placeholder="Password">
<button id="signin-signin" class="ui_button_large">
<button id="signin_signin" class="ui_button_large">
<strong>Sign In</strong> <i class="ph-bold ph-sign-in"></i>
</button>
<button id="signin-createaccount"
<button id="signin_createaccount"
class="ui_button_small"
@click="sign_in = !sign_in">
Create an Account <i class="ph-bold ph-arrow-right"></i>
</button>
</div>
<div id="createaccount-box"
<div id="createaccount_box"
x-show="!sign_in"
x-transition:enter.delay.200ms>
<p class="ui_text_header">
<i class="ph-bold ph-key"></i> Create Account
</p>
<div class="ui_separator_horizontal"></div>
<input id="createaccount-username"
<input id="createaccount_username"
type="text"
class="ui_input_generic"
placeholder="Username">
<input id="createaccount-password"
<input id="createaccount_password"
type="password"
class="ui_input_generic"
placeholder="Password">
<input id="createaccount-email"
<input id="createaccount_email"
type="text"
class="ui_input_generic"
placeholder="Email">
<button id="createaccount-createaccount" class="ui_button_large">
<button id="createaccount_createaccount" class="ui_button_large">
<strong>Create Account</strong> <i class="ph-bold ph-user-plus"></i>
</button>
<button id="createaccount-signin"
<button id="createaccount_signin"
class="ui_button_small"
@click="sign_in = !sign_in">
Sign In <i class="ph-bold ph-arrow-right"></i>
Expand Down
10 changes: 5 additions & 5 deletions cardie/main/templates/editor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,17 @@
<div class="ui_separator_horizontal"></div>
</div>
</div>
<div id="editor-iconselector">
<div id="editor-iconselector-top">
<div id="editor_iconselector">
<div id="editor_iconselector_top">
<input type="text"
class="ui_input_generic"
id="editor-iconselector-top-search"
id="editor_iconselector_top_search"
placeholder="Search for an icon">
<button class="ui_button_icon" id="editor-iconselector-top-close">
<button class="ui_button_icon" id="editor_iconselector_top_close">
<i class="ph-bold ph-x"></i>
</button>
</div>
<div id="editor-iconselector-icons"></div>
<div id="editor_iconselector_icons"></div>
</div>
<div id="editor_rename">
<div id="editor_rename_top">
Expand Down
24 changes: 12 additions & 12 deletions cardie/main/templates/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,38 @@
<link rel="stylesheet" type="text/css" href="{% static '/main/home.css' %}">
{% endblock %}
{% block body %}
<div id="home-top">
<div id="home-top-logo">
<img id="home-top-image" src="{% static '/main/images/logo_light.png' %}">
<p id="home-top-text" class="ui_text_subheader_left">Hello, {{ username }}</p>
<div id="home_top">
<div id="home_top_logo">
<img id="home_top_image" src="{% static '/main/images/logo_light.png' %}">
<p id="home_top_text" class="ui_text_subheader_left">Hello, {{ username }}</p>
</div>
<div id="home-top-profile" x-data="{ open: false }" @click="open = !open">
<button id="home-top-username" class="ui_button_small">
<div id="home_top_profile" x-data="{ open: false }" @click="open = !open">
<button id="home_top_username" class="ui_button_small">
{{ username }} <i class="ph-bold ph-caret-down"></i>
</button>
<div id="home-top-profile-dropdown" x-show="open" x-transition>
<div id="home_top_profile_dropdown" x-show="open" x-transition>
<button class="ui_button_small" @click="log_out()">
<i class="ph-bold ph-sign-out"></i> Log Out
</button>
</div>
</div>
</div>
<div x-data="{ cards: true, cards_disabled: true, wallet_disabled: false }">
<div id="home-navigation">
<button id="home-navigation-wallet"
<div id="home_navigation">
<button id="home_navigation_wallet"
class="ui_button_grid"
@click="cards = false; cards_disabled = false; wallet_disabled = true;"
x-bind:disabled="wallet_disabled">
Wallet <i class="ph-bold ph-wallet"></i>
</button>
<button id="home-navigation-cards"
<button id="home_navigation_cards"
class="ui_button_grid"
@click="cards = true; wallet_disabled = false; cards_disabled = true;"
x-bind:disabled="cards_disabled">
My Cards <i class="ph-bold ph-cards"></i>
</button>
</div>
<div id="home-wallet" x-show="!cards" x-transition>
<div id="home_wallet" x-show="!cards" x-transition>
<p class="ui_text_subheader_left">
<i class="ph-bold ph-wallet"></i> My Wallet
</p>
Expand All @@ -49,7 +49,7 @@
<p class="ui_status_text">You don't have any cards saved yet! Once you do, they will appear here for you to find later.</p>
</div>
</div>
<div id="home-cards" x-show="cards" x-transition>
<div id="home_cards" x-show="cards" x-transition>
<p class="ui_text_subheader_left">
<i class="ph-bold ph-cards"></i> My Cards
</p>
Expand Down
14 changes: 7 additions & 7 deletions cardie/static/main/authentication.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ html {
background: rgb(37, 40, 49);
}

#authentication-box {
#authentication_box {
position: absolute;
top: 50%;
left: 50%;
Expand All @@ -14,7 +14,7 @@ html {
z-index: 1;
}

#authentication-box-image {
#authentication_box_image {
width: clamp(30vh, 300px, 30vw);
height: auto;

Expand All @@ -25,31 +25,31 @@ html {
transition: var(--default-transition);
}

#authentication-box-image:hover {
#authentication_box_image:hover {
scale: 1.05;
}

#signin-box {
#signin_box {
display: flex;
flex-direction: column;

align-items: center;
}

#createaccount-box {
#createaccount_box {
display: flex;
flex-direction: column;

align-items: center;
}

#authentication-error {
#authentication_error {
opacity: 0;
scale: 0.8;
transition: var(--default-transition);
}

#authentication-error.show {
#authentication_error.show {
opacity: 1;
scale: 1;
}
Expand Down
30 changes: 15 additions & 15 deletions cardie/static/main/editor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ html {
@media (min-width: 1000px) {
/* Large screens */

#editor-iconselector {
#editor_iconselector {
background-color: var(--default-glass-background);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
Expand Down Expand Up @@ -180,7 +180,7 @@ html {
@media (max-width: 1000px) {
/* Small Screens */

#editor-iconselector {
#editor_iconselector {
background-color: var(--default-glass-background);
backdrop-filter: var(--default-glass-blur);

Expand Down Expand Up @@ -208,18 +208,18 @@ html {
}
}

#editor-iconselector-top {
#editor_iconselector_top {
display: flex;
flex-direction: row;
}

#editor-iconselector-top-search {
#editor_iconselector_top_search {
height: clamp(2vh, 20px, 2vw);
max-height: clamp(2vh, 20px, 2vw);
margin-bottom: clamp(1vh, 10px, 1vw);
}

#editor-iconselector-icons {
#editor_iconselector_icons {
display: flex;
flex-wrap: wrap;
overflow-y: auto;
Expand Down Expand Up @@ -249,30 +249,30 @@ html {
box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.75);
}

.editor-iconselector-icon:hover {
.editor_iconselector_icon:hover {
scale: 1.05;
}

.editor-iconselector-icon:active {
.editor_iconselector_icon:active {
scale: 0.95;
}

.editor-iconselector-icon-icon {
.editor_iconselector_icon_icon {
color: var(--default-text-color);
font-size: clamp(3vh, 30px, 3vw);
text-align: center;
margin-top: clamp(0.3vh, 3px, 0.3vw);
}

.editor-iconselector-icon-text {
.editor_iconselector_icon_text {
color: var(--default-text-color);
font-family: "Noto Sans Mono", "Courier New", monospace;
font-size: clamp(1vh, 10px, 1vw);
text-align: center;
user-select: none;
}

@keyframes show-rename {
@keyframes show_rename {
from {
opacity: 0;
scale: 0.8;
Expand All @@ -284,7 +284,7 @@ html {
}
}

@keyframes hide-rename {
@keyframes hide_rename {
from {
opacity: 1;
scale: 1;
Expand All @@ -296,12 +296,12 @@ html {
}
}

.show-rename {
animation: show-rename 0.2s ease-in-out forwards;
.show_rename {
animation: show_rename 0.2s ease-in-out forwards;
}

.hide-rename {
animation: hide-rename 0.2s ease-in-out forwards;
.hide_rename {
animation: hide_rename 0.2s ease-in-out forwards;
}

@media (min-width: 1000px) {
Expand Down
Loading

0 comments on commit 526a9da

Please sign in to comment.