Skip to content

Commit

Permalink
Rebrand and update copyright messages
Browse files Browse the repository at this point in the history
Co-authored-by: Timothy Zheng <[email protected]>
  • Loading branch information
varGeneric and Ti1mmy committed Jan 20, 2022
1 parent dce3db3 commit dea04b9
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 28 deletions.
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<!-- PROJECT LOGO -->
<br />
<p align="center">
<a href="https://github.com/Ti1mmy/DiscardApp">
<a href="https://github.com/Ti1mmy/DisCardApp">
<img src="img/logo.png" alt="Logo" width="320" height="180">
</a>

<h3 align="center">Discard</h3>
<h3 align="center">DisCard</h3>
<h4 align="center"><a href="https://devpost.com/software/discard" target="_blank">Devpost Link</a></h4>
<h4 align="center"><a href="https://discard.shop" target="_blank">» Start using Discard!</a></h4>
<h4 align="center"><a href="https://discard.shop" target="_blank">» Start using DisCard!</a></h4>

<p align="center">
Worried about your wallet bulge? Remembering which credit card to use for which situation is difficult, but it doesn't have to be. <strong>Discard</strong> missed opportunity costs so you can spend with confidence!
Worried about your wallet bulge? Remembering which credit card to use for which situation is difficult, but it doesn't have to be. <strong>DisCard</strong> missed opportunity costs so you can spend with confidence!
<br />
<a href="https://github.com/Ti1mmy/DiscardApp#table-of-contents"><strong>Explore the docs »</strong></a>
<a href="https://github.com/Ti1mmy/DisCardApp#table-of-contents"><strong>Explore the docs »</strong></a>
<br />
<br />
<a href="https://youtu.be/IGw_H8sNOIQ" target="_blank">View Demo</a>
·
<a href="https://github.com/Ti1mmy/DiscardApp/issues">Report Bug</a>
<a href="https://github.com/Ti1mmy/DisCardApp/issues">Report Bug</a>
·
<a href="https://github.com/Ti1mmy/DiscardApp/issues">Request Feature</a>
<a href="https://github.com/Ti1mmy/DisCardApp/issues">Request Feature</a>
</p>
</p>

Expand Down Expand Up @@ -58,11 +58,11 @@

