taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-02 13:19:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from misitebao/optimize-template-related-content

Browse Source 
[v2]feat: optimize template related content
This commit is contained in:
Lea Anthony
2021-09-23 08:30:48 +10:00
committed by GitHub
parent fe6dd4d18f 23d53253f9
commit ad25c256f9
17 changed files with 206 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2/cmd/wails/internal/commands/generate/template/base/app.tmpl.go
View File

@@ -17,9 +17,15 @@ func NewApp() *App {
// startup is called at application startup
func (a *App) startup(ctx context.Context) {
// Perform your setup here
a.ctx = ctx
}
// domReady is called after the front-end dom has been loaded
func (a App) domReady(ctx context.Context) {
// Add your action here
}
// shutdown is called at application termination
func (a *App) shutdown(ctx context.Context) {
// Perform your teardown here

10
v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/index.html vendored
View File

@@ -5,12 +5,12 @@
</head>
<body data-wails-drag>
<div id="logo"></div>
<div id="input" data-wails-no-drag>
<input id="name" type="text">
<button onclick="greet()">Greet</button>
<div class="logo"></div>
<div class="result" id="result">Please enter your name below 👇</div>
<div class="input-box" id="input" data-wails-no-drag>
<input class="input" id="name" type="text" autocomplete="off">
<button class="btn" onclick="greet()">Greet</button>
</div>
<div id="result"></div>
<script src="/main.js"></script>
</body>

87
v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/main.css vendored
View File

@@ -1,47 +1,72 @@
html {
text-align: center;
color: white;
background-color: rgba(0, 0, 0, 1);
background-color: rgba(33, 37, 43, 1);
text-align: center;
color: white;
}
body {
color: white;
font-family: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
margin: 0;
margin: 0;
color: white;
font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
}
@font-face {
font-family: 'Nunito';
font-style: normal;
font-weight: 400;
src: local(''),
url('assets/fonts/nunito-v16-latin-regular.woff2') format('woff2')
font-family: "Nunito";
font-style: normal;
font-weight: 400;
src: local(""),
url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2");
}
#result {
margin-top: 1rem;
.logo {
display: block;
width: 35%;
height: 35%;
margin: auto;
padding: 15% 0 0;
background-position: center;
background-repeat: no-repeat;
background-image: url("./assets/images/logo-dark.svg");
}
.result {
height: 20px;
line-height: 20px;
margin: 1.5rem auto;
}
.input-box .btn {
width: 60px;
height: 30px;
line-height: 30px;
border-radius: 3px;
border: none;
margin: 0 0 0 20px;
padding: 0 8px;
cursor: pointer;
}
.input-box .btn:hover {
background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%);
color: #333333;
}
button {
-webkit-appearance: default-button;
padding: 6px;
.input-box .input {
border: none;
border-radius: 3px;
outline: none;
height: 30px;
line-height: 30px;
padding: 0 10px;
background-color: rgba(240, 240, 240, 1);
-webkit-font-smoothing: antialiased;
}
#name {
border-radius: 3px;
outline: none;
height: 20px;
-webkit-font-smoothing: antialiased;
.input-box .input:hover {
border: none;
background-color: rgba(255, 255, 255, 1);
}
#logo {
width: 40%;
height: 40%;
padding-top: 20%;
margin: auto;
display: block;
background-position: center;
background-repeat: no-repeat;
background-image: url("./assets/images/logo-dark.svg");
.input-box .input:focus {
border: none;
background-color: rgba(255, 255, 255, 1);
}

21
v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/main.js vendored
View File

@@ -5,12 +5,19 @@ nameElement.focus();
// Setup the greet function
window.greet = function () {
// Get name
let name = nameElement.value;
// Get name
let name = nameElement.value;
// Call App.Greet(name)
window.go.main.App.Greet(name).then((result) => {
// Update result with data back from App.Greet()
document.getElementById("result").innerText = result;
});
// Call App.Greet(name)
window.go.main.App.Greet(name).then((result) => {
// Update result with data back from App.Greet()
document.getElementById("result").innerText = result;
});
};
nameElement.onkeydown = function (e) {
console.log(e)
if (e.keyCode == 13) {
window.greet()
}
}

12
v2/cmd/wails/internal/commands/generate/template/base/frontend/package.tmpl.json Normal file
View File

@@ -0,0 +1,12 @@
{
"name": "{{.ProjectName}}",
"version": "1.0.0",
"description": "",
"main": "",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": ""
},
"keywords": [],
"author": "{{.AuthorName}}"
}

33
v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go
View File

@@ -5,28 +5,49 @@ import (
"log"
"github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/logger"
"github.com/wailsapp/wails/v2/pkg/options"
"github.com/wailsapp/wails/v2/pkg/options/windows"
)
//go:embed frontend/dist
var assets embed.FS
func main() {
// Create application with options
// Create an instance of the app structure
app := NewApp()
// Create application with options
err := wails.Run(&options.App{
Title: "{{.ProjectName}}",
Width: 1024,
Height: 768,
Assets: assets,
Title: "{{.ProjectName}}",
Width: 1024,
Height: 768,
// MinWidth: 720,
// MinHeight: 570,
// MaxWidth: 1280,
// MaxHeight: 740,
DisableResize: false,
Fullscreen: false,
Frameless: false,
StartHidden: false,
HideWindowOnClose: false,
RGBA: &options.RGBA{255, 255, 255, 255},
Assets: assets,
LogLevel: logger.DEBUG,
OnStartup: app.startup,
OnDomReady: app.domReady,
OnShutdown: app.shutdown,
Bind: []interface{}{
app,
},
// Windows platform specific options
Windows: &windows.Options{
WebviewIsTransparent: false,
WindowIsTranslucent: false,
DisableWindowIcon: false,
},
})
if err != nil {
log.Fatal(err)
}

5
v2/cmd/wails/internal/commands/generate/template/base/wails.tmpl.json
View File

@@ -2,11 +2,10 @@
"name": "{{.ProjectName}}",
"outputfilename": "{{.BinaryName}}",
"assetdir": "frontend/dist",
"html": "frontend/dist/index.html",
"frontend:build": "npm run build",
"frontend:install": "npm install",
"frontend:build": "npm run build",
"author": {
"name": "{{.AuthorName}}",
"email": "{{.AuthorEmail}}"
}
}
}

