Skip to content

Commit

Permalink
Merge pull request #251 from MelkeyOSS/staging
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
royanger authored Mar 28, 2023
2 parents 7a7d0a4 + d6b91fd commit 42412f9
Show file tree
Hide file tree
Showing 59 changed files with 901 additions and 721 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ name: Continuous Integration

# This action works with pull requests and pushes
on:
pull_request:
push:
branches:
- main
- staging
pull_request:
push:
branches:
- main
- staging

jobs:
prettier:
runs-on: ubuntu-latest
prettier:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}

- name: Prettify code
uses: creyD/prettier_action@v4.3
with:
# This part is also where you can pass other options, for example:
prettier_options: --write **/*.{js,md}
- name: Prettify code
uses: creyD/prettier_action@v4.3
with:
# This part is also where you can pass other options, for example:
prettier_options: --write **/*.{js,md}
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"useTabs": false,
"printWidth": 120,
"singleQuote": false,
"jsxSingleQuote": false,
"quoteProps": "as-needed",
"arrowParens": "avoid"
}
4 changes: 2 additions & 2 deletions CLA.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ You accept and agree to the following terms and conditions for Your present and

1. Definitions.

"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Astrostation. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Astrostation. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Astrostation for inclusion in, or documentation of, any of the products owned or managed by Astrostation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Astrostation or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Astrostation for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Astrostation for inclusion in, or documentation of, any of the products owned or managed by Astrostation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Astrostation or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Astrostation for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."

2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Astrostation and to recipients of software distributed by Astrostation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

Expand Down
30 changes: 15 additions & 15 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
- Focusing on what is best not just for us as individuals, but for the overall
community
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
- Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior include:

- The use of sexualized language or imagery, and sexual attention or advances
of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others’ private information, such as a physical or email address,
without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting
- The use of sexualized language or imagery, and sexual attention or advances
of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others’ private information, such as a physical or email address,
without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Expand Down
Binary file added assets/images/index/favicon144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions contributors.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
- royanger
- nchudleigh
- creativenull
- emalineg
- Samathingamajig
- eraychumak
- justnat3
- pizzaintheoven
- hacksore
- herropaul
- madeleine-patience
- mastermajorman
- melkeydev
- nchudleigh
- royanger
- Samathingamajig
149 changes: 73 additions & 76 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,80 +1,77 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link
rel="icon"
type="image/svg+xml"
href="/assets/images/index/favicon16x16.png"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity</title>
<meta
name="description"
content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity."
/>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/assets/images/index/favicon144x144.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity</title>
<meta
name="description"
content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity."
/>
<meta name="“robots”" content="index," follow” />

<meta name= “robots” content=index, follow”>


<!--Schema.org markup for Google-->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "SoftwareApplication",
"name": "Astrostation",
"operatingSystem": "Windows","MacOS","Linux","Android","iOS",
"applicationCategory": "Productivity",
"applicationSubCategory": "Pomodoro Timer",
"features": "Pomodoro Timer","Lofi Music Station","Aesthetic Backgrounds","Spotify Integration", "Twitch Integration", "Sticky Note Widget", "Customization Settings"
"releaseNotes": " - Added Spotify Integration - Added Twitch Integration - Added Sticky Note Widget - Added Customization Settings - Added Lofi Music Station - Added Aesthetic Backgrounds - Added Pomodoro Timer - Now Open Source",
"screenshot": "https://cdn.discordapp.com/attachments/1025869984309719133/1082826273438580796/sdfsdffsf.png",
"abstract": "A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity.",
"audience": {
"@type": "Audience",
"audienceType": "End Users"
},
"creator": {
"@type": "Individual",
"name": "MelkeyDev",
"url": "https://twitter.com/MelkeyDev"
},
"contributor": {
"@type": "Organization",
"name": "MelkeyOSS",
"url": "https://github.com/MelkeyOSS/astrostation/blob/main/contributors.yml",
"dateCreated": "2022-09-20",
},
"headline": "Aesthetic Online Pomodoro Timer for Improved Productivity",
"inLanguage": "en",
"isAccessibleForFree": true,
"isFamilyFriendly": true,
"keywords": "pomodoro timer","aesthetic pomodoro timer","customizable pomodoro timer", "online pomodoro timer", "pomodoro app", "focus app", "study app", "study tool", "focus tool", "pomodoro timer app", "pomodoro timer tool","lofi study focus", "open source project", "open source pomodoro app"
"license": "MIT",
"image": "https://cdn.discordapp.com/attachments/1025869984309719133/1082826273438580796/sdfsdffsf.png",
"url": "https://astrostation.me",
"typical age range": "15-35",


}
</script>

