Skip to content

Commit

Permalink
refresh
Browse files Browse the repository at this point in the history
- replaced the trashy SCSS with tailwind 😍
- VUEX reload today state
- more 💩 code
- Brought back OS X and Linux builds.
  • Loading branch information
PatentLobster committed Mar 10, 2021
1 parent bbe4253 commit ecebc13
Show file tree
Hide file tree
Showing 18 changed files with 18,698 additions and 777 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

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

steps:
- name: Check out Git repository
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/[email protected]
with:
node-version: 12
node-version: 14

- name: Build/release Electron app
uses: samuelmeuli/[email protected]
Expand Down
17,484 changes: 17,484 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
{
"name": "Vork",
"version": "0.4.0",
"description": "Track your office hours.",
"author": {
"name": "PatentLobster",
"url": "https://itzik.co"
},
"description": "Track your office hours.",
"version": "0.3.5",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"electron:build": "vue-cli-service electron:build",
"electron:serve": "vue-cli-service electron:serve",
"electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten",
"electron:serve": "vue-cli-service electron:serve",
"postinstall": "electron-builder install-app-deps",
"postuninstall": "electron-builder install-app-deps"
},
"main": "background.js",
"dependencies": {
"@tailwindcss/postcss7-compat": "^2.0.2",
"animate.css": "^4.1.0",
"autoprefixer": "^9",
"axios": "^0.19.2",
"brace": "^0.11.1",
"core-js": "^3.6.5",
"electron-settings": "^4.0.0",
"electron-updater": "^4.3.1",
"moment": "^2.26.0",
"nedb": "^1.8.0",
"postcss": "^7",
"sass": "^1.26.8",
"sass-loader": "^8.0.2",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.0.2",
"v-calendar": "^2.1.1",
"vue": "^2.6.11",
"vue-router": "^3.3.2",
Expand All @@ -45,6 +49,7 @@
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"vue-cli-plugin-electron-builder": "~2.0.0-rc.1",
"vue-cli-plugin-tailwind": "~2.0.6",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
}
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<body class="overflow-y-hidden">
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div id="app">
<div id="app" class="w-100">

<transition :name="(!settings.disableAnimations)? 'flip' : ''">
<router-view />
Expand Down
Loading

0 comments on commit ecebc13

Please sign in to comment.