Read the statement by Michael Teeuw here.
Changing icons of the modules Current Weather and Weather Forecast
-
@sdetweil for calendar I got this return and the cursor did not return to cd ~/MagicMirror/ I just have two points at the bottom of the file
pi@MagicMirror:~/MagicMirror $ git diff modules/default/calendar/calendar.js diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/cal endar.js index 2ef9ca9c..4f70a1e9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -1,6 +1,6 @@ /* global cloneObject */ -/* MagicMirror² +/* Magic Mirror * Module: Calendar * * By Michael Teeuw https://michaelteeuw.nl @@ -11,11 +11,8 @@ Module.register("calendar", { defaults: { maximumEntries: 10, // Total Maximum Entries maximumNumberOfDays: 365, - limitDays: 0, // Limit the number of days shown, 0 = no limit - pastDaysCount: 0, displaySymbol: true, - defaultSymbol: "calendar-alt", // Fontawesome Symbol see https:/ /fontawesome.com/cheatsheet?from=io - defaultSymbolClassName: "fas fa-fw fa-", :...skipping... diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 2ef9ca9c..4f70a1e9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -1,6 +1,6 @@ /* global cloneObject */ -/* MagicMirror² +/* Magic Mirror * Module: Calendar * * By Michael Teeuw https://michaelteeuw.nl @@ -11,11 +11,8 @@ Module.register("calendar", { defaults: { maximumEntries: 10, // Total Maximum Entries maximumNumberOfDays: 365, - limitDays: 0, // Limit the number of days shown, 0 = no limit - pastDaysCount: 0, displaySymbol: true, - defaultSymbol: "calendar-alt", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io - defaultSymbolClassName: "fas fa-fw fa-", + defaultSymbol: "calendar", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io showLocation: false, displayRepeatingCountTitle: false, defaultRepeatingCountTitle: "", @@ -27,25 +24,23 @@ Module.register("calendar", { maxEventTitleLines: 3, fetchInterval: 5 * 60 * 1000, // Update every 5 minutes. animationSpeed: 2000, - fade: true, + fade: false, urgency: 7, - timeFormat: "relative", - dateFormat: "MMM Do", + timeFormat: "absolute", + dateFormat: "Do MMM HH:mm", dateEndFormat: "LT", - fullDayEventDateFormat: "MMM Do", + fullDayEventDateFormat: "Do MMM", showEnd: false, getRelative: 6, fadePoint: 0.25, // Start on 1/4th of the list. hidePrivate: false, hideOngoing: false, - hideTime: false, - showTimeToday: false, colored: false, - customEvents: [], // Array of {keyword: "", symbol: "", color: ""} where Keyword is a regexp and symbol/color are to be applied for matched + coloredSymbolOnly: false, tableClass: "small", calendars: [ { - symbol: "calendar-alt", + symbol: "calendar", url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics" } ], @@ -60,18 +55,9 @@ Module.register("calendar", { excludedEvents: [], sliceMultiDayEvents: false, broadcastPastEvents: false, - nextDaysRelative: false, : -
@Manu85 all of those changes need to go in config.js
(ps, THIS is why you don’t change our files… )
and THIS is why test mode… so you have a chance to save your stuff.and AFTER these changes are in config.js , and custom.css
AND you tested,
THEN u restore the original file
and TEST AGAIN… to make sure everything is right.THEN you can upgrade… and these files will all have been restored
and won’t show in the changed list (I would run test mode over and over til these problems go away) -
@sdetweil yes, now thanks to you I understand the importance of js and css files
-
@sdetweil So I have to make the corrections manually in the files concerned by replacing the red lines with green lines, is that it?
-
@Manu85 you don’t have to correct the files… , just move the changes (green) to config.js and custom.css
to restore a file to its release level content do
~/MagicMirror git checkout full_path_and_filenameexample
git checkout css/main.cssthis will restore the file from the local (hidden) source repository
dont do this til you have at least tested once for each file changed…
and you MAY want to copy the affected file to a saved version (add .save to its filename)
in case you missed one of the changes after you restore the file… -
@sdetweil I’m trying to understand and I’m having a lot of trouble, in the following example, I haven’t touched anything (I’m almost sure) and I have two lines, the first in red and the second in Green:
-/* MagicMirror²
+/* Magic Mirror
I can’t put the green line in my js.config file, right?
I’m sorry but I’m trying to understanddiff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/cal endar.js index 2ef9ca9c..4f70a1e9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -1,6 +1,6 @@ /* global cloneObject */ -/* MagicMirror² +/* Magic Mirror * Module: Calendar * -
@sdetweil another example that bothers me
-
@sdetweil one last one for which I don’t know what to do either, thank you again for your help
-
@Manu85 not the -lock.json files , these are generated by npm install
the MagicMirror thing is inside a comment, so not important.
the default symbol, the green goes in config.js for the calendar module. don’t worry about the red
-
@sdetweil ok, thank you for your answers, I’m going to do the weather.js and according to what you tell me I’m going to leave aside the 2 lock.json and then I’ll stop for this evening my brain is upside down , have a good day…and see you tomorrow if you want to continue helping me
-
@sdetweil I’m still here, I made the modifications in css main and js.config I placed the command:
bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"here is what I have
pi@MagicMirror:~ $ bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" update log will be in /home/pi/MagicMirror/installers/upgrade.log doing test run = true, NO updates will be applied! Check current Node installation ... Node currently installed. Checking version number. Minimum Node version: v18.18.0 Installed Node version: v14.21.3 Node should be upgraded. pi@MagicMirror:~ $ -
@Manu85 well…let me check when I get home. maybe 30 mins from now 1800 my time US central
-
@Manu85 fixed, run again
-
@sdetweil hello, I rebotted the pi and ran the command again
bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"and I have the impression that it remains stuck in the same place the cursor does not display:
pi@MagicMirror:~ $
-
@Manu85 can you post the last part of
~/MagicMirror/installers/upgrade.logfrom the last
"upgrade started" -
@sdetweil ```
pi@MagicMirror:~ $ ~/MagicMirror/installers/upgrade.log
-bash: /home/pi/MagicMirror/installers/upgrade.log: Permission non accord▒e
pi@MagicMirror:~ $ -
@Manu85 no. not execute . open and look at
copy last few lines here
-
@sdetweil I copied everything, if necessary
Upgrade started - mer. janv. 24 17:51:10 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m [92mNode.js upgrade defered, doing test run[0m [96mCheck current NPM installation ...[0m [0mNPM currently installed. Checking version number. [0mMinimum npm version: [1mV9.8.1[0m [0mInstalled npm version: [1mV6.14.18[0m [96mnpm should be upgraded.[0m [96mnpm upgrade defered, doing test run ...[0m saving custom.css remote name = origin upgrading from version 2.23.0 to 2.26.0 fetching latest revisions git fetch rc=0 current branch = master On branch master Your branch is behind 'origin/master' by 213 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: css/main.css modified: fonts/package-lock.json modified: modules/default/calendar/calendar.js modified: modules/default/weather/weather.js modified: package-lock.json modified: vendor/package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) core css/icons/ css/save_custom.css modules/default/currentweather/ nohup.out no changes added to commit (use "git add" and/or "git commit -a") there are 6 local files that are different than the master repo css/main.css fonts/package-lock.json modules/default/calendar/calendar.js modules/default/weather/weather.js package-lock.json vendor/package-lock.json save/restore files selection = n restoring css/main.css from repo skipping restore for css/main.css, doing test run restoring fonts/package-lock.json from repo skipping restore for fonts/package-lock.json, doing test run restoring modules/default/calendar/calendar.js from repo skipping restore for modules/default/calendar/calendar.js, doing test run restoring modules/default/weather/weather.js from repo skipping restore for modules/default/weather/weather.js, doing test run restoring package-lock.json from repo skipping restore for package-lock.json, doing test run restoring vendor/package-lock.json from repo skipping restore for vendor/package-lock.json, doing test run test merge result rc='' , if empty, no conflicts skipping merge, only test run Checking for modules with removed libraries downloading dumpactivemodules script updating dependencies for active modules with package.json files processing for module MMM-OneCallWeather please wait ---------------------------------- skipped processing for MMM-OneCallWeather, doing test run processing complete for module MMM-OneCallWeather processing for module MMM-SmartWebDisplay please wait ---------------------------------- skipped processing for MMM-SmartWebDisplay, doing test run processing complete for module MMM-SmartWebDisplay processing for module MMM-ISS-Live please wait ---------------------------------- skipped processing for MMM-ISS-Live, doing test run processing complete for module MMM-ISS-Live restoring custom.css removing git alias Upgrade ended - mer. janv. 24 18:06:38 CET 2024 Upgrade started - mer. janv. 24 20:51:08 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - mer. janv. 24 21:02:28 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - mer. janv. 24 21:26:35 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - mer. janv. 24 21:31:01 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - jeu. janv. 25 08:56:35 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - jeu. janv. 25 09:02:37 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m Upgrade started - jeu. janv. 25 10:04:34 CET 2024 system is Linux MagicMirror 5.10.103-v7+ #1529 SMP Tue Mar 8 12:21:37 GMT 2022 armv7l GNU/Linux doing test run = true, NO updates will be applied! the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster n (node version manager tool) not installed, doing test run, install skipped [96mCheck current Node installation ...[0m [0mNode currently installed. Checking version number. [0mMinimum Node version: [1mv18.18.0[0m [0mInstalled Node version: [1mv14.21.3[0m [96mNode should be upgraded.[0m [92mNode.js upgrade defered, doing test run[0m [96mCheck current NPM installation ...[0m [0mNPM currently installed. Checking version number. [0mMinimum npm version: [1mV9.8.1[0m [0mInstalled npm version: [1mV6.14.18[0m [96mnpm should be upgraded.[0m [91mA npm process is currently running. Can't upgrade. Please quit all npm processes and restart the installer. -
@Manu85 you have your MagicMirror running from
npm startright?
you need to stop it, ctrl-c in that terminal window
also show output of
pm2 status -
@Manu85 I added a couple more fixes to the pm2 stop…
tested here… give it a try again…
I am busy most of the day… will try to check in when I can
traveling tomorrow
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login