Skip to content

Commit

Permalink
Merge pull request #4 from jecsham/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jecsham authored Jun 5, 2022
2 parents 74ba0a8 + 5626d1d commit 6a7ee4b
Show file tree
Hide file tree
Showing 19 changed files with 409 additions and 158 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

/sign
.env
54 changes: 49 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "msi",
"version": "2.0.0",
"version": "2.0.1",
"private": true,
"dependencies": {
"@tauri-apps/api": "^1.0.0-rc.4",
Expand All @@ -26,7 +26,7 @@
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"tauri": "tauri"
"tauri": "env-cmd tauri"
},
"eslintConfig": {
"extends": [
Expand All @@ -48,6 +48,7 @@
},
"devDependencies": {
"@tauri-apps/cli": "^1.0.0-rc.9",
"cross-env": "^7.0.3"
"cross-env": "^7.0.3",
"env-cmd": "^10.1.0"
}
}
1 change: 1 addition & 0 deletions public/css/uikit-core.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/uikit.min.css

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,14 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

<!-- css styles -->
<link rel="stylesheet" href="/css/uikit.min.css">
<link rel="stylesheet" href="/css/uikit-core.min.css">
<link rel="stylesheet" href="/css/style.css">

<!-- js -->
<script type="text/javascript" src="/js/uikit-icons.min.js"></script>
<script type="text/javascript" src="/js/uikit.min.js"></script>
<script type="text/javascript" src="/js/custom.js"></script>

Expand Down
3 changes: 0 additions & 3 deletions public/js/uikit-icons.min.js

This file was deleted.

4 changes: 1 addition & 3 deletions public/js/uikit.min.js

Large diffs are not rendered by default.

161 changes: 160 additions & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6a7ee4b

Please sign in to comment.