Skip to content

Commit 2b5f490

Browse files
authored
Merge pull request #171 from oslabs-beta/master
OverVue 9.0
2 parents 939e8a2 + 5838d72 commit 2b5f490

Some content is hidden

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

70 files changed

+13317
-4733
lines changed

README.md

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ If you choose to use VcXsrv, you will need to select a couple options:
6262

6363
If you choose to use x410, you will need to set the environment DISPLAY variable on each console:
6464

65-
6665
So, to open either the Vue devtools or OverVue in dev mode, first start your X Server then enter into the terminal:
6766
For WSL 1 :
6867

@@ -76,7 +75,9 @@ For WSL 2 :
7675
export DISPLAY=$(awk '/nameserver / {print $2; exit}' /etc/resolv.conf 2>/dev/null):0
7776
export LIBGL_ALWAYS_INDIRECT=1
7877
```
78+
7979
Then run the following command to run both OverVue and Vue developer tools.
80+
8081
```
8182
npm run dev
8283
```
@@ -92,7 +93,9 @@ Then to start only OverVue in developer mode, open a new terminal instance and s
9293
```
9394
quasar dev -m electron
9495
```
95-
**NOTE**:
96+
97+
**NOTE**:
98+
9699
<ul>
97100
<li>Electron-deeplink currently does not work on our WSL2 computers and output an error during installing the dependency which prevented the application to open in dev mode. Go to /src-electron/electron-main.js and comment out line 3/import line to bypass error. The developers did not find any impacts on application so far.</li>
98101
<li>There might be an npm install error despite all instructions. Try the following command below:</li>
@@ -102,9 +105,6 @@ quasar dev -m electron
102105
sudo apt install libgconf-2-4 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm-dev libnss3-dev libxss-dev
103106
```
104107

105-
106-
107-
108108
## Running the Docker Image
109109

110110
To run the built version, pull down the docker image from [Docker repo]
@@ -114,20 +114,25 @@ In your terminal, run:
114114
```
115115
docker run -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY -v`pwd`/src:/app/src --rm -it overvue
116116
```
117+
117118
### Running the dev environment on Docker as a Mac User
119+
118120
To run OverVue through Docker on a Mac, you'll need to install XQuartz:
121+
119122
```
120123
brew install --cask xquartz
121124
```
122125

123126
<strong>Important:</strong> RESTART your computer.
124127

125128
Update your PATH variable to /opt/x11/bin to your .zshrc. For example:
129+
126130
```
127131
export PATH=/opt/X11/bin:$PATH
128132
```
129133

130134
Set up XQuartz:
135+
131136
<ul>
132137
<li>Launch XQuartz</li>
133138
<li>Under the XQuartz menu, select Preferences.</li>
@@ -136,30 +141,37 @@ Set up XQuartz:
136141
</ul>
137142

138143
Run the following command in your terminal (replacing localhostname with your local host name)
144+
139145
```
140146
xhost +localhostname
141147
```
148+
142149
If you don't know your local host name, run the following command to find it:
150+
143151
```
144152
echo $(hostname)
145153
```
146154

147155
Build the image using Dockerfile-Mac:
156+
148157
```
149158
docker build -t overvue -f Dockerfile-Mac .
150159
```
151160

152161
Run the image using the following command
162+
153163
```
154164
docker run -it --env="DISPLAY=$(ifconfig en0 | grep inet | awk '$1=="inet" {print$2}'):0" --security-opt seccomp=./chrome.json overvue
155165
```
156166

157167
Run in dev mode using:
168+
158169
```
159-
npm run dev
170+
npm run dev
160171
```
161172

162173
For more information about running Electron through Docker on a Mac, check out these posts:
174+
163175
<li><a href="https://jaked.org/blog/2021-02-18-How-to-run-Electron-on-Linux-on-Docker-on-Mac">How to run Electron on Linux on Docker on Mac</a></li>
164176
<li><a href="https://gist.github.com/paul-krohn/e45f96181b1cf5e536325d1bdee6c949">Workaround for sockets on Docker on macOS</a></li>
165177
<li><a href="https://blog.jessfraz.com/post/how-to-use-new-docker-seccomp-profiles/">How to use new Docker seccomp profiles</a></li>
@@ -168,19 +180,23 @@ For more information about running Electron through Docker on a Mac, check out t
168180
### Running the dev environment on Docker as a WSL user
169181

170182
Build the image using Dockerfile-WSL:
183+
171184
```
172185
docker build -t overvue -f Dockerfile-WSL .
173186
```
174187

175-
To run
188+
To run
189+
176190
```
177191
docker run -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY -v`pwd`/src:/app/src --rm -it overvue bash
178192
```
179193

