Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

Release v2.3.3 #353

Merged
merged 6 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api",
"version": "2.3.2",
"version": "2.3.3",
"main": "dist/index.js",
"license": "MIT",
"private": true,
Expand Down Expand Up @@ -82,4 +82,4 @@
"rimraf": "^3.0.2",
"typescript": "^4.4.2"
}
}
}
13 changes: 0 additions & 13 deletions electron/.github/dependabot.yml

This file was deleted.

12 changes: 12 additions & 0 deletions electron/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,15 @@ body {
-webkit-user-select: none;
-webkit-app-region: drag;
}


.home {
background-color: #4CAF50;
border: none;
color: white;
padding: 15px 32px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
}
13 changes: 12 additions & 1 deletion electron/assets/css/topbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@
#controls {
padding: 5px;
border-bottom: solid 1px #ccc;
background-color: #f8f8f8;
background-color: #000000;
}

.home {
background-color: #4CAF50; /* Green */
border: none;
color: white;
padding: 15px 32px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
}
Binary file modified electron/assets/icons/win/icon.ico
Binary file not shown.
Binary file added electron/assets/icons/win/icon1.ico
Binary file not shown.
7 changes: 4 additions & 3 deletions electron/index.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<html>
<head>
<title>Teledrive</title>
<link rel="stylesheet" href="assets/css/style.css" />
<link rel="stylesheet" href="assets/css/topbar.css" />
<!-- <link rel="stylesheet" href="assets/css/no-topbar.css"> -->
<!-- <link rel="stylesheet" href="assets/css/topbar.css" />-->
<link rel="stylesheet" href="assets/css/no-topbar.css">
<script defer src="assets/js/renderer.js"></script>
<meta
http-equiv="Content-Security-Policy"
Expand All @@ -12,7 +13,7 @@
<body>
<!-- Topbar -->
<div id="controls">
<button id="home" title="Go Home">Home</button>
<button id="home" title="Dashboard">Dashboard</button>

</div>
<!-- End topbar -->
Expand Down
4 changes: 2 additions & 2 deletions electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ app.on("ready", () => {
const window = require("./src/window");
mainWindow = window.createBrowserWindow(app);
remoteMain.enable(mainWindow.webContents);

icon: 'assets\icons\win.icon.ico'
// Option 1: Uses Webtag and load a custom html file with external content
mainWindow.loadURL(`file://${__dirname}/index.html`);

// Option 2: Load directly an URL if you don't need interface customization
//mainWindow.loadURL("https://github.com");
//mainWindow.loadURL("");

// Option 3: Uses BrowserView to load an URL
//const view = require("./src/view");
Expand Down
14 changes: 7 additions & 7 deletions electron/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "electron-webview",
"productName": "Electron webview",
"name": "teledrive",
"productName": "TeleDrive",
"version": "1.0.0",
"description": "A simple Electron webview application",
"description": "Cloud Storage Service",
"main": "main.js",
"scripts": {
"start": "electron .",
Expand All @@ -11,12 +11,12 @@
"package-linux": "electron-packager . --overwrite --platform=linux --arch=x64 --icon=assets/icons/png/1024x1024.png --prune=true --out=release-builds",
"create-installer-mac": "electron-installer-dmg ./release-builds/Electron\\ webview-darwin-x64/Electron\\ webview.app electron-webview --out=release-builds --overwrite --icon=assets/icons/mac/icon.icns"
},
"repository": "https://github.com/cba85/electron-webview",
"repository": "https://github.com/mgilangjanuar/teledrive",
"keywords": [
"Electron",
"Cloud Storage",
"webview",
"tutorial",
"demo"
"app",
"storage"
],
"author": "GitHub",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion electron/src/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ exports.createBrowserView = (mainWindow) => {
const view = new BrowserView();
mainWindow.setBrowserView(view);
view.setBounds({ x: 0, y: 0, width: 1024, height: 768 });
view.webContents.loadURL("https://www.github.com");
view.webContents.loadURL("https://teledrive-web.vercel.app/startup");
};
Loading