Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #1616

Merged
merged 23 commits into from
Oct 21, 2023
Merged

Release #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
644636b
border indicating task running is removed from last 24 hours section
desperado1802 Oct 20, 2023
3e0b24d
removed the linear gradient from 24h section in dark theme
desperado1802 Oct 20, 2023
78cb88b
fixed the color of scroll buttons in labels and all statuses
desperado1802 Oct 20, 2023
66872ce
fixed the imported colors object
desperado1802 Oct 20, 2023
698ca24
chore(deps-dev): bump react-devtools-core in /apps/mobile
dependabot[bot] Oct 21, 2023
1c7a02c
Merge pull request #1612 from ever-co/bug/profile-screen-24h-section
evereq Oct 21, 2023
a456053
Merge pull request #1613 from ever-co/dependabot/npm_and_yarn/apps/mo…
evereq Oct 21, 2023
a397cd8
chore: adding Desktop App build
evereq Oct 21, 2023
2ca8273
chore: fixing Desktop App publish
evereq Oct 21, 2023
a63409e
chore: more for desktop app build
evereq Oct 21, 2023
2b26c52
chore: build desktop app
evereq Oct 21, 2023
04c68dc
Updated README file and Project run commands (#1614)
badalkhatri0924 Oct 21, 2023
8eb08bb
chore: use develop branch
evereq Oct 21, 2023
c3fc705
chore: build desktop app
evereq Oct 21, 2023
bbfe63e
chore: update desktop app build
evereq Oct 21, 2023
b7f6ffd
chore: switch repo URL
evereq Oct 21, 2023
7209fd6
chore: deploy fix
evereq Oct 21, 2023
0c2359b
chore: change formatting configs to be inline with our other projects
evereq Oct 21, 2023
c8ee7f9
chore: spelling / formatting
evereq Oct 21, 2023
621d4a5
chore: switch build for desktop to release branch
evereq Oct 21, 2023
28cbbfd
chore: update yarn lock
evereq Oct 21, 2023
2b408ea
chore: prettier
evereq Oct 21, 2023
cf0bb98
chore: spell
evereq Oct 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"version": "0.2",
"language": "en",
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
"words": [
"barcodes",
"cacheable",
"cloudinary",
"clsxm",
"dummyimage",
"everco",
"everteamsdesktop",
"exposdk",
"headlessui",
"heroicons",
"plasmo",
"RECAPTCHA",
"svgs",
"tailwindcss",
"Timesheet",
"Vercel"
],
"useGitignore": true,
"ignorePaths": [
".deploy/*",
".git/*",
".git/!{COMMIT_EDITMSG,EDITMSG}",
".git/*/**",
".yarn",
"**/*.jar",
".pnp.js",
"**/.git/**",
".vscode",
".gitignore",
"action/lib/**",
"coverage",
".cspell.json",
"cspell.json",
"__snapshots__",
"__recordings__",
"**/coverage/**",
"**/fixtures/**/*.json",
"**/fixtures/sampleCode/*errors/",
"**/node_modules/**",
"**/vscode-extension/**",
"package-lock.json",
"yarn.lock",
"**/assets/i18n/*.json",
"**/migrations/**",
"packages/**/*.seed.json",
"**/*.svg",
"tools/build/webpack.config.js",
"docker-compose.demo.yml",
"docker-compose.yml",
"wait",
"apps/web/lib/i18n/*.ts",
"apps/mobile/app/i18n/*.ts",
]
}
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ root = true
[*]
charset = utf-8
indent_style = tab
indent_size = 2
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.yml]
indent_style = space
76 changes: 36 additions & 40 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,38 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 13,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"camelcase": "off",
"@typescript-eslint/camelcase": ["off", { "properties": "never" }],
"@typescript-eslint/ban-ts-ignore": ["off"],
"@typescript-eslint/no-explicit-any": ["off", { "ignoreRestArgs": true }],
"@typescript-eslint/interface-name-prefix": ["off"],
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"jsx-a11y/no-onchange": "off",
"react/jsx-props-no-spreading": "off",
"import/prefer-default-export": "off",
"import/no-extraneous-dependencies": "off",
"react/prop-types": "off",
"@typescript-eslint/no-unused-vars": "warn",
"react/react-in-jsx-scope": "off",
"@typescript-eslint/ban-ts-comment": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
"env": {
"browser": true,
"es2021": true
},
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 13,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"camelcase": "off",
"@typescript-eslint/camelcase": ["off", { "properties": "never" }],
"@typescript-eslint/ban-ts-ignore": ["off"],
"@typescript-eslint/no-explicit-any": ["off", { "ignoreRestArgs": true }],
"@typescript-eslint/interface-name-prefix": ["off"],
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"jsx-a11y/no-onchange": "off",
"react/jsx-props-no-spreading": "off",
"import/prefer-default-export": "off",
"import/no-extraneous-dependencies": "off",
"react/prop-types": "off",
"@typescript-eslint/no-unused-vars": "warn",
"react/react-in-jsx-scope": "off",
"@typescript-eslint/ban-ts-comment": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
211 changes: 211 additions & 0 deletions .github/workflows/desktop-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
name: Desktop App Build PROD

on:
workflow_run:
workflows: ['Release Prod']
branches: [main]
types:
- completed

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

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

strategy:
matrix:
os: [buildjet-8vcpu-ubuntu-2204]

steps:
- name: Check out Git repository
uses: actions/checkout@v3
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: buildjet/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Change permissions
run: 'sudo chown -R $(whoami) ./*'

- name: Install system dependencies
run: 'sudo apt-get update && sudo apt install -y curl gnupg git libappindicator3-1 ca-certificates binutils icnsutils graphicsmagick'

- name: Install latest version of NPM
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version desktop timer app
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.desktopTimer(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop'
DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop'

- name: Build Desktop Timer App
run: 'yarn build:desktop-timer:linux:release:gh'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'

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

strategy:
matrix:
os: [macos-12]

steps:
- name: Check out Git repository
uses: actions/checkout@v3
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install latest version of NPM
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version desktop timer app
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.desktopTimer(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop'
DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop'

- name: Build Desktop Timer App
run: 'yarn build:desktop-timer:mac:release'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'

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

strategy:
matrix:
os: [windows-latest-l]

steps:
- name: Check out Git repository
uses: actions/checkout@v3
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'

- name: Install latest version of NPM
run: 'npm install -g npm@9'

- name: Install latest node-gyp package
run: 'npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version desktop timer app
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.desktopTimer(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Teams Desktop'
DESKTOP_TIMER_APP_ID: 'com.ever.everteamsdesktop'

- name: Build Desktop Timer App
run: 'yarn build:desktop-timer:windows:release:gh'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'
Loading
Loading