Skip to content

Commit

Permalink
Merge branch 'manuelernestog:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkroot99 committed Mar 8, 2024
2 parents 75f3a96 + d384fc7 commit 1784464
Show file tree
Hide file tree
Showing 108 changed files with 2,200 additions and 1,438 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.git
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
github: # github: USERNAME or github: [USERNAME, USERNAME, USERNAME, USERNAME]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: #manuelernestogr
ko_fi: weektodo
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: ["weektodo.me/support-us"]
custom: ["weektodo.me/sponsor-us/"]
86 changes: 86 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Build/release Electron app

on:
push:
branches:
- deploy

jobs:
release:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest, macos-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 16

- name: Install Dependencies
run: |
npm install --global yarn
yarn --version
yarn install
- name: Install Linux Dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install wine wine32
sudo apt-get install snapd
sudo apt-get install libarchive-tools
sudo snap install snapcraft --classic
- name: build-linux
if: matrix.os == 'ubuntu-latest'
run: |
yarn run electron:build
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
VUE_APP_SENTRY_DNS: ${{ secrets.VUE_APP_SENTRY_DNS }}

- name: build-linux
if: matrix.os == 'ubuntu-latest'
run: |
yarn run electron:build --win nsis
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
VUE_APP_SENTRY_DNS: ${{ secrets.VUE_APP_SENTRY_DNS }}

- name: build-linux-snap
if: matrix.os == 'ubuntu-latest'
run: |
yarn electron:build --linux snap -p always
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
VUE_APP_SENTRY_DNS: ${{ secrets.VUE_APP_SENTRY_DNS }}
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}

- name: build-mac
if: matrix.os == 'macos-latest'
run: yarn run electron:build
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
VUE_APP_SENTRY_DNS: ${{ secrets.VUE_APP_SENTRY_DNS }}

- name: release
uses: softprops/action-gh-release@v1
with:
draft: true
repository: manuelernestog/weektodo
files: |
dist_electron//*.exe
dist_electron//*.dmg
dist_electron//*.AppImage
dist_electron//*.snap
dist_electron//*.pacman
dist_electron//*.deb
dist_electron//*.rpm
dist_electron//*.pkg
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ pnpm-debug.log*
.vscode

#Electron-builder output
/dist_electron
/dist_electron

.env
85 changes: 0 additions & 85 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM node:16-alpine
WORKDIR /app
COPY package.json /app
COPY yarn.lock /app
RUN yarn install --frozen-lockfile && yarn cache clean
COPY . /app
CMD yarn run serve
EXPOSE 8080
37 changes: 37 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,33 @@ WeekToDo is a free minimalist weekly planner app focused on privacy. Schedule yo
- Workspaces
- Themes

## Sponsors

