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.

Sign up for GitHub

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

chore: version 2 #9

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

chore: version 2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
371b415
feat: added new hook to handle global events
pixelass Oct 8, 2019
6fda3a5
feat: added new hook for keys
pixelass Oct 8, 2019
78c63c4
feat: added hook for pointer
pixelass Oct 8, 2019
925549a
feat: added utils
pixelass Oct 8, 2019
7713f78
feat: added rotation hook
pixelass Oct 8, 2019
4a7529d
feat: added offset hook
pixelass Oct 8, 2019
0a1320f
feat: added position hook
pixelass Oct 8, 2019
ae29906
feat: added resize hook
pixelass Oct 8, 2019
3853421
feat: added snap hook
pixelass Oct 8, 2019
0fe26a6
added os util
pixelass Oct 8, 2019
0cb4d7c
feat: new version of Box
pixelass Oct 8, 2019
7a8e9e0
docs: update demo and docs
pixelass Oct 8, 2019
6b598f7
chore: update yarn.lock
pixelass Oct 8, 2019
2ee5f96
fix: touch was causeing errors and unwanted scrolling
pixelass Oct 9, 2019
f632835
chore: adjust demo
pixelass Oct 10, 2019
1d93914
feat: use control for non macOS systems
pixelass Oct 10, 2019
f99a08b
chore: update dependencies
pixelass Oct 11, 2019
bbfb5b6
revert: rollup-plugin-url@3 breaks build
pixelass Oct 11, 2019
ae0b255
docs: fix demo (react version mismatch)
pixelass Oct 16, 2019
66fdfd3
chore: prepare for beta
pixelass Oct 30, 2019
4f693ff
chore update demo
pixelass Oct 30, 2019
fa8be10
v2.0.0-beta.0
pixelass Oct 30, 2019
ae6ad7d
Remove console.log
kyleknighted Nov 8, 2019
f96a886
Merge pull request #14 from kyleknighted/patch-1
pixelass Nov 8, 2019
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
28 changes: 20 additions & 8 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,29 @@ root = true
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
indent_style = space
insert_final_newline = true
max_line_length = 100
max_line_length = 120
tab_width = 4
trim_trailing_whitespace = true

# trailing spaces in markdown indicate word wrap
[*.md]
trim_trailing_whitespace = false
[*.css]
indent_size = 2
tab_width = 2

[*.scss]
indent_size = 2

[{*.ats,*.ts,*.tsx}]
indent_style = tab

# Set spaces indent
[*.{json,yml,pug,html}]
[{*.js,*.cjs,*.mjs,*.jsx}]
indent_style = tab

[{.analysis_options,*.yml,*.yaml}]
indent_size = 2
indent_style = space
tab_width = 2

[{.nycrc,.babelrc,.prettierrc,.stylelintrc,.eslintrc,jest.config,.sytlelintrc,*.json,*.jsb3,*.jsb2,*.bowerrc,*.graphqlconfig}]
indent_size = 2
tab_width = 2
5 changes: 0 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# M.O.P.S
**M**odify **O**rientation **P**osition **S**ize

> German >> English: **Mops** >> **Pug**
> it moves, it stretches, it rolls around

<p align="center"><img src="https://dekk-app.github.io/react-mops/logo.jpg" alt="M.O.P.S. logo"></p>

[![MIT license][license-badge]][license]
[![Code of Conduct][coc-badge]][coc]

