Skip to content
This repository has been archived by the owner on Sep 21, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: soulsam480/noter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.0.beta
Choose a base ref
...
head repository: soulsam480/noter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 27 files changed
  • 1 contributor

Commits on Jan 18, 2021

  1. Copy the full SHA
    a93c074 View commit details
  2. chore: update homepage

    soulsam480 committed Jan 18, 2021
    Copy the full SHA
    b6a5985 View commit details

Commits on May 6, 2021

  1. Copy the full SHA
    160e741 View commit details
  2. Copy the full SHA
    90fdb6a View commit details
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -23,4 +23,7 @@ pnpm-debug.log*
*.sw?
deploy.sh
src/firebase/cred.ts
src/miscred/prelink.ts
src/miscred/prelink.ts
#Electron-builder output
/dist_electron
build
Binary file added build/icons/1024x1024.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 added build/icons/128x128.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 added build/icons/16x16.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 added build/icons/24x24.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 added build/icons/256x256.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 added build/icons/32x32.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 added build/icons/48x48.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 added build/icons/512x512.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 added build/icons/64x64.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 added build/icons/icon.icns
Binary file not shown.
Binary file added build/icons/icon.ico
Binary file not shown.
25 changes: 22 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
{
"name": "noter",
"version": "0.1.0",
"version": "0.5.0",
"private": true,
"author": "soulsam480",
"author": {
"email": "soulsam480@hotmail.com",
"name": "soulsam480",
"url": "https://sambitsahoo.com"
},
"description": "Noter is a collaborative note-taking platform built for simplicity and productivity. It's free fast and open source.",
"homepage": "https://noter.sambitsahoo.com",
"repository": "https://github.com/soulsam480/noter",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
"lint": "vue-cli-service lint",
"electron:build": "vue-cli-service electron:build",
"electron:serve": "vue-cli-service electron:serve --no-sandbox",
"electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten",
"postinstall": "electron-builder install-app-deps",
"postuninstall": "electron-builder install-app-deps"
},
"main": "background.js",
"dependencies": {
"@editorjs/checklist": "^1.1.0",
"@editorjs/code": "^2.5.0",
@@ -30,6 +43,7 @@
"popper.js": "^1.16.1",
"randomcolor": "^0.6.2",
"register-service-worker": "^1.7.1",
"uuid": "^8.3.2",
"v-emoji-picker": "^2.3.0",
"vue": "^2.6.11",
"vue-click-outside": "^1.1.0",
@@ -40,6 +54,7 @@
"devDependencies": {
"@types/bootstrap": "^4.5.0",
"@types/core-js": "^2.5.4",
"@types/electron-devtools-installer": "^2.2.0",
"@types/eslint": "^6.8.1",
"@types/eslint-plugin-prettier": "^3.1.0",
"@types/jquery": "^3.5.1",
@@ -58,6 +73,9 @@
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/runtime-dom": "^3.0.2",
"babel-eslint": "^10.1.0",
"electron": "^9.0.0",
"electron-devtools-installer": "^3.1.0",
"electron-icon-builder": "^2.0.1",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-vue": "^6.2.2",
@@ -66,6 +84,7 @@
"sass-loader": "^8.0.2",
"typescript": "~3.9.3",
"typesync": "^0.7.0",
"vue-cli-plugin-electron-builder": "~2.0.0-rc.5",
"vue-template-compiler": "^2.6.11"
}
}
2 changes: 2 additions & 0 deletions public/_redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Netlify settings for single-page application
/* /index.html 200
Binary file added public/icon.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 added src/assets/icon.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 added src/assets/noter.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions src/background.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
'use strict';
/* global __static */
import { app, protocol, BrowserWindow } from 'electron';
import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
const isDevelopment = process.env.NODE_ENV !== 'production';
import path from 'path';
// Scheme must be registered before the app is ready
protocol.registerSchemesAsPrivileged([
{ scheme: 'app', privileges: { secure: true, standard: true } },
]);

