Skip to content

Commit

Permalink
Merge pull request #3 from beyenilmez/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
beyenilmez authored May 1, 2024
2 parents 18899f7 + 6e00250 commit 96d6bbd
Show file tree
Hide file tree
Showing 12 changed files with 72 additions and 165 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build

on:
push:
branches:
- main
- development
pull_request:
branches:
- main
- development

jobs:
build:
strategy:
fail-fast: false
matrix:
build:
[
{
name: desktop-manager,
platform: windows/amd64,
os: windows-latest,
},
]
runs-on: ${{ matrix.build.os }}
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: dAppServer/[email protected]
with:
build-name: ${{ matrix.build.name }}
build-platform: ${{ matrix.build.platform }}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ dist-ssr
*.sln
*.sw?

# wales
build/bin/desktop-manager-dev.exe
# wails
*.exe~
./build/bin/*
Binary file modified build/appicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
68 changes: 0 additions & 68 deletions build/darwin/Info.dev.plist

This file was deleted.

63 changes: 0 additions & 63 deletions build/darwin/Info.plist

This file was deleted.

Binary file modified build/windows/icon.ico
Binary file not shown.
12 changes: 6 additions & 6 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ThemeProvider } from "./contexts/theme-provider"
import { ProfileProvider } from "./contexts/profile-provider"
import TopBar from "./components/TopBar"
import { FileGrid } from "./components/FileGrid"
import { ThemeProvider } from "./contexts/theme-provider";
import { ProfileProvider } from "./contexts/profile-provider";
import TopBar from "./components/TopBar";
import { FileGrid } from "./components/FileGrid";

function App() {
return (
Expand All @@ -11,7 +11,7 @@ function App() {
<FileGrid />
</ProfileProvider>
</ThemeProvider>
)
);
}

export default App
export default App;
46 changes: 23 additions & 23 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;

--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;

--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;

--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;

--ring: 215 20.2% 65.1%;

--radius: 0.5rem;
}

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;

--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;

--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;

--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;

--destructive: 0 62.8% 30.6%;
--destructive-foreground: 0 85.7% 97.3%;

--ring: 217.2 32.6% 17.5%;
}
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.0
require (
github.com/google/uuid v1.6.0
github.com/parsiya/golnk v0.0.0-20221103095132-740a4c27c4ff
github.com/wailsapp/wails/v2 v2.8.0
github.com/wailsapp/wails/v2 v2.8.1
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ github.com/wailsapp/go-webview2 v1.0.10 h1:PP5Hug6pnQEAhfRzLCoOh2jJaPdrqeRgJKZhy
github.com/wailsapp/go-webview2 v1.0.10/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
github.com/wailsapp/wails/v2 v2.8.0 h1:b2NNn99uGPiN6P5bDsnPwOJZWtAOUhNLv7Vl+YxMTr4=
github.com/wailsapp/wails/v2 v2.8.0/go.mod h1:EFUGWkUX3KofO4fmKR/GmsLy3HhPH7NbyOEaMt8lBF0=
github.com/wailsapp/wails/v2 v2.8.1 h1:KAudNjlFaiXnDfFEfSNoLoibJ1ovoutSrJ8poerTPW0=
github.com/wailsapp/wails/v2 v2.8.1/go.mod h1:EFUGWkUX3KofO4fmKR/GmsLy3HhPH7NbyOEaMt8lBF0=
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
Expand Down
4 changes: 4 additions & 0 deletions wails.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
"author": {
"name": "Bedirhan Yenilmez",
"email": "[email protected]"
},
"info": {
"productName": "Desktop Manager",
"productVersion": "0.1.0"
}
}

0 comments on commit 96d6bbd

Please sign in to comment.