180194
Run in dev mode using:
195+
181196
```
182197
npm run dev
183198
```
199+
184200
[↥Back to top](#table-of-contents)
185201
<br/>
186202

@@ -193,7 +209,7 @@ npm run dev
193209
- You may nest HTML elements by clicking the chevron and selecting the nested HTML elements. Return to the parent HTML element by clicking clicking the carrot above the HTML element.
194210

195211
- Select a parent component for the new component if needed.
196-
- After creating the component, you can move, resize, and recolor the component in the display. For advanced styling options, double click on the desired HTML element to modify. Here, you may add attributes such as class, ID, and v-model.
212+
- After creating the component, you can move, resize, and recolor the component in the display. For advanced styling options, double click on the desired HTML element to modify. Here, you may add attributes such as class, ID, and v-model.
197213
![](./src/assets/readme/v4Creating_Component.gif)
198214

199215
- You can also duplicate components with Ctrl/Cmd C & V and see the component tree updated in real time.
@@ -203,10 +219,10 @@ npm run dev
203219
- Child components will inherit the same parents, but parent components will not inherit duplicate children.
204220
![](./src/assets/readme/v4Copy_Parent_Component.gif)
205221

206-
- The right-side, Component Details > Code Snippet Tab displays live code snippets for the selected component.
222+
- The right-side, Component Details > Code Snippet Tab displays live code snippets for the selected component.
207223
![](./src/assets/readme/v4Code_Snippet.gif)
208224

209-
- You can view and add new routes and associated components in the right-side, Routes Gab. The newly created routes will be visible in the Project Tree Tab.
225+
- You can view and add new routes and associated components in the right-side, Routes Gab. The newly created routes will be visible in the Project Tree Tab.
210226
![](./src/assets/readme/v4Copying_Route.gif)
211227

212228
- State and actions can be created, edited, and assigned to components.
@@ -235,11 +251,13 @@ src/
235251
babel.config.js
236252
package.json
237253
```
238-
<br/>
254+
255+
<br/>
239256

240257
[↥Back to top](#table-of-contents)
241258

242259
## BETA
260+
243261
### Slack OAuth
244262

245263
For the Slack OAuth, you will need to create a Slack app through their website (https://api.slack.com/apps?new_app=1), so that you have your own Client Secret and Client ID. Then create two .env files (one for development and one for production).
@@ -271,6 +289,7 @@ SLACK_REDIRECT_URI = "overvuedev://test"
271289
[↥Back to top](#table-of-contents)
272290

273291
### Changelog
292+
274293
### Changelog 2.0
275294

276295
<details><summary>OverVue 2.0</summary>
@@ -371,7 +390,7 @@ SLACK_REDIRECT_URI = "overvuedev://test"
371390
<li>Fixed clicking canvas does not fully deactivate active component</li>
372391
<li>Fixed Error handling for 'pasting' component when no component is copied</li>
373392
<li>Fixed dancing components</li>
374-
<li>Fixed project tree visulization</li>
393+
<li>Fixed project tree visulization</li>
375394
</ul>
376395
</details>
377396

@@ -421,21 +440,43 @@ SLACK_REDIRECT_URI = "overvuedev://test"
421440
<li>Eliminated code redundancy by implementing mixins</li>
422441
</ul>
423442
</details>
443+
444+
### Changelog 9.0
445+
446+
<details><summary>OverVue 9.0</summary>
447+
<ul>
448+
<li>Converted codebase (40+ components) from Options API to Composition API</li>
449+
<li>Migrated store from Vuex to Pinia</li>
450+
<li>Migrated codebase to TypeScript</li>
451+
<li>Implemented testing of Pinia store</li>
452+
<li>Updated Electron builder dependency</li>
453+
<li>UI overhaul</li>
454+
<br>
455+
<h4><strong>Bug Fixes</strong></h4>
456+
<li>Fixed nesting HTML elements functionality</li>
457+
<li>Fixed adding innerText functionality</li>
458+
<li>Fixed formatting of exported code</li>
459+
<li>Fixed parent child component relationship in code snippet and on export</li>
460+
<li>Fixed typing and initial values of store to match actions usage</li>
461+
<li>Eliminated code redundancy by implementing Composition API and Pinia</li>
462+
</ul>
463+
</details>
424464
<br/>
425465

426466
[↥Back to top](#table-of-contents)
467+
427468
## Contributing
428469

429-
We'd love for you to test this application out and submit any issues you encounter. Also feel free to fork to your own repo and submit PRs.
470+
We'd love for you to test out the application and submit any issues you encounter. Also feel free to fork to your own repo and submit PRs.
430471
Here are some features we're thinking about adding:
431472

432-
433-
- Ability to place child components into HTML elements
434-
- Ability to export Vuex store boilerplate
473+
- Ability to choose options or composition API for code snippet and exported code
474+
- Ability to choose Vuex or Pinia for code snippet and exported code
435475
- Ability to add two-way binding to input elements
436-
- More granular typing options for TypeScript mode
476+
- Make snap-to-grid optional with a toggle feature
477+
- Expand testing suite and add more dynamic tests
437478

438-
If you make changes and wish to update the website, here is the link to the repo: https://github.com/TeamOverVue/OverVuePage
479+
If you make changes and wish to update the website, here is the link to the repo: https://github.com/OverVue9/OverVueWebsite
439480

440481
<br/>
441482

@@ -479,6 +520,10 @@ Chris Wong @Koregano73
479520
Honghao(Michael) Sun @sunhonghaoparis
480521
Alex Law @alexlaw528
481522
Emma Genesen @EGenesen
523+
Jigar Patel @jigarxp
524+
Linden Young @lindenyoung
525+
Chris Davis @chdavis0917
526+
Ji Kim @dwejikim
482527
```
483528

484529
Inspired by [PreVue](https://github.com/open-source-labs/PreVue)

0 commit comments

Comments
 (0)