Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change JS filenames to bring them in line with the Google JavaScript … #116

Merged
merged 3 commits into from Oct 27, 2019
Merged

Change JS filenames to bring them in line with the Google JavaScript … #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaaec83
Change JS filenames to bring them in line with the Google JavaScript …
danielimmke Oct 24, 2019
f883466
Change user-preferences.js to user_preferences.js
danielimmke Oct 24, 2019
98d34e0
Use hyphens instead of underscores, tidy up other references.
danielimmke Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/calendar.js
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@ const {
sumTime,
validateTime,
hourToMinutes
} = require('./js/time_math.js');
} = require('./js/time-math.js');
const { notify } = require('./js/notification.js');
const { getUserPreferences, showDay } = require('./js/UserPreferences.js');
const { applyTheme } = require('./js/Themes.js');
const { getUserPreferences, showDay } = require('./js/user-preferences.js');
const { applyTheme } = require('./js/themes.js');

// Global values for calendar
const store = new Store();
Expand Down
0 js/time_math.js → js/time-math.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions js/UserPreferences.js → js/user-preferences.js
View file
Open in desktop
@@ -1,8 +1,8 @@
const electron = require('electron');
const path = require('path');
const fs = require('fs');
const { validateTime } = require('../js/time_math.js');
const { isValidTheme } = require('../js/Themes.js');
const { validateTime } = require('./time-math.js');
const { isValidTheme } = require('./themes.js');

const defaultPreferences = {
'hide-non-working-days': false,
Expand Down
2 changes: 1 addition & 1 deletion main.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ const Store = require('electron-store');
const { shell } = require('electron');
const isOnline = require('is-online');
const { notify } = require('./js/notification');
const { savePreferences } = require('./js/UserPreferences.js');
const { savePreferences } = require('./js/user-preferences.js');
const os = require('os');

let savedPreferences = null;
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions src/preferences.js
View file
Open in desktop
@@ -1,6 +1,6 @@
const { ipcRenderer } = require('electron');
const { getUserPreferences } = require('../js/UserPreferences.js');
const { applyTheme } = require('../js/Themes.js');
const { getUserPreferences } = require('../js/user-preferences.js');
const { applyTheme } = require('../js/themes.js');

// Global values for preferences page
let usersStyles = getUserPreferences();
Expand Down
6 changes: 3 additions & 3 deletions src/workday_waiver.js
View file
Open in desktop
@@ -1,6 +1,6 @@
const { getUserPreferences, showDay } = require('../js/UserPreferences.js');
const { validateTime } = require('../js/time_math.js');
const { applyTheme } = require('../js/Themes.js');
const { getUserPreferences, showDay } = require('../js/user-preferences.js');
const { validateTime } = require('../js/time-math.js');
const { applyTheme } = require('../js/themes.js');
const Store = require('electron-store');

const store = new Store({name: 'waived-workdays'});
Expand Down
2 changes: 1 addition & 1 deletion test/time_math.test
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ const {
subtractTime,
sumTime,
validateTime
} = require('../js/time_math.js');
} = require('../js/time-math.js');

// Format hours test
test('Format hours 00:01', (t) => {
Expand Down