WeekToDo is an GPL-licensed open source project with its ongoing development made possible entirely by users support and sponsors. If you'd like to join them, please consider [ sponsoring WeekToDo's development](https://weektodo.me/sponsor-us/) or [make the donation](https://weektodo.me/support-us/) you can.

<p align="center">
<h3 align="center">Diamond Sponsors</h3>
</p>

<p align="center">
<a target="_blank" href="https://password.link">
<img alt="Password.link - Securely share sensitive information with one-time links. Send and receive passwords and confidential documents." src="https://weektodo.me/img/sponsors/passwordlink/wide.webp" width="350">
</a>
</p>

<p align="center">
<h3 align="center">Silver Sponsors</h3>
</p>

<p align="center">
<a target="_blank" href="https://www.snapclear.app/">
<img alt="Snapclear - Remove image backgrounds with a single click for free." src="https://weektodo.me/img/sponsors/snapclear/wide.webp" width="150">
</a>
<a target="_blank" href="https://chrome.google.com/webstore/detail/easyfiller-automatic-form/oaphggcbnpminjffkjgldfepehcdjndp?hl=es&authuser=0">
<img alt="Easyfiller - Fill your forms with a single click for free" src="https://weektodo.me/img/sponsors/easyfiller/wide.webp" width="150">
</a>
</p>


## Installation

Expand Down Expand Up @@ -77,6 +104,11 @@ yarn install
yarn run serve // to run web version
yarn run electron:serve // to run native version
```

### Docker

To run the development web version use `docker-compose up`

## Contributing

You can support this project in several ways:
Expand Down Expand Up @@ -119,10 +151,15 @@ Read [Contributing.md](/CONTRIBUTING.md) for more information.

## Contributors

- Logo Rebranding by [hallgraph](https://twitter.com/hallgraph)
- [Translators](https://weektodo.me/about/)

<a href="https://github.com/manuelernestog/weektodo/graphs/contributors">
<img src="https://contrib.rocks/image?repo=manuelernestog/weektodo" />
</a>



Made with [contrib.rocks](https://contrib.rocks).


Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.ico
Binary file not shown.
Binary file modified build/icon.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 build/icon/icon.icns
Binary file not shown.
Binary file modified build/icon/icon.ico
Binary file not shown.
Binary file modified build/icon/icon.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 build/icons/icon.icns
Binary file not shown.
Binary file modified build/icons/icon.ico
Binary file not shown.
Binary file modified build/icons/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 18 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## v2.2.0
Feb 14, 2024

- Adding Print and Export PDF Feature
- Adding new sidebar submenu
- To-do detail view textarea with dynamic height
- Adding Rebranding
- Using Sentry for error handle
- Fixing move old tasks to current day
- Adding recurring task filter
- Adding Month days recurring tasks
- Fixing typos and improving translations
- Adding Hindi, Vietnamese and Hebrew
- Adding Docker config To run the development web version
- Moving CI/CD to Github Actions


## v2.1.0
Jun 3, 2023

Expand All @@ -8,7 +25,7 @@ Jun 3, 2023
- Upgrading all tech stack libraries
- Adding new repeating event option for custom weekdays selector
- Improving splash screen
- Adding sent subtask to bottom on clomplete setting
- Adding sent subtask to bottom on complete setting
- Todo Description markdown link now redirect to external link in web browser
- Adding week start on monday setting
- Improving Chinese and Russian languages
Expand Down
11 changes: 0 additions & 11 deletions deploy.travis.sh

This file was deleted.

20 changes: 20 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '3'
services:
app:
build: .
container_name: weektodo
restart: unless-stopped
ports:
- "8080:8080"
volumes:
- ".:/app"
- "node_modules:/app/node_modules"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080"]
interval: 1m30s
timeout: 10s
retries: 3
start_period: 40s

volumes:
node_modules:
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "WeekToDo",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"description": "Free and Open Source Minimalist Weekly Planner focused on privacy.",
"author": "Manuel Ernesto Garcia <contact@weektodo.me> (https://weektodo.me/)",
Expand All @@ -26,10 +26,10 @@
"main": "background.js",
"repository": "https://github.com/manuelernestog/weektodo",
"dependencies": {
"@honeybadger-io/js": "5.4.1",
"@honeybadger-io/vue": "^6.0.2",
"@achrinza/node-ipc": "^10.1.10",
"@manuelernestog/click-handler": "^1.4.0",
"@popperjs/core": "^2.11.0",
"@sentry/vue": "^7.99.0",
"auto-launch": "^5.0.5",
"axios": "^1.4.0",
"bootstrap": "^5.3.0",
Expand Down Expand Up @@ -60,8 +60,11 @@
"electron-devtools-installer": "^3.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^7.20.0",
"node-sass": "^6.0.1",
"sass": "^1.69.5",
"sass-loader": "^10",
"vue-cli-plugin-electron-builder": "~2.0.0-rc.6"
},
"resolutions": {
"vue-cli-plugin-electron-builder/electron-builder": "^23.0.3"
}
}
13 changes: 12 additions & 1 deletion public/WeekToDo-Logo-Color.svg
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/WeekToDo-icon-128.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/WeekToDo-icon-white-128.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/WeekToDo-logo-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/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.
Binary file modified public/fav_icons/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/fav_icons/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/fav_icons/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/fav_icons/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/fav_icons/mstile-144x144.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/fav_icons/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.
Binary file modified public/fav_icons/mstile-310x150.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/fav_icons/mstile-310x310.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/fav_icons/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1784464

Please sign in to comment.