Skip to content

Commit

Permalink
Merge branch 'master' into collaboration
Browse files Browse the repository at this point in the history
# Conflicts:
#	.env
#	.env.local-server
#	package-lock.json
#	package.json
#	src/core/index.ts
#	src/wireframes/model/assets-state.ts
#	src/wireframes/renderer/interaction-overlays.ts
#	src/wireframes/shapes/utils/text-size-contraint.ts
  • Loading branch information
SebastianStehle committed Oct 23, 2023
2 parents a22c866 + 21ebeb2 commit c83d8d4
Show file tree
Hide file tree
Showing 29 changed files with 2,387 additions and 2,421 deletions.
6 changes: 5 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
<<<<<<< HEAD
VITE_SERVER_URL=https://api2.mydraft.cc
VITE_SERVER_COLLABORATION_URL=wss://api2.mydraft.cc/collaboration
VITE_SERVER_COLLABORATION_URL=wss://api2.mydraft.cc/collaboration
=======
VITE_SERVER_URL=https://api2.mydraft.cc
>>>>>>> master
2 changes: 1 addition & 1 deletion .env.local-server
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VITE_SERVER_URL=http://localhost:8080
VITE_SERVER_COLLABORATION_URL=ws://localhost:8080/collaboration
VITE_SERVER_COLLABORATION_URL=ws://localhost:8080/collaboration
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.1.1

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.2
uses: actions/setup-node@v3.8.1

- name: Install Dependencies
run: npm i
Expand All @@ -25,11 +25,16 @@ jobs:
- name: Run Tests
run: npm run test:ci

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3.1.4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Run Build
run: npm run build

- name: Deploy
uses: JamesIves/github-pages-deploy-action@4.1.7
uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
branch: gh-pages
folder: dist
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/check-updates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Check Update
concurrency: check

on:
workflow_dispatch:
schedule:
# Automatically run on every Sunday
- cron: '0 0 * * 0'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.1.1
with:
token: ${{ secrets.WORKFLOW_SECRET }}

- name: Check for Update
uses: saadmk11/github-actions-version-updater@v0.8.1
with:
token: ${{ secrets.WORKFLOW_SECRET }}
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.1.1

- name: Setup Node.js environment
uses: actions/setup-node@v2.1.2
uses: actions/setup-node@v3.8.1

- name: Install Dependencies
run: npm i
Expand All @@ -25,5 +25,10 @@ jobs:
- name: Run Tests
run: npm run test:ci

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3.1.4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Run Build
run: npm run build
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# mydraft.cc: Open Source Wireframing Tools

[![codecov](https://codecov.io/gh/mydraft-cc/ui/graph/badge.svg?token=4wHUoUfuQn)](https://codecov.io/gh/mydraft-cc/ui)

Test it out at: https://mydraft.cc/

The goal of this project is to create an open source wireframing tool. As a developer I have to create wireframes from time to time and there are great commercial tool in the market. But most of them cost more than a full Office suite per month. I think there is a need for a good and free solutions.
Expand Down
3 changes: 3 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ignore:
- "**/snap-manager.ts"
- "**/shapes/**/*.ts"
Loading

0 comments on commit c83d8d4

Please sign in to comment.