[![Main Page Screenshot](img/main_page.png)](https://discard.shop/)

Discard your inefficient credit card spending!
DisCard your inefficient credit card spending!

Discard is a web app built to help users manage their creditcards and maximize cash back rewards. Using a database of all Canadian creditcards and cash back deals from Rakuten, Discard can tell you the best credit card to use based on your shopping needs with a sleek and responsive UI.
DisCard is a web app built to help users manage their creditcards and maximize cash back rewards. Using a database of all Canadian creditcards and cash back deals from Rakuten, DisCard can tell you the best credit card to use based on your shopping needs with a sleek and responsive UI.

Simply login to Discard with Google and add your cards to the app. You can then use the search function to find a store or directly use your location with Google Maps to find nearby stores. Discard will then use its large database of credit cards and deals to select the best card to use from your set of cards. Just like that, you'll be set to maximize your cashback rewards!
Simply login to DisCard with Google and add your cards to the app. You can then use the search function to find a store or directly use your location with Google Maps to find nearby stores. DisCard will then use its large database of credit cards and deals to select the best card to use from your set of cards. Just like that, you'll be set to maximize your cashback rewards!

### Built With

Expand Down Expand Up @@ -119,11 +119,11 @@ This is an example of how to list things you need to use the software and how to

1. Clone the repo
```sh
git clone https://github.com/Ti1mmy/DiscardApp.git
git clone https://github.com/Ti1mmy/DisCardApp.git
```
2. `cd` into repo directory
```sh
cd DiscardApp
cd DisCardApp
```
3. Install Prerequisite Libraries
```sh
Expand Down Expand Up @@ -153,7 +153,7 @@ This is an example of how to list things you need to use the software and how to
## Usage

### Navbar
At the top of every page, you'll be able to navigate between the main page, the credit card list, and info about the project. There's also an option for you to login to Discard with Google so that you can save your cards on the app.
At the top of every page, you'll be able to navigate between the main page, the credit card list, and info about the project. There's also an option for you to login to DisCard with Google so that you can save your cards on the app.

### Main Page
On the main page, you will be greeted by a few different options:
Expand All @@ -164,7 +164,7 @@ On the main page, you will be greeted by a few different options:
After using any of these options, you'll be told which card is the best to use.

### Credit Card List
This is the page where you can view and add to your set of credit cards on Discard. Clicking on a card shows details for the card like its name and cashback details. To add a card, you can click on the search button or the manual add button.
This is the page where you can view and add to your set of credit cards on DisCard. Clicking on a card shows details for the card like its name and cashback details. To add a card, you can click on the search button or the manual add button.

Search:
* The search button lets you add a credit card by searching through a database of Canadian credit cards.
Expand All @@ -175,7 +175,7 @@ Manual Add:
* The manual add button lets you manually add a credit card in case the search function can't provide the right card.
* To use this function, upload a photo of the card, enter its name, and enter the cashback provided by the card for each category.
* You can also enter cashback for specific stores here.
* The card will be added to your account and Discard will consider it when finding the best card for you to use.
* The card will be added to your account and DisCard will consider it when finding the best card for you to use.

_For more examples, please refer to the [Demo](https://youtu.be/IGw_H8sNOIQ)_

Expand Down
11 changes: 5 additions & 6 deletions site/creditcardlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Discard</title>
<title>DisCard</title>
<link rel="shortcut icon" type="image/png" href="/image/icon/logo_l.png"/>

<link rel="manifest" href="/resource/appmanifest.webmanifest">
Expand Down Expand Up @@ -69,7 +69,6 @@
<nav class="navbar navbar-expand navbar-light navbar-branding brand-color-background">
<a class="navbar-brand ms-2" href="/">
<img src="/image/logo/logo_no_padding.png" width="93" height="40" alt="">
<!-- <a class="navbar-brand" href="/mainpage.html">Discard</a> -->
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down Expand Up @@ -302,7 +301,7 @@ <h5 class="modal-title" id="signInPromptModalLabel">Please Sign in</h5>
<!-- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> -->
</div>
<div class="modal-body">
To use Discard, please sign in using a Google account.
To use DisCard, please sign in using a Google account.
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
Expand Down Expand Up @@ -336,10 +335,10 @@ <h1 class="display-6">Manual Add</h1>
<!-- Copyright -->
<footer class="copyright footer mt-auto py-3 brand-color-background">
<div class="container-fluid">
Like what you see? Give our <a href="https://devpost.com/software/discard" target="_blank">Devpost</a> a <i class="fas fa-heart lh-base"></i><a href="https://github.com/Ti1mmy/DiscardApp" target="_blank">View the code</a>
<p>Copyright &copy; 2021 Discard. See <a href="https://github.com/Ti1mmy/DiscardApp/blob/main/LICENSE" target="_blank">LICENSE</a> for details.</p>
Like what you see? Give our <a href="https://devpost.com/software/discard" target="_blank">Devpost</a> a <i class="fas fa-heart lh-base"></i><a href="https://github.com/DisCardApp/DisCard" target="_blank">View the code</a>
<p>Copyright &copy; 2021-22 DisCard. See <a href="https://github.com/DisCardApp/DisCard/blob/main/LICENSE" target="_blank">LICENSE</a> for details.</p>
</div>
</footer>
</body>
</html>


9 changes: 4 additions & 5 deletions site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Discard</title>
<title>DisCard</title>
<link rel="shortcut icon" type="image/png" href="/image/icon/logo_l.png"/>

<link rel="manifest" href="/resource/appmanifest.webmanifest">
Expand Down Expand Up @@ -72,7 +72,6 @@
<nav class="navbar navbar-expand navbar-light navbar-branding brand-color-background">
<a class="navbar-brand ms-2" href="/">
<img src="/image/logo/logo_no_padding.png" width="93" height="40" alt="">
<!-- <a class="navbar-brand" href="/mainpage.html">Discard</a> -->
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down Expand Up @@ -105,7 +104,7 @@ <h5 class="modal-title" id="signInPromptModalLabel">Please Sign in</h5>
<!-- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> -->
</div>
<div class="modal-body">
To use Discard, please sign in using a Google account.
To use DisCard, please sign in using a Google account.
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
Expand Down Expand Up @@ -208,8 +207,8 @@ <h1 class="display-5 text-center">Quick Category</h1>
<!-- Copyright -->
<footer class="copyright footer mt-auto py-3 brand-color-background">
<div class="container-fluid">
Like what you see? Give our <a href="https://devpost.com/software/discard" target="_blank">Devpost</a> a <i class="fas fa-heart lh-base"></i><a href="https://github.com/Ti1mmy/DiscardApp" target="_blank">View the code</a>
<p>Copyright &copy; 2021 Discard. See <a href="https://github.com/Ti1mmy/DiscardApp/blob/main/LICENSE" target="_blank">LICENSE</a> for details.</p>
Like what you see? Give our <a href="https://devpost.com/software/discard" target="_blank">Devpost</a> a <i class="fas fa-heart lh-base"></i><a href="https://github.com/DisCardApp/DisCard" target="_blank">View the code</a>
<p>Copyright &copy; 2021-22 DisCard. See <a href="https://github.com/DisCardApp/DisCard/blob/main/LICENSE" target="_blank">LICENSE</a> for details.</p>

</div>
</footer>
Expand Down
4 changes: 2 additions & 2 deletions site/resource/appmanifest.webmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Discard: Card Selection Simplified",
"short_name": "Discard",
"name": "DisCard: Card Selection Simplified",
"short_name": "DisCard",
"description": "Worried about your wallet bulge? Remembering which credit card to use for which situation is difficult, but it doesn't have to be. Discard missed cashback rewards so you can spend with confidence!",
"dir": "auto",
"lang": "en",
Expand Down

0 comments on commit dea04b9

Please sign in to comment.