• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
MagicMirror Forum
  • Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
A New Chapter for MagicMirror: The Community Takes the Lead
Read the statement by Michael Teeuw here.

Update says to "commit your changes or stash them before you can merge." ?

Scheduled Pinned Locked Moved Troubleshooting
26 Posts 8 Posters 40.8k Views 8 Watching
Loading More Posts
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • R Offline
    Richard238 @yawns
    last edited by Apr 3, 2017, 2:53 PM

    @yawns
    I don’t quite understand.

    Main.css - I don’t know what I’ve changed, I’ll have a look later.
    compliments.js Well, OK, I can re-write those.

    calendar.js / newsfeed.js / weatherforecast.js
    These have to be changed to pull in your calendar, your choice of news, your choice of weather, don’t they?

    Y 1 Reply Last reply Apr 3, 2017, 2:57 PM Reply Quote 0
    • Y Offline
      yawns Moderator @Richard238
      last edited by Apr 3, 2017, 2:57 PM

      @Richard238

      No, there is no need at all to change these files.

      next to main.css you find custom.css, there you can add any css styles which will override existing styles.

      To add compliments, calendars, newsfeeds and forecast you set your values in config/config.js.
      This way you don’t lose your changes :)

      R 1 Reply Last reply Apr 3, 2017, 4:04 PM Reply Quote 1
      • R Offline
        Richard238 @yawns
        last edited by Apr 3, 2017, 4:04 PM

        @yawns Ok, thanks. I’ve some work to do there then!

        1 Reply Last reply Reply Quote 0
        • R Offline
          Richard238
          last edited by Apr 3, 2017, 4:14 PM

          Lost and confused already.

          How much of calendar.js needs to be copied to config,js?

          Thanks

          J 1 Reply Last reply Apr 3, 2017, 4:41 PM Reply Quote 0
          • J Offline
            johnnyboy @Richard238
            last edited by Apr 3, 2017, 4:41 PM

            @Richard238 said in Update says to “commit your changes or stash them before you can merge.” ?:

            Lost and confused already.

            How much of calendar.js needs to be copied to config,js?

            Thanks

            About this much…

            {
            			module: 'calendar',
            			header: 'My Family Home Calendar',
            			position: 'top_right',
            			config: {
                                             maximumEntries: 13,
                                             maximumNumberOfDays: 365,
                                             maxTitleLength: 25,
                                             animationSpeed: 0,
                                             fadePoint: 3,
                                             timeFormat: 'absolute',
                                             urgency: 7,
                                             getRelative: 0,      
            				calendars: [
            					{
            						symbol: 'calendar-check-o ',
            						url: 'webcal://www.calendarlabs.com/templates/ical/UK-Holidays.ics'
            					},
                                                    {
                                                            symbol: `calendar-check-o `,
                                                            url: "https://calendar.google.com/calendar/ical/mydetails.co.uk/private-mydetails/basic.ics"
            				},
                                       ]
            			}
            		},
                
            		
                            {
                           
            			module: 'compliments',
            
            R 1 Reply Last reply Apr 4, 2017, 10:14 AM Reply Quote 0
            • R Offline
              Richard238 @johnnyboy
              last edited by Apr 4, 2017, 10:14 AM

              Ok, these are done and no longer an issue, hurrah!:grinning:

                  css/main.css
                  modules/default/compliments/compliments.js
                  modules/default/newsfeed/newsfeed.js
                  modules/default/weatherforecast/weatherforecast.js
              

              Can’t get

                  modules/default/calendar/calendar.js
              

              into config.js though.

              			module: 'calendar',
              			header: 'Calendar',
              			position: 'top_left',
              			config: {
                                  maximumEntries: 8, // Total Maximum Entries
                                  maximumNumberOfDays: 365,
                                  displaySymbol: true,
                                  defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
                                  displayRepeatingCountTitle: false,
                                  defaultRepeatingCountTitle: "",
                                  maxTitleLength: 25,
                                  fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
                                  animationSpeed: 2000,
                                  fade: true,
                                  urgency: 0,
                                  timeFormat: "absolute",
                                  dateFormat: "ddd Do MMMM",
                                  getRelative: 2,
                                  fadePoint: 0.25, // Start on 1/4th of the list.
                                  hidePrivate: false,
                                  calendars: [
              					{
              						symbol: 'calendar-check-o ',
              						url: 'https://calendar.google.com/calendar/ical/PRIVATE_KEY/basic.ics'
              					}
              				]
              			}
              		},
              		{
              			module: 'calendar',
              			header: 'Binday',
              			position: 'bottom_left',
              			config: {
                                  maximumEntries: 8, // Total Maximum Entries
                                  maximumNumberOfDays: 365,
                                  displaySymbol: true,
                                  defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
                                  displayRepeatingCountTitle: false,
                                  defaultRepeatingCountTitle: "",
                                  maxTitleLength: 25,
                                  fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
                                  animationSpeed: 2000,
                                  fade: true,
                                  urgency: 0,
                                  timeFormat: "absolute",
                                  dateFormat: "ddd Do MMMM",
                                  getRelative: 2,
                                  fadePoint: 0.25, // Start on 1/4th of the list.
                                  hidePrivate: false,
                                  calendars: [
                                  {
              						symbol: 'pagelines ',
              						url: 'https://calendar.google.com/calendar/ical/PRIVATE_KEY/basic.ics'
              					}
              				]
                              titleReplace: {
                              //	"'s birthday": "",
                              //	"Recycling": "Bins",
                                  "Red Bin": "Red and Black Bins",
                                  "Green Bin": "Green and Black Bins" 
                              }
              			}
              		},  
              

              What have I missed?!

              Thanks.

              1 Reply Last reply Reply Quote 0
              • Y Offline
                yawns Moderator
                last edited by Apr 4, 2017, 10:36 AM

                At least there is a single comma missing after the closing ] of your calendars entry

                1 Reply Last reply Reply Quote 0
                • R Offline
                  Richard238
                  last edited by Apr 4, 2017, 10:50 AM

                  @yawns Brilliant! A comma after each of the ] seems to have fixed it.

                  Thank you.

                  1 Reply Last reply Reply Quote 0
                  • R Offline
                    Richard238
                    last edited by Apr 4, 2017, 11:11 AM

                    		module: 'calendar',
                    		header: 'Calendar',
                    
                    
                    
                    		module: 'calendar',
                    		header: 'Binday',
                    

                    With two calendars, how do I get different icons / icon colours again in custom.css?

                     .calendar .fa.fa-calendar-check-o {
                      color: #00d2FF /* 55=Green FF=Blue*/
                    }
                    
                     .calendar .fa.fa-trash-o  {
                      color: #C97F7F; /* Brown */
                     }
                    
                    S 1 Reply Last reply Apr 4, 2017, 11:45 AM Reply Quote 0
                    • S Offline
                      strawberry 3.141 Project Sponsor Module Developer @Richard238
                      last edited by Apr 4, 2017, 11:45 AM

                      @Richard238 you can use the module identifier for it as it is unique

                      #module_7_calendar .fa.fa-calendar-check-o {
                      
                      }
                      
                      #module_8_calendar .fa.fa-calendar-check-o {
                      
                      }
                      

                      the number is the index of the entry in your config starting at 0

                      e.g.

                      modules: [
                        {module: "A", position: "top_right"}, //index: 0
                        {module: "B", position: "top_right"}, //index: 1
                        {module: "calendar", position: "top_right"}, //index: 2
                        ...
                      ]
                      

                      Please create a github issue if you need help, so I can keep track

                      1 Reply Last reply Reply Quote 1
                      • 1
                      • 2
                      • 3
                      • 1 / 3
                      1 / 3
                      • First post
                        8/26
                        Last post
                      Enjoying MagicMirror? Please consider a donation!
                      MagicMirror created by Michael Teeuw.
                      Forum managed by Sam, technical setup by Karsten.
                      This forum is using NodeBB as its core | Contributors
                      Contact | Privacy Policy