async function createWindow() {
// Create the browser window.
const win = new BrowserWindow({
width: 800,
height: 600,
webPreferences: {
// Use pluginOptions.nodeIntegration, leave this alone
// See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
nodeIntegration: (process.env
.ELECTRON_NODE_INTEGRATION as unknown) as boolean,
}, //@ts-ignore
icon: path.join(__static, 'icon.png'),
});

if (process.env.WEBPACK_DEV_SERVER_URL) {
// Load the url of the dev server if in development mode
await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string);
if (!process.env.IS_TEST) win.webContents.openDevTools();
} else {
createProtocol('app');
// Load the index.html when not in development
win.loadURL('app://./index.html');
}
}

// Quit when all windows are closed.
app.on('window-all-closed', () => {
// On macOS it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') {
app.quit();
}
});

app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (BrowserWindow.getAllWindows().length === 0) createWindow();
});

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
app.on('ready', async () => {
if (isDevelopment && !process.env.IS_TEST) {
// Install Vue Devtools
try {
await installExtension(VUEJS_DEVTOOLS);
} catch (e) {
console.error('Vue Devtools failed to install:', e.toString());
}
}
createWindow();
});

// Exit cleanly on request from parent process in development mode.
if (isDevelopment) {
if (process.platform === 'win32') {
process.on('message', (data) => {
if (data === 'graceful-exit') {
app.quit();
}
});
} else {
process.on('SIGTERM', () => {
app.quit();
});
}
}
7 changes: 2 additions & 5 deletions src/components/Sidebar.vue
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@
<script lang="ts">
//@ts-ignore
import ClickOutside from 'vue-click-outside';
import { v4 as uuidv4 } from 'uuid';
import TopContext from '@/components/TopContext.vue';
import Tooltip from '@/components/Tooltip.vue';
import Context from '@/components/Context.vue';
@@ -259,10 +259,7 @@ export default Vue.extend<Data, Methods, Computed>({
this.$refs.sidebar.classList.toggle('sidebar-active');
},
createBoard() {
const id = Math.random()
.toString(20)
.substr(2)
.toUpperCase();
const id = uuidv4();
this.$router.push({ name: 'Board', params: { _slug: id } });
},
},
19 changes: 13 additions & 6 deletions src/firebase/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import firebase from "firebase/app";
import "firebase/storage";
import "firebase/firebase-database";
import "firebase/firebase-auth";
import config from './cred';
import firebase from 'firebase/app';
import 'firebase/storage';
import 'firebase/firebase-database';
import 'firebase/firebase-auth';

const config = {
apiKey: process.env.VUE_APP_apiKey,
authDomain: process.env.VUE_APP_authDomain,
databaseURL: process.env.VUE_APP_databaseURL,
projectId: process.env.VUE_APP_projectId,
storageBucket: process.env.VUE_APP_storageBucket,
messagingSenderId: process.env.VUE_APP_messagingSenderId,
appId: process.env.VUE_APP_appId,
};

firebase.initializeApp(config);

const db = firebase.database();
const auth = firebase.auth();
const storageref = firebase.storage();
3 changes: 2 additions & 1 deletion src/router/index.ts
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ const routes = [
if (auth.currentUser) {
next();
} else {
next(`/?redirect=${to.path}`);
next(`/?redirect=${to.path}`);
}
},
},
@@ -57,6 +57,7 @@ const routes = [

const router = new VueRouter({
routes,
mode: process.env.NODE_ENV === 'development' ? 'hash' : 'history',
});

export default router;
12 changes: 8 additions & 4 deletions src/styles/default.scss
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $bg-primary: #ffffff;
$primary: #101629;
$primary-light: #434449;
$secondary: #d4d4f5;
$secondary-light: #e1e1ff;
$secondary-light: #e1e1fb;
//todo fonts
@font-face {
font-family: 'Merriweather Regular';
@@ -39,14 +39,14 @@ a {
.n-btn {
background: $secondary;
color: $primary;
border-radius: 2px;
border-radius: 3px;
border: none;
padding: 5px 15px;
padding: 7px 15px;
margin: 5px;
display: inline-block;
font-family: inherit;
cursor: pointer;
box-shadow: 0.5px 0.5px 7px 0.1px #3535353d;
// box-shadow: 0.5px 0.5px 7px 0.1px #3535353d;
&:hover {
color: $primary;
background-color: $secondary-light;
@@ -76,6 +76,10 @@ a {
display: block;
width: 100%;
}
&.sm {
padding: 5px 10px;
font-size: 11px;
}
}

//todo media queries
Loading