Skip to content

Commit

Permalink
Merge pull request #16 from ful1e5/dev
Browse files Browse the repository at this point in the history
v1.0.0-alpha.1
  • Loading branch information
ful1e5 authored Dec 7, 2023
2 parents 726e129 + 57e66e5 commit fbd4967
Show file tree
Hide file tree
Showing 53 changed files with 1,052 additions and 433 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [v1.0.0-alpha.1] - 07 December 2023

### What's New?

- Added Download counts for 'PRO' Users
- Background Blur for modal and Navigation bar

### Cursors Package Update:

- Sharp angle corner & resize cursors for 'Bibata Original' (related to Bibata_Cursor#146)

### Fixes

- Print username in sponsor card if name is empty
- Fixed Some UI bugs and Color picker modal for small devices

## [v1.0.0-alpha.0] - 23 November 2023

### What's New?

- Initial public release 🎊

[unreleased]: https://github.com/ful1e5/bibata/compare/v1.0.0-alpha.0...main
[unreleased]: https://github.com/ful1e5/bibata/compare/v1.0.0-alpha.1...main
[v1.0.0-alpha.1]: https://github.com/ful1e5/bibata/compare/v1.0.0-alpha.0...v1.0.0-alpha.1
[v1.0.0-alpha.0]: https://github.com/ful1e5/bibata/tree/v1.0.0-alpha.0
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

The place where Bibata's cursor gets personalized. This project is the successor to [Bibata_Cursor](https://github.com/ful1e5/Bibata_Cursor) and provides the easiest personalization of cursors, along with other options to create your own Bibata cursor.

#### Bibata?
## Bibata?

TLDR; This cursor set is a masterpiece of cursors available on the internet, hand-designed by [Abdulkaiz Khatri](https://github.com/ful1e5).

Bibata is an open-source, compact, and material designed cursor set that aims to improve the cursor experience for users. It is one of the most popular cursor sets in the Linux community and is now available for free on Windows as well, with multiple color and size options. Its goal is to offer personalized cursors to users.

#### What does "Bibata" word mean?
### What does "Bibata" word mean?

The sweetest word I ever spoke was "BI-Buh," which, coincidentally, is also the word for peanuts. To make it more pronounceable and not sound like a baby's words, I added the suffix "Ta." And with that, my journey in the world of open-source began.

Expand All @@ -28,7 +28,7 @@ Bibata, originally an open-source project, has evolved into a web application to

Upon achieving my monthly sponsorship goal, the public download limit is lifted.

#### Information on Downloads
### Information on Downloads

- **Pro:** Unlimited Downloads
- **Fresh SignIn:** 20 Free Downloads
Expand All @@ -38,7 +38,7 @@ Upon achieving my monthly sponsorship goal, the public download limit is lifted.

To access the benefits of a "Pro" account, initiate sponsorship for [ful1e5](https://github.com/sponsors/ful1e5) with a **monthly tier**. Connect this sponsored account with the Bibata app to unlock unlimited downloads.

### TODO:
## TODO:

- [ ] Custom size component
- [ ] Report issues with error stack when errors are generated while crafting cursor images
Expand Down
10 changes: 5 additions & 5 deletions api/core/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ def upload_images():

if data.errors:
errors.extend(data.errors)
return jsonify({"status": 400, "id": id, "file": None, "error": errors}), 400
return jsonify({"id": id, "file": None, "error": errors}), 400

name, errs = store_cursors(id, data, logger)
errors.extend(errs)

if errors:
return jsonify({"status": 400, "id": id, "file": None, "error": errors}), 400
return jsonify({"id": id, "file": None, "error": errors}), 400
else:
return jsonify({"status": 200, "id": id, "file": name, "error": None})
return jsonify({"id": id, "file": name, "error": None})


@app.route("/api/core/download", methods=["GET"])
Expand All @@ -75,7 +75,7 @@ def download():

if param.errors:
errors.extend(param.errors)
return jsonify({"status": 400, "id": id, "error": errors}), 400
return jsonify({"id": id, "error": errors}), 400

res: FileResponse
if param.platform == "win":
Expand All @@ -85,6 +85,6 @@ def download():

if res.errors:
errors.extend(res.errors)
return jsonify({"status": 400, "id": id, "error": errors}), 400
return jsonify({"id": id, "error": errors}), 400
else:
return send_file(res.file, as_attachment=True)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bibata",
"description": "CLI for converting cursor svg files to png.",
"author": "Abdulkaiz Khatri <[email protected]>",
"version": "1.0.0-alpha.0",
"version": "1.0.0-alpha.1",
"private": true,
"bugs": {
"url": "https://github.com/ful1e5/bibata/issues",
Expand All @@ -18,8 +18,8 @@
"flask-dev": "pip3 install --upgrade pip && pip3 install -r requirements.txt && python3 -m flask --debug --app api/core/index run -p 5328",
"next-dev": "next dev",
"dev": "concurrently \"yarn next-dev\" \"yarn flask-dev\"",
"prebuild": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
"postinstall": "prisma generate",
"prebuild": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
"build": "next build",
"start": "next start",
"lint": "next lint"
Expand Down
Binary file modified public/favicon/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/favicon/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#603cba</TileColor>
<square150x150logo src="/mstile-150x150.png?v=2"/>
<TileColor>#000000</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file modified public/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon/favicon.ico
Binary file not shown.
Binary file removed public/favicon/mstile-144x144.png
Binary file not shown.
Binary file modified public/favicon/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 16 additions & 8 deletions public/favicon/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions public/favicon/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "Bibata",
"short_name": "Bibata",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
"name": "Bibata",
"short_name": "Bibata",
"icons": [
{
"src": "/android-chrome-192x192.png?v=2",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png?v=2",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#000000",
"background_color": "#000000",
"display": "standalone"
}
31 changes: 21 additions & 10 deletions src/app/(home)/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,29 @@
@tailwind utilities;

:root {
--foreground: #000000;
--background: #ffffff;
--bg-dark: #202020;
--bg-light: #ffffff;

--text-dark: #ffffff;
--text-light: #000000;
}

/** Remove Tap highlight from buttons **/

* {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}

.dark {
background-color: var(--bg-dark);
color: var(--text-dark);
}

@media (prefers-color-scheme: dark) {
:root {
--foreground: #ffffff;
--background: #1e1e1e;
}
.light {
background-color: var(--bg-light);
color: var(--text-light);
}

body {
color: var(--foreground);
background: var(--background);
.clip-bottom {
clip-path: polygon(50% 0, 100% 100%, 0 100%);
}
8 changes: 4 additions & 4 deletions src/app/(home)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export const metadata: Metadata = {
title: 'Bibata',
description: "The place where Bibata's cursor gets personalized.",
icons: {
icon: ['favicon/favicon.ico?v=4'],
apple: ['favicon/apple-touch-icon.png?v=4'],
shortcut: ['favicon/apple-touch-icon.png']
icon: ['favicon/favicon.ico?v=2'],
apple: ['favicon/apple-touch-icon.png?v=2'],
shortcut: ['favicon/apple-touch-icon.png?v=2']
},
manifest: '/favicon/site.webmanifest'
};
Expand All @@ -25,7 +25,7 @@ export default function RootLayout({ children }: Props) {
return (
<html lang='en'>
<Providers>
<body>
<body className='dark'>
<NavBar />
{children}
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/app/(home)/studio/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ export default function StudioPage() {
version={version}
color={color}
onData={(svgs) => setImagesCount(svgs.length)}
onLoad={(i) => {
onLoad={(i, loading) => {
const l = images;
const index = l.findIndex((e) => e.name === i.name);
if (index >= 0) {
l[index] = i;
} else {
loading ? l.splice(index, 1) : (l[index] = i);
} else if (!loading) {
l.push(i);
}
setImages([...l]);
Expand Down
9 changes: 7 additions & 2 deletions src/app/api/db/download/count/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export async function GET(request: NextRequest) {
total: DB_SEEDS.DOWNLOADS_PER_CENTS(
sponsor_data.monthlySponsorshipInCents
),
count: await getIndex(null)
count: await getIndex(null),
role: 'ANONYMOUS'
});

if (!token) return sponsorCount;
Expand All @@ -41,7 +42,11 @@ export async function GET(request: NextRequest) {

if (total === undefined) return sponsorCount;

return NextResponse.json({ total, count: await getIndex(auth.id) });
return NextResponse.json({
total,
count: await getIndex(auth.id),
role: auth.role
});
} else {
return sponsorCount;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/api/svg/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export async function GET(request: NextRequest) {
if (!version || !VERSIONS.includes(version)) {
return NextResponse.json(
{
error: `Invalid Request. The version:'${version}' parameter is invalid`
error: `Sorry, unable to retrieve the v${version} Cursor Bitmaps. Please try again later.`
},
{ status: 400 }
);
Expand Down
Loading

0 comments on commit fbd4967

Please sign in to comment.