Skip to content

Commit f67ea01

Browse files
Merge pull request #151 from gridaco/organization
Project Organization
2 parents 64e9ce1 + 80db25f commit f67ea01

File tree

222 files changed

+812
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+812
-621
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ webdev/.eslintcache
77

88

99
# we use yarn
10-
package-lock.json
10+
package-lock.json
11+
12+
# log including yarn error log
13+
.log

README.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,8 @@ title: Grida assistant for figma, sketch, xd
99

1010
![Grida assistant](./branding/assistant-cover-v2021.8.0.png)
1111

12-
13-
14-
15-
1612
<div style="text-align:center"><a href="https://www.producthunt.com/posts/grida-assistant-figma-2-flutter-react?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-grida-assistant-figma-2-flutter-react" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=310028&theme=light" alt="Grida Assistant - Figma 2 Flutter &React - Free & Opensource Design2Code Plugin with lot more features. | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a></div>
1713

18-
19-
20-
21-
2214
# Grdia Assistant plugin (figma to flutter)
2315

2416
> Any design to high quality code, with live preview.
@@ -53,9 +45,12 @@ cd assistant
5345
# [REQUIRED] yarn will install dependencies, link packages, and generate compiled code of packages, so it can be referenced by root projects.
5446
yarn
5547

56-
# [OPTIONAL 1] run figma plugin in dev mode
48+
# [OPTIONAL 1] run figma plugin in dev mode (use localhost server) (recommanded)
5749
yarn figma
5850

51+
# [OPTIONAL 1-2] run figma plugin in dev mode (native)
52+
yarn figma-native
53+
5954
# [OPTIONAL 2]run sketch plugin in dev mode
6055
yarn sketch
6156

File renamed without changes.

app/__plugin__init__/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// DO NOT REMOVE THIS LINE
2+
import "../lib/pages/code/__plugin";
3+
import "@app/data-mapper/__plugin";
4+
import "@app/design-lint/__plugin";

app/lib/components/animation/animated-check-icon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import styled from "@emotion/styled";
33

44
import { motion } from "framer-motion";
5-
import { CheckIcon } from "../Icon/check-icon";
5+
import CheckIcon from "@assistant/icons/check";
66

77
const variants = {
88
"make-active": {

app/lib/components/animation/progress-bar.tsx renamed to app/lib/components/animation/animated-progress-bar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface IProgressBar {
77
contorl?: () => void;
88
}
99

10-
export function ProgressBar(props: IProgressBar) {
10+
export function AnimatedProgressBar(props: IProgressBar) {
1111
return (
1212
<Background>
1313
<AnimatePresence>

app/lib/components/comming-soon-template.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import styled from "@emotion/styled";
22
import React, { ReactNode } from "react";
3-
import { BlackButton } from "./style/global-style";
3+
import { BlackButtonStyle } from "@ui/core/button-style";
44

55
interface Props {
66
coverImage?: string;
@@ -50,6 +50,6 @@ const ButtonWrapper = styled.div`
5050
`;
5151

5252
const Button = styled.button`
53-
${BlackButton}
53+
${BlackButtonStyle}
5454
width: calc(100vw - 32px);
5555
`;

app/lib/components/navigation/secondary-workmode-menu.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import styled from "@emotion/styled";
22
import React from "react";
3-
import { Column, Row } from "../style/global-style";
3+
import { Column, Row } from "@ui/core";
44
import { SecondaryWorkmodeChoice } from "./secondary-workmode-choice";
5+
56
export function SecondaryWorkmodeMenu<T extends string>(props: {
67
menus: {
78
id: T;

app/lib/components/box-tab.tsx renamed to app/lib/components/storybook-screen.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Button from "@material-ui/core/Button";
22
import * as React from "react";
3-
import { BoxDirectoryInput } from "./box-directory-input";
3+
// import { BoxDirectoryInput } from "./box-directory-input";
44

55
const TEST_STORYBOOK_ROOT =
66
"https://5f7d1f04988db70022c94c9a-bxsgusmnlc.chromatic.com";
@@ -39,7 +39,7 @@ export class BoxTab extends React.Component {
3939
<div />
4040
<Button onClick={this.onClickOpenStorybook}>open in storybook</Button>
4141
<Button onClick={this.onClickOpenGithub}>open in github</Button>
42-
<BoxDirectoryInput />
42+
{/* <BoxDirectoryInput /> */}
4343
<div />
4444
<h6>Box section end</h6>
4545
</div>

app/lib/components/upload-steps.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import React, { useEffect, useState } from "react";
22
import styled from "@emotion/styled";
3-
import { BlackButton, TransparencyButton } from "./style/global-style";
3+
import {
4+
BlackButtonStyle,
5+
TransparentButtonStyle,
6+
} from "@ui/core/button-style";
47
import { Button } from "@material-ui/core";
5-
import { ProgressBar } from "./animation/progress-bar";
8+
import { AnimatedProgressBar } from "./animation/animated-progress-bar";
69
import { AnimatedCheckIcon } from "./animation/animated-check-icon";
710
import { motion } from "framer-motion";
8-
import { Preview } from ".";
9-
import { CheckIcon } from "./Icon/check-icon";
11+
import { Preview } from "@ui/previewer";
12+
import CheckIcon from "@assistant/icons/check";
1013

1114
const step = [
1215
"converting design to universal format",
@@ -40,7 +43,7 @@ export function UploadSteps() {
4043
return (
4144
<>
4245
<Preview auto />
43-
{isLoading && <ProgressBar contorl={animateHandle} />}
46+
{isLoading && <AnimatedProgressBar contorl={animateHandle} />}
4447
<InnerWrapper variants={fieldVariants} animate="make-active">
4548
{isLoading ? (
4649
<Loading>
@@ -148,11 +151,11 @@ const IconBox = styled.div`
148151
`;
149152

150153
const CheckButton = styled(Button)`
151-
${BlackButton};
154+
${BlackButtonStyle};
152155
width: 100%;
153156
`;
154157
const UncheckButton = styled(Button)`
155-
${TransparencyButton}
158+
${TransparentButtonStyle}
156159
width: 100%;
157160
cursor: pointer;
158161
text-transform: initial;

0 commit comments

Comments
 (0)