<!-- Control the content which renders when the page is shared on Facebook -->
<!--FACEBOOK-->
<meta property="og:title" content="Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity" >
<meta property="og:site_name" content="Astrostation">
<meta property="og:url" content="https://astrostation.me" >
<meta property="og:description" content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity." >
<meta property="og:image" content="https://cdn.discordapp.com/attachments/1025869984309719133/1082826273438580796/sdfsdffsf.png" >
<!--TWITTER-->
<!-- Twitter uses some of the Open Graph declarations above plus these -->
<!-- Note the use of "name" and not "property" -->
<meta name="twitter:card" content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity." >
<meta name="twitter:site" content="@Astrostationme" >
<meta name="twitter:creator" content="@MelkeyDev" >
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<!--Schema.org markup for Google-->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "SoftwareApplication",
"name": "Astrostation",
"operatingSystem": "Windows","MacOS","Linux","Android","iOS",
"applicationCategory": "Productivity",
"applicationSubCategory": "Pomodoro Timer",
"features": "Pomodoro Timer","Lofi Music Station","Aesthetic Backgrounds","Spotify Integration", "Twitch Integration", "Sticky Note Widget", "Customization Settings"
"releaseNotes": " - Added Spotify Integration - Added Twitch Integration - Added Sticky Note Widget - Added Customization Settings - Added Lofi Music Station - Added Aesthetic Backgrounds - Added Pomodoro Timer - Now Open Source",
"screenshot": "https://cdn.discordapp.com/attachments/1025869984309719133/1082826273438580796/sdfsdffsf.png",
"abstract": "A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile. Manage your time effectively and better focus on studying, writing, or coding tasks. Try it now and experience improved productivity.",
"audience": {
"@type": "Audience",
"audienceType": "End Users"
},
"creator": {
"@type": "Individual",
"name": "MelkeyDev",
"url": "https://twitter.com/MelkeyDev"
},
"contributor": {
"@type": "Organization",
"name": "MelkeyOSS",
"url": "https://github.com/MelkeyOSS/astrostation/blob/main/contributors.yml",
"dateCreated": "2022-06-01",
},
"headline": "Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity",
"inLanguage": "en",
"isAccessibleForFree": true,
"isFamilyFriendly": true,
"license": "MIT",
"url": "https://astrostation.me",
}
</script>
<!-- Control the content which renders when the page is shared on Facebook -->
<!--FACEBOOK-->
<meta property="og:title" content="Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity" />
<meta property="og:site_name" content="Astrostation" />
<meta property="og:url" content="https://astrostation.me" />
<meta
property="og:description"
content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile. Manage your time effectively and better focus on studying, writing, or coding tasks. Try it now and experience improved productivity."
/>
<meta
property="og:image"
content="https://cdn.discordapp.com/attachments/1025869984309719133/1082826273438580796/sdfsdffsf.png"
/>
<!--TWITTER-->
<!-- Twitter uses some of the Open Graph declarations above plus these -->
<!-- Note the use of "name" and not "property" -->
<meta
name="twitter:card"
content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile. Manage your time effectively and better focus on studying, writing, or coding tasks. Try it now and experience improved productivity."
/>
<meta name="twitter:site" content="@Astrostationme" />
<meta name="twitter:creator" content="@MelkeyDev" />
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading

1 comment on commit 42412f9

@vercel
Copy link

@vercel vercel bot commented on 42412f9 Mar 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.