5
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/app.tmpl.go
View File

@@ -21,6 +21,11 @@ func (b *App) startup(ctx context.Context) {
b.ctx = ctx
}
// domReady is called after the front-end dom has been loaded
func (b App) domReady(ctx context.Context) {
// Add your action here
}
// shutdown is called at application termination
func (b *App) shutdown(ctx context.Context) {
// Perform your teardown here

5
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/package.tmpl.json
View File

@@ -23,5 +23,6 @@
},
"dependencies": {
"sirv-cli": "^1.0.0"
}
,"author":"{{.AuthorName}}"}
},
"author": "{{.AuthorName}}"
}

52
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.go.tmpl
View File

@@ -1,52 +0,0 @@
package main
import (
"embed"
"log"
"github.com/wailsapp/wails/v2/pkg/options/windows"
"github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/logger"
"github.com/wailsapp/wails/v2/pkg/options"
)
//go:embed frontend/dist
var assets embed.FS
func main() {
// Create application with options
app := NewApp()
err := wails.Run(&options.App{
Title: "",
Width: 800,
Height: 600,
MinWidth: 400,
MinHeight: 400,
MaxWidth: 1280,
MaxHeight: 1024,
DisableResize: false,
Fullscreen: false,
Frameless: false,
StartHidden: false,
HideWindowOnClose: false,
RGBA: 0x000000FF,
Assets: assets,
Windows: &windows.Options{
WebviewIsTransparent: true,
WindowIsTranslucent: true,
DisableWindowIcon: true,
},
LogLevel: logger.DEBUG,
OnStartup: app.startup,
OnShutdown: app.shutdown,
Bind: []interface{}{
app,
},
})
if err != nil {
log.Fatal(err)
}
}