Expand Down
5 changes: 0 additions & 5 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,5 @@
<title>React M.O.P.S</title>
</head>
<body>
<img src="./mops_rotatable_01.gif" alt="rotatable demo"/>
<img src="./mops_resizable_01.gif" alt="resizable demo"/>
<img src="./mops_draggable_01.gif" alt="draggable demo"/>
<img src="./mops_draggable_02.gif" alt="draggable demo"/>
<img src="./mops_combined_01.gif" alt="combined demo"/>
</body>
</html>
Binary file removed docs/logo.jpg
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "1.0.0"
"version": "2.0.0-beta.0"
}
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"ncu": "ncu - u; lerna exec 'ncu -u'",
"prerelease": "lerna run build --scope react-mops",
"release": "lerna publish --conventional-commits",
"release:next": "yarn prerelease && lerna publish --canary --preid next --pre-dist-tag next",
"release:beta": "yarn prerelease && lerna publish --dist-tag prerelease --preid beta",
"release:rc": "yarn prerelease && lerna publish --dist-tag prerelease --preid rc",
"test": "echo 'No tests specified' exit 0"
},
"workspaces": [
Expand Down
19 changes: 10 additions & 9 deletions packages/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "demo",
"version": "1.0.0",
"version": "2.0.0-beta.0",
"description": "Created with create-ngineer-app",
"repository": "[email protected]:pixelass/demo.git",
"license": "MIT",
Expand All @@ -27,19 +27,19 @@
"dependencies": {
"@ngineer/head": "1.3.1",
"@ngineer/server": "1.3.1",
"@types/react": "16.9.4",
"@types/react-dom": "16.9.1",
"@types/react": "16.9.9",
"@types/react-dom": "16.9.2",
"@types/react-hot-loader": "4.1.0",
"@types/react-router": "5.1.1",
"@types/react-router": "5.1.2",
"@types/react-router-dom": "5.1.0",
"@types/styled-components": "4.1.19",
"@types/uuid": "^3.4.5",
"html-react-parser": "0.9.1",
"immutability-helper": "^3.0.1",
"react": "16.10.1",
"react-dom": "16.10.1",
"react-hot-loader": "4.12.14",
"react-mops": "^1.0.0",
"react": "16.10.2",
"react-dom": "16.10.2",
"react-hot-loader": "4.12.15",
"react-mops": "^2.0.0-beta.0",
"react-router": "5.1.2",
"react-router-dom": "5.1.2",
"styled-components": "4.4.0",
Expand All @@ -48,8 +48,9 @@
"devDependencies": {
"@ngineer/cli": "1.3.1",
"@ngineer/configs": "1.3.1",
"babel-loader": "8.0.6",
"babel-plugin-transform-assets-import-to-string": "1.2.0",
"concurrently": "4.1.2",
"concurrently": "5.0.0",
"file-loader": "4.2.0",
"html-webpack-plugin": "4.0.0-beta.8",
"serve": "11.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/demo/src/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {v4 as uuidV4} from "uuid";

export const containerSize = {
height: 900,
width: 1200
width: 1600
};
export const gridSize = {x: 25, y: 25};
export const fixedGuides = [
Expand Down
31 changes: 14 additions & 17 deletions packages/demo/src/elements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export const Wrapper = styled.div`
padding: 10px;
border-radius: 2px;
box-shadow: 0 0 0 1px hsla(0, 0%, 0%, 0.5);
width: ${containerSize.width + 40}px;
`;
export const Examples = styled.div`
position: relative;
Expand All @@ -17,7 +16,7 @@ export const Examples = styled.div`
`;
export const Example = styled.div`
position: relative;
margin: auto;
margin: auto auto 10rem;
`;
export const Headline = styled.h2`
margin: 0;
Expand Down Expand Up @@ -68,38 +67,33 @@ export const Container = styled.div<{withGrid?: {x: number; y: number}; hasBound
var(--line-color) var(--line-width),
transparent var(--line-width)
),
linear-gradient(
90deg,
var(--line-color) var(--line-width),
transparent var(--line-width)
);
linear-gradient(90deg, var(--line-color) var(--line-width), transparent var(--line-width));
background-repeat: repeat;
background-position: calc(var(--line-width) / -2) calc(var(--line-width) / 2);
background-size: ${withGrid.x}px ${withGrid.y}px;
}
`}
`;
export const Inner = styled.div`
background-color: hsl(250, 100%, 50%);
background-image: linear-gradient(180deg, hsla(0, 0%, 0%, 0.1), hsla(0, 0%, 0%, 0.5));
background-color: hsl(300, 100%, 50%);
background-image: linear-gradient(180deg, hsla(0, 0%, 100%, 0.1), hsla(0, 0%, 0%, 0.1));
color: hsla(0, 0%, 100%, 0.4);
display: flex;
align-items: center;
align-content: center;
justify-content: center;
height: 100%;
width: 100%;
border-radius: 2px;
border-radius: 10px;
`;
export const StyledMarker = styled.span`
position: absolute;
top: 50%;
left: 50%;
height: 80%;
width: 80%;
transform: translate(-50%, -50%);
border: 3px solid white;
background: hsl(180, 100%, 20%);
top: 7px;
right: 7px;
bottom: 7px;
left: 7px;
border: 1px solid black;
background: white;
pointer-events: none;
`;
export const InvisibleMarker = styled.span`
Expand Down Expand Up @@ -154,6 +148,9 @@ export const ButtonWrapper = styled.div`
&:last-child {
border-radius: 0 3px 3px 0;
}
&:only-child {
border-radius: 3px;
}
}
`;

Expand Down
Loading