Skip to content

Commit

Permalink
moved front sources to single directory
Browse files Browse the repository at this point in the history
  • Loading branch information
skarab42 committed Nov 28, 2020
1 parent 3164dea commit 4bba2a6
Show file tree
Hide file tree
Showing 149 changed files with 7 additions and 5 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { name, version } from "../../package";
import { name, version } from "../../../package";
import { writable } from "svelte/store";
import { emit } from "@/libs/socket.io";
import capitalize from "capitalize";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"start": "electron app/main/index.js",
"watch": "concurrently -k -n tailwind,client,app -c red,magenta,yellow \"yarn tailwind:build\" \"yarn client:watch\" \"yarn app:watch\"",
"build": "yarn client:build && yarn tailwind:build --prod",
"prettify": "prettier --write ./app ./client-src",
"lint": "eslint ./app ./client-src --fix && yarn prettify"
"prettify": "prettier --write ./app ./front-src",
"lint": "eslint ./app ./front-src --fix && yarn prettify"
},
"build": {
"productName": "Marv",
Expand Down
6 changes: 4 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ import json from "@rollup/plugin-json";

const watch = process.env.ROLLUP_WATCH;

const clientDir = "client-src";
const overlayDir = "overlay-src";
const frontDir = "front-src";
const publicDir = "app/client";

const jsDir = `${publicDir}/js`;
const cssDir = `${publicDir}/css`;
const clientDir = `${frontDir}/client`;
const overlayDir = `${frontDir}/overlay`;

export default {
input: [`${clientDir}/index.js`, `${overlayDir}/overlay.js`],
Expand Down

0 comments on commit 4bba2a6

Please sign in to comment.