54
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go Normal file
View File

@@ -0,0 +1,54 @@
package main
import (
"embed"
"log"
"github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/logger"
"github.com/wailsapp/wails/v2/pkg/options"
"github.com/wailsapp/wails/v2/pkg/options/windows"
)
//go:embed frontend/dist
var assets embed.FS
func main() {
// Create an instance of the app structure
app := NewApp()
// Create application with options
err := wails.Run(&options.App{
Title: "{{.ProjectName}}",
Width: 720,
Height: 570,
MinWidth: 720,
MinHeight: 570,
MaxWidth: 1280,
MaxHeight: 740,
DisableResize: false,
Fullscreen: false,
Frameless: false,
StartHidden: false,
HideWindowOnClose: false,
RGBA: &options.RGBA{255, 255, 255, 255},
Assets: assets,
LogLevel: logger.DEBUG,
OnStartup: app.startup,
OnDomReady: app.domReady,
OnShutdown: app.shutdown,
Bind: []interface{}{
app,
},
// Windows platform specific options
Windows: &windows.Options{
WebviewIsTransparent: false,
WindowIsTranslucent: false,
DisableWindowIcon: false,
},
})
if err != nil {
log.Fatal(err)
}
}

4
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/template.json
View File

@@ -1,7 +1,7 @@
{
"name": "Basic Svelte + Rollup",
"shortname": "svelte",
"author": "Lea Anthony",
"author": "Lea Anthony <lea.anthony@gmail.com>",
"description": "Svelte template using rollup to bundle css, images and fonts",
"helpurl": "https://github.com/wailsapp/wails"
}
}

4
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/wails.tmpl.json
View File

@@ -2,10 +2,10 @@
"name": "{{.ProjectName}}",
"outputfilename": "{{.BinaryName}}",
"assetdir": "frontend/dist",
"frontend:build": "npm run build",
"frontend:install": "npm install",
"frontend:build": "npm run build",
"author": {
"name": "{{.AuthorName}}",
"email": "{{.AuthorEmail}}"
}
}
}

5
v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/app.tmpl.go
View File

@@ -21,6 +21,11 @@ func (b *App) startup(ctx context.Context) {
b.ctx = ctx
}
// domReady is called after the front-end dom has been loaded
func (b App) domReady(ctx context.Context) {
// Add your action here
}
// shutdown is called at application termination
func (b *App) shutdown(ctx context.Context) {
// Perform your teardown here

18
v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go
View File

@@ -14,10 +14,10 @@ import (
var assets embed.FS
func main() {
// Create application with options
// Create an instance of the app structure
app := NewApp()
// Create application with options
err := wails.Run(&options.App{
Title: "{{.ProjectName}}",
Width: 720,
@@ -33,17 +33,19 @@ func main() {
HideWindowOnClose: false,
RGBA: &options.RGBA{255, 255, 255, 255},
Assets: assets,
LogLevel: logger.DEBUG,
OnStartup: app.startup,
OnDomReady: app.domReady,
OnShutdown: app.shutdown,
Bind: []interface{}{
app,
},
// Windows platform specific options
Windows: &windows.Options{
WebviewIsTransparent: false,
WindowIsTranslucent: false,
DisableWindowIcon: false,
},
LogLevel: logger.DEBUG,
OnStartup: app.startup,
OnShutdown: app.shutdown,
Bind: []interface{}{
app,
},
})
if err != nil {

4
v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/template.json
View File

@@ -1,7 +1,7 @@
{
"name": "Vanilla HTML/JS/CSS",
"shortname": "vanilla",
"author": "Lea Anthony<lea.anthony@gmail.com>",
"author": "Lea Anthony <lea.anthony@gmail.com>",
"description": "A simple template using only HTML/CSS/JS",
"helpurl": "https://github.com/wailsapp/wails"
}
}

2
v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/wails.tmpl.json
View File

@@ -6,4 +6,4 @@
"name": "{{.AuthorName}}",
"email": "{{.AuthorEmail}}